Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 15:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part3

Browse source
This commit is contained in:
roel@libnfc.org 2013-02-28 22:46:49 +00:00
parent 1a07fd510d
commit a0bbdb76ca
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhfepa.c
View file

@ -25,13 +25,13 @@ static int CmdHelp(const char *Cmd);
int CmdHFEPACollectPACENonces(const char *Cmd) int CmdHFEPACollectPACENonces(const char *Cmd)
{ {
// requested nonce size // requested nonce size
uint8_t m = 0; unsigned int m = 0;
// requested number of Nonces // requested number of Nonces
unsigned int n = 0; unsigned int n = 0;
// delay between requests // delay between requests
unsigned int d = 0; unsigned int d = 0;
sscanf(Cmd, "%"hhu" %u %u", &m, &n, &d); sscanf(Cmd, "%u %u %u", &m, &n, &d);
// values are expected to be > 0 // values are expected to be > 0
m = m > 0 ? m : 1; m = m > 0 ? m : 1;

11
client/uart.c
View file

@ -282,6 +282,15 @@ typedef struct {
COMMTIMEOUTS ct; // Serial port time-out configuration COMMTIMEOUTS ct; // Serial port time-out configuration
} serial_port_windows; } serial_port_windows;
void upcase(char *p) {
while(*p != '\0') {
if(*p >= 97 && *p <= 122) {
*p -= 32;
}
++p;
}
}
serial_port uart_open(const char* pcPortName) serial_port uart_open(const char* pcPortName)
{ {
char acPortName[255]; char acPortName[255];
@ -289,7 +298,7 @@ serial_port uart_open(const char* pcPortName)
// Copy the input "com?" to "\\.\COM?" format // Copy the input "com?" to "\\.\COM?" format
sprintf(acPortName,"\\\\.\\%s",pcPortName); sprintf(acPortName,"\\\\.\\%s",pcPortName);
_strupr(acPortName); upcase(acPortName);
// Try to open the serial port // Try to open the serial port
sp->hPort = CreateFileA(acPortName,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL); sp->hPort = CreateFileA(acPortName,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,0,NULL);