Merge branch 'master' into topaz

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 9298360d7c49b99462b6fb1952406c82f43e71bc..deced5585c6dc343ebe2d74a8e7f6e6068ba25c1 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -97,8 +97,9 @@ void storeCommand(UsbCommand *command)
     memcpy(destination, command, sizeof(UsbCommand));
 
     cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap
-
 }
+
+
 /**
  * @brief getCommand gets a command from an internal circular buffer.
  * @param response location to write command
@@ -117,9 +118,9 @@ int getCommand(UsbCommand* response)
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     return 1;
-
 }
 
+
 /**
  * Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.
@@ -133,9 +134,9 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
   
        UsbCommand resp;
        
-       if (response == NULL)
+       if (response == NULL) {
                response = &resp;
-
+       }
 
        // Wait until the command is received
        for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
@@ -144,19 +145,21 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
                                return true;
                        }
                }
-        msleep(10); // XXX ugh
-        if (dm_seconds == 200) { // Two seconds elapsed
+               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);
 }
 
+
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever the user types a command and
 // then presses Enter, which the full command line that they typed.
@@ -165,6 +168,7 @@ void CommandReceived(char *Cmd) {
   CmdsParse(CommandTable, Cmd);
 }
 
+
 //-----------------------------------------------------------------------------
 // Entry point into our code: called whenever we received a packet over USB
 // that we weren't necessarily expecting, for example a debug print.
@@ -188,12 +192,13 @@ 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:
+                       storeCommand(UC);
                        break;
        }
 
-       storeCommand(UC);
 }