marcan's patch until he gets commit access. Remove C library's includes from the...

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 322e580640c96ab714e81f32f7d67ea81b593875..1e49e6cbcee9eb66b72843c63879dfdcb6d07c77 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include "sleep.h"
 #include "cmdparser.h"
 #include "data.h"
 #include "usb_cmd.h"
@@ -20,12 +21,12 @@ static int CmdQuit(const char *Cmd);
 
 static command_t CommandTable[] = 
 {
-  {"help",  CmdHelp,  1, "This help"},
-  {"data",  CmdData,  1, "Plot window / data buffer manipulation"},
+  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of the following commands:\n"},
+  {"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}
 };
@@ -46,13 +47,16 @@ void WaitForResponse(uint32_t response_type)
 {
   while (received_command != response_type) {
 #ifdef WIN32
+    // FIXME: Do we really need this under windows or is it
+    // just some historical code?
+    // pthread seems to be availabe for win32 nowadays
+    // so we should be able to port the code and get rid
+    // of this part.
     UsbCommand c;
     if (ReceiveCommandPoll(&c))
       UsbCommandReceived(&c);
-    Sleep(0);
-#else
-    usleep(10000); // XXX ugh
 #endif
+    msleep(10); // XXX ugh
   }
   received_command = CMD_UNKNOWN;
 }
@@ -125,6 +129,7 @@ void UsbCommandReceived(UsbCommand *UC)
       for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i];
       received_command = UC->cmd;
       return;
+    case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
     case CMD_DOWNLOADED_SIM_SAMPLES_125K:
       if (UC->cmd != CMD_ACK) goto unexpected_response;
       // got ACK
@@ -135,4 +140,4 @@ void UsbCommandReceived(UsbCommand *UC)
     PrintAndLog("unrecognized command %08x\n", UC->cmd);
     break;
   }
-}
\ No newline at end of file
+}