X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c37d2e7078e0e9ced18ebb8d5c89c610350785af..bfaecce6ebf50e296a1a4d221411581ff96f91c3:/client/cmdmain.c?ds=inline diff --git a/client/cmdmain.c b/client/cmdmain.c index 3cdcd089..c26f2eb4 100644 --- a/client/cmdmain.c +++ b/client/cmdmain.c @@ -1,7 +1,18 @@ +//----------------------------------------------------------------------------- +// Copyright (C) 2010 iZsh +// +// 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 #include #include #include +#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 ' 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(¤t_response_user, ¤t_response, sizeof(UsbCommand)); + ret = ¤t_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); } //----------------------------------------------------------------------------- @@ -75,6 +98,7 @@ void UsbCommandReceived(UsbCommand *UC) // printf("%s(%x) current cmd = %x\n", __FUNCTION__, c->cmd, current_command); /* If we recognize a response, return to avoid further processing */ switch(UC->cmd) { + // First check if we are handling a debug message case CMD_DEBUG_PRINT_STRING: { char s[100]; if(UC->arg[0] > 70 || UC->arg[0] < 0) { @@ -82,13 +106,14 @@ 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; - } + } break; - case CMD_DEBUG_PRINT_INTEGERS: - PrintAndLog("#db# %08x, %08x, %08x\r\n", UC->arg[0], UC->arg[1], UC->arg[2]); + case CMD_DEBUG_PRINT_INTEGERS: { + PrintAndLog("#db# %08x, %08x, %08x \r\n", UC->arg[0], UC->arg[1], UC->arg[2]); return; + } break; case CMD_MEASURED_ANTENNA_TUNING: { int peakv, peakf; @@ -99,7 +124,6 @@ void UsbCommandReceived(UsbCommand *UC) peakf = UC->arg[2] & 0xffff; peakv = UC->arg[2] >> 16; PrintAndLog(""); - PrintAndLog(""); PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0); PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0); PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1)); @@ -112,12 +136,32 @@ void UsbCommandReceived(UsbCommand *UC) PrintAndLog("# Your HF antenna is unusable."); else if (vHf<5000) PrintAndLog("# Your HF antenna is marginal."); - return; - } - default: - break; + } break; + + default: { + // Maybe it's a response + switch(current_command) { + case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: { + if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) { + PrintAndLog("unrecognized command %08x\n", UC->cmd); + break; + } + int i; + for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i]; + received_command = UC->cmd; + } break; + + default: { + } break; + } + // Store the last received command + received_command = UC->cmd; + memcpy(¤t_response, UC, sizeof(UsbCommand)); + } break; } - /* Maybe it's a response: */ + received_command = UC->cmd; +/* + // Maybe it's a response: switch(current_command) { case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response; @@ -125,6 +169,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 @@ -132,7 +177,12 @@ 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(¤t_response, UC, sizeof(UsbCommand)); + received_command = UC->cmd; } + */ }