RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames

Browse source
This commit is contained in:
roel@libnfc.org 2012-12-07 12:51:19 +00:00
parent f0ba634221
commit fe7bfa7856
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/cmdmain.c
View file

@ -59,9 +59,9 @@ int CmdQuit(const char *Cmd)
bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
// Wait until the command is received
for(size_t i=0; received_command != cmd && i < ms_timeout; i++) {
msleep(1); // XXX ugh
if (i == 2000) {
for(size_t i=0; received_command != cmd && i < ms_timeout/10; i++) {
msleep(10); // XXX ugh
if (i == 200) { // Two seconds elapsed
PrintAndLog("Waiting for a response from the proxmark...");
PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
}

15
client/proxmark3.c
View file

@ -67,6 +67,7 @@ struct main_loop_arg {
//}
byte_t rx[0x1000000];
byte_t* prx = rx;
static void *uart_receiver(void *targ) {
struct receiver_arg *arg = (struct receiver_arg*)targ;
@ -75,18 +76,19 @@ static void *uart_receiver(void *targ) {
while (arg->run) {
rxlen = sizeof(UsbCommand);
if (uart_receive(sp,rx,&rxlen)) {
if ((rxlen % sizeof(UsbCommand)) != 0) {
PrintAndLog("ERROR: received %03zd bytes, which does not seem to be one or more command(s)\n",rxlen );
if (uart_receive(sp,prx,&rxlen)) {
prx += rxlen;
if (((prx-rx) % sizeof(UsbCommand)) != 0) {
continue;
}
cmd_count = rxlen / sizeof(UsbCommand);
// printf("received %zd bytes, which represents %zd commands\n",rxlen, cmd_count);
cmd_count = (prx-rx) / sizeof(UsbCommand);
// printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count);
for (size_t i=0; i<cmd_count; i++) {
UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
}
}
prx = rx;
if(txcmd_pending) {
if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) {
PrintAndLog("Sending bytes to proxmark failed");
@ -99,7 +101,6 @@ static void *uart_receiver(void *targ) {
return NULL;
}
static void *main_loop(void *targ) {
struct main_loop_arg *arg = (struct main_loop_arg*)targ;
struct receiver_arg rarg;