X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bdd1de1b0258ccfd55459e53212b0ce84e37fe57..fa4a296451175b0c287f74f0e595a9d408732d0b:/client/cmdmain.c?ds=sidebyside

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 30b431f5..ff58e0a4 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -1,7 +1,18 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Main command parser entry point
+//-----------------------------------------------------------------------------
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include "sleep.h"
 #include "cmdparser.h"
 #include "data.h"
 #include "usb_cmd.h"
@@ -14,6 +25,8 @@
 
 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);
@@ -21,11 +34,11 @@ static int CmdQuit(const char *Cmd);
 static command_t CommandTable[] = 
 {
   {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of the following commands:\n"},
-  {"data",  CmdData,  1, "Plot window / data buffer manipulation"},
+  {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},
   {"exit",  CmdQuit,  1, "Exit program"},
-  {"hf",    CmdHF,    1, "HF commands"},
-  {"hw",    CmdHW,    1, "Hardware commands"},
-  {"lf",    CmdLF,    1, "LF commands"},
+  {"hf",    CmdHF,    1, "{ HF commands... }"},
+  {"hw",    CmdHW,    1, "{ Hardware commands... }"},
+  {"lf",    CmdLF,    1, "{ LF commands... }"},
   {"quit",  CmdQuit,  1, "Quit program"},
   {NULL, NULL, 0, NULL}
 };
@@ -42,19 +55,29 @@ int CmdQuit(const char *Cmd)
   return 0;
 }
 
-void WaitForResponse(uint32_t response_type)
+UsbCommand * WaitForResponseTimeout(uint32_t response_type, uint32_t ms_timeout) {
+	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;
+
+	received_command = CMD_UNKNOWN;
+
+	return ret;
+}
+
+UsbCommand * WaitForResponse(uint32_t response_type)
 {
-  while (received_command != response_type) {
-#ifdef WIN32
-    UsbCommand c;
-    if (ReceiveCommandPoll(&c))
-      UsbCommandReceived(&c);
-    Sleep(0);
-#else
-    usleep(10000); // XXX ugh
-#endif
-  }
-  received_command = CMD_UNKNOWN;
+	return WaitForResponseTimeout(response_type, -1);
 }
 
 //-----------------------------------------------------------------------------
@@ -82,12 +105,12 @@ 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;
     }
 
     case CMD_DEBUG_PRINT_INTEGERS:
-      PrintAndLog("#db# %08x, %08x, %08x\r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
+      PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
       return;
 
     case CMD_MEASURED_ANTENNA_TUNING: {
@@ -133,7 +156,11 @@ void UsbCommandReceived(UsbCommand *UC)
       return;
     default:
     unexpected_response:
-    PrintAndLog("unrecognized command %08x\n", UC->cmd);
-    break;
+
+	if(UC->cmd != CMD_ACK)
+		PrintAndLog("unrecognized command %08x       \n", UC->cmd);
+	else
+		memcpy(&current_response, UC, sizeof(UsbCommand));
+	received_command = UC->cmd;
   }
 }