A lot of changes...

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 16be8bbe7f49db15bd9a2a7200ad01bdf446ac83..03f4186ffa000fcb023c774f897b283c502fe127 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -405,6 +405,7 @@ int CmdTune(const char *Cmd)
 
 int CmdVersion(const char *Cmd)
 {
+
        clearCommandBuffer();
        UsbCommand c = {CMD_VERSION};
        static UsbCommand resp = {0, {0, 0, 0}};
@@ -430,13 +431,11 @@ int CmdStatus(const char *Cmd)
 {
        uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
        sample_buf = speed_test_buffer;
-       #define USB_SPEED_TEST_SIZE (100*USB_CMD_DATA_SIZE)
 
        clearCommandBuffer();
-       UsbCommand c = {CMD_STATUS, {USB_SPEED_TEST_SIZE}};
+       UsbCommand c = {CMD_STATUS};
        SendCommand(&c);
-       UsbCommand resp;
-       if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
+       if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
                PrintAndLog("Status command failed. USB Speed Test timed out");
        }
        return 0;
@@ -449,40 +448,39 @@ int CmdPing(const char *Cmd)
        UsbCommand resp;
        UsbCommand c = {CMD_PING};
        SendCommand(&c);
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1000))
                PrintAndLog("Ping successfull");
-       }else{
-               PrintAndLog("Ping failed");
-       }
-  return 0;
+       else
+               PrintAndLog("Ping failed");     
+       return 0;
 }
 
 static command_t CommandTable[] = 
 {
-  {"help",          CmdHelp,        1, "This help"},
-  {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
-  {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
-  {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
-  {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
-  {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
-  {"reset",         CmdReset,       0, "Reset the Proxmark3"},
-  {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
-  {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
-  {"tune",          CmdTune,        0, "Measure antenna tuning"},
-  {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
+       {"help",          CmdHelp,        1, "This help"},
+       {"detectreader",  CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
+       {"fpgaoff",       CmdFPGAOff,     0, "Set FPGA off"},
+       {"lcd",           CmdLCD,         0, "<HEX command> <count> -- Send command/data to LCD"},
+       {"lcdreset",      CmdLCDReset,    0, "Hardware reset LCD"},
+       {"readmem",       CmdReadmem,     0, "[address] -- Read memory at decimal address from flash"},
+       {"reset",         CmdReset,       0, "Reset the Proxmark3"},
+       {"setlfdivisor",  CmdSetDivisor,  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
+       {"setmux",        CmdSetMux,      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},
+       {"tune",          CmdTune,        0, "Measure antenna tuning"},
+       {"version",       CmdVersion,     0, "Show version information about the connected Proxmark"},
        {"status",        CmdStatus,      0, "Show runtime status information about the connected Proxmark"},
        {"ping",          CmdPing,        0, "Test if the pm3 is responsive"},
-  {NULL, NULL, 0, NULL}
+       {NULL, NULL, 0, NULL}
 };
 
 int CmdHW(const char *Cmd)
 {
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+       CmdsParse(CommandTable, Cmd);
+       return 0;
 }
 
 int CmdHelp(const char *Cmd)
 {
-  CmdsHelp(CommandTable);
-  return 0;
+       CmdsHelp(CommandTable);
+       return 0;
 }