chip manufacturer and type identification: (#796)

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 05ad0c9f482f5072616cfdb07357a3b6a9fe52b8..b6a0d11f2bbd27852bd35cf2384de46630563950 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -8,18 +8,20 @@
 // Hardware commands
 //-----------------------------------------------------------------------------
 
 // Hardware commands
 //-----------------------------------------------------------------------------
 

+#include "cmdhw.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "ui.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "ui.h"

-#include "proxmark3.h"
+#include "comms.h"

 #include "cmdparser.h"
 #include "cmdparser.h"

-#include "cmdhw.h"

 #include "cmdmain.h"
 #include "cmddata.h"
 
 #include "cmdmain.h"
 #include "cmddata.h"
 

-/* low-level hardware control */
+
+static uint32_t hw_capabilities = 0;

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -402,42 +404,69 @@ int CmdTune(const char *Cmd)
     return CmdTuneSamples(Cmd);
 }
 
     return CmdTuneSamples(Cmd);
 }
 

+bool PM3hasSmartcardSlot(void) {
+       return (hw_capabilities & HAS_SMARTCARD_SLOT);
+}
+

 int CmdVersion(const char *Cmd)
 {
 
 int CmdVersion(const char *Cmd)
 {
 

+       clearCommandBuffer();

        UsbCommand c = {CMD_VERSION};
        UsbCommand c = {CMD_VERSION};

-       static UsbCommand resp = {0, {0, 0, 0}};
-       
-       if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
-               SendCommand(&c);
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && Cmd != NULL) {
-                       PrintAndLog("Prox/RFID mark3 RFID instrument");
-                       PrintAndLog((char*)resp.d.asBytes);
-                       lookupChipID(resp.arg[0], resp.arg[1]);
-               }
-       } else if (Cmd != NULL) {
+       UsbCommand resp = {0, {0, 0, 0}};
+
+       SendCommand(&c);
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {

                PrintAndLog("Prox/RFID mark3 RFID instrument");
                PrintAndLog((char*)resp.d.asBytes);
                lookupChipID(resp.arg[0], resp.arg[1]);
                PrintAndLog("Prox/RFID mark3 RFID instrument");
                PrintAndLog((char*)resp.d.asBytes);
                lookupChipID(resp.arg[0], resp.arg[1]);

+               hw_capabilities = resp.arg[2];
+       }
+       return 0;
+}
+
+int CmdStatus(const char *Cmd)
+{
+       clearCommandBuffer();
+       UsbCommand c = {CMD_STATUS};
+       SendCommand(&c);
+       if (!WaitForResponseTimeout(CMD_ACK, &c, 1900)) {
+               PrintAndLog("Status command failed. USB Speed Test timed out");
+       }
+       return 0;
+}
+
+
+int CmdPing(const char *Cmd)
+{
+       clearCommandBuffer();
+       UsbCommand resp;
+       UsbCommand c = {CMD_PING};
+       SendCommand(&c);
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+               PrintAndLog("Ping successful");
+       }else{
+               PrintAndLog("Ping failed");

        }
        }

-       

        return 0;
 }
 
 static command_t CommandTable[] = 
 {
        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"},
-  {NULL, NULL, 0, NULL}
+       {"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, "['l'|'h'] -- Measure antenna tuning (option 'l' or 'h' to limit to LF or HF)"},
+       {"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}

 };
 
 int CmdHW(const char *Cmd)
 };
 
 int CmdHW(const char *Cmd)