X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/534983d7352171526a6d43b112e0baaefdb1e3cd..f5fca2ed62fa1948cf1cc4eabaa6dc4cc27762cd:/client/cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 3388d75f..c26f2eb4 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -26,6 +26,7 @@
 unsigned int current_command = CMD_UNKNOWN;
 unsigned int received_command = CMD_UNKNOWN;
 UsbCommand current_response;
+UsbCommand current_response_user;
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
@@ -55,12 +56,16 @@ int CmdQuit(const char *Cmd)
 }
 
 UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout) {
-	UsbCommand * ret = &current_response;
+	UsbCommand * ret =  NULL;
 	int i=0;
 
 	for(i=0; received_command != response_type && i < ms_timeout / 10; i++) {
 		msleep(10); // XXX ugh
 	}
+	
+	// There was an evil BUG
+	memcpy(&current_response_user, &current_response, sizeof(UsbCommand));
+	ret = &current_response_user;
 
 	if(received_command != response_type)
 		ret = NULL;
@@ -93,6 +98,7 @@ void UsbCommandReceived(UsbCommand *UC)
   //	printf("%s(%x) current cmd = %x\n", __FUNCTION__, c->cmd, current_command);
   /* If we recognize a response, return to avoid further processing */
   switch(UC->cmd) {
+    // First check if we are handling a debug message
     case CMD_DEBUG_PRINT_STRING: {
       char s[100];
       if(UC->arg[0] > 70 || UC->arg[0] < 0) {
@@ -100,13 +106,14 @@ void UsbCommandReceived(UsbCommand *UC)
       }
       memcpy(s, UC->d.asBytes, UC->arg[0]);
       s[UC->arg[0]] = '\0';
-      PrintAndLog("#db# %s", s);
+      PrintAndLog("#db# %s       ", s);
       return;
-    }
+    } break;
 
-    case CMD_DEBUG_PRINT_INTEGERS:
-      PrintAndLog("#db# %08x, %08x, %08x\r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+    case CMD_DEBUG_PRINT_INTEGERS: {
+      PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
       return;
+    } break;
 
     case CMD_MEASURED_ANTENNA_TUNING: {
       int peakv, peakf;
@@ -117,7 +124,6 @@ void UsbCommandReceived(UsbCommand *UC)
       peakf = UC->arg[2] & 0xffff;
       peakv = UC->arg[2] >> 16;
       PrintAndLog("");
-      PrintAndLog("");
       PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
       PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
       PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
@@ -130,12 +136,32 @@ void UsbCommandReceived(UsbCommand *UC)
         PrintAndLog("# Your HF antenna is unusable.");
       else if (vHf<5000)
         PrintAndLog("# Your HF antenna is marginal.");
-      return;
-    }
-    default:
-      break;
+    } break;
+      
+    default: {
+      // Maybe it's a response
+      switch(current_command) {
+        case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
+          if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) {
+            PrintAndLog("unrecognized command %08x\n", UC->cmd);
+            break;
+          }
+          int i;
+          for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i];
+          received_command = UC->cmd;
+        } break;
+
+        default: {
+        } break;
+      }
+      // Store the last received command
+      received_command = UC->cmd;
+      memcpy(&current_response, UC, sizeof(UsbCommand));
+    } break;
   }
-  /* Maybe it's a response: */
+  received_command = UC->cmd;
+/*
+  // Maybe it's a response:
   switch(current_command) {
     case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:
       if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response;
@@ -153,9 +179,10 @@ void UsbCommandReceived(UsbCommand *UC)
     unexpected_response:
 
 	if(UC->cmd != CMD_ACK)
-		PrintAndLog("unrecognized command %08x\n", UC->cmd);
+		PrintAndLog("unrecognized command %08x       \n", UC->cmd);
 	else
 		memcpy(&current_response, UC, sizeof(UsbCommand));
 	received_command = UC->cmd;
   }
+ */
 }