ADD: @marshmellow42 's changes to "hf mfu dump"

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 377fdc2ce4e399cea3087968489415ce18550df7..e75211e68915ec43789eb421a73498c4ce6c66fc 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -33,9 +33,9 @@ unsigned int current_command = CMD_UNKNOWN;
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 static int CmdRev(const char *Cmd);
-static int CmdLS(const char *Cmd);
 
 //For storing command that are received from the device
+#define CMD_BUFFER_SIZE 50
 static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];
 //Points to the next empty position to write to
 static int cmd_head;//Starts as 0
@@ -45,7 +45,6 @@ static int cmd_tail;//Starts as 0
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},
-       {"ls",          CmdLS,          1, "list commands"},
        {"data",        CmdData,        1, "{ Plot window / data buffer manipulation... }"},
        {"hf",          CmdHF,          1, "{ High Frequency commands... }"},
        {"hw",          CmdHW,          1, "{ Hardware commands... }"},
@@ -66,15 +65,10 @@ int CmdHelp(const char *Cmd)
   CmdsHelp(CommandTable);
   return 0;
 }
-int CmdLS(const char *Cmd){
-       CmdsLS(CommandTable);
-       return 0;
-}
 
 int CmdQuit(const char *Cmd)
 {
-  exit(0);
-  return 0;
+  return 99;
 }
 
 int CmdRev(const char *Cmd)
@@ -121,9 +115,8 @@ void storeCommand(UsbCommand *command)
 int getCommand(UsbCommand* response)
 {
     //If head == tail, there's nothing to read, or if we just got initialized
-    if(cmd_head == cmd_tail){
-        return 0;
-    }
+    if(cmd_head == cmd_tail)  return 0;
+
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
@@ -131,7 +124,6 @@ int getCommand(UsbCommand* response)
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     return 1;
-
 }
 
 /**
@@ -145,39 +137,38 @@ int getCommand(UsbCommand* response)
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
   
-  UsbCommand resp;
-       
+       UsbCommand resp;
+
        if (response == NULL)
-    response = &resp;
-
-
-  // Wait until the command is received
-  for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
-
-               while(getCommand(response)) {
-          if(response->cmd == cmd){
-          return true;
-          }
-      }
-        msleep(10); // XXX ugh
-        if (dm_seconds == 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");
-        }
+               response = &resp;
+
+       // Wait until the command is received
+       for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
+
+               while( getCommand(response) ) {
+                       if(response->cmd == cmd){
+                               return true;
+                       }
+               }
+               msleep(10); // XXX ugh
+               if (dm_seconds == 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");
+               }
        }
-    return false;
+       return false;
 }
 
 bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
-       return WaitForResponseTimeout(cmd,response,-1);
+       return WaitForResponseTimeout(cmd, response, -1);
 }
 
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
 //-----------------------------------------------------------------------------
-void CommandReceived(char *Cmd) {
-  CmdsParse(CommandTable, Cmd);
+int CommandReceived(char *Cmd) {
+       return CmdsParse(CommandTable, Cmd);
 }
 
 //-----------------------------------------------------------------------------
@@ -203,12 +194,14 @@ void UsbCommandReceived(UsbCommand *UC)
 
                case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
                        memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+                       return;
                } break;
 
-               default:
+               default: {
+                       storeCommand(UC);
                        break;
+               }
        }
 
-       storeCommand(UC);
 }