X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a82c1ac827376ea6eef2487d33a3047b4fc594b1..cc3c0a5148088f40adda1073cdb99cbbb3130f0a:/client/cmdmain.c diff --git a/client/cmdmain.c b/client/cmdmain.c index f0963d1e..51aada76 100644 --- a/client/cmdmain.c +++ b/client/cmdmain.c @@ -36,6 +36,7 @@ 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 @@ -74,7 +75,7 @@ int CmdLS(const char *Cmd){ int CmdQuit(const char *Cmd) { exit(0); - return 0; + return 99; } int CmdRev(const char *Cmd) @@ -149,9 +150,9 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou response = &resp; // Wait until the command is received - for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) { + for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) { - while(getCommand(response)) { + while( getCommand(response) ) { if(response->cmd == cmd){ return true; } @@ -166,15 +167,15 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou } 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,8 +204,11 @@ void UsbCommandReceived(UsbCommand *UC) return; } break; - default: break; + default: { + storeCommand(UC); + break; + } } - storeCommand(UC); + }