From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Fri, 7 Dec 2012 12:51:19 +0000 (+0000)
Subject: Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving... 
X-Git-Tag: v1.0.0~130^2~22
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fe7bfa785696615de44fd896214182446a664646?ds=inline;hp=f0ba6342218d4eb264668655e3c24ad74d99c0f4

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

diff --git a/client/cmdmain.c b/client/cmdmain.c
index edff9f8e..434f9e6e 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -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");
     }
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 38a97716..949013ec 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -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;