Fix some printf/scanf format strings

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4ede122f0b522a4e7f069b2b33291af05684e8a9..b7fa874d8684e73a6651b23379110c11af1204de 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);
 


@@ -333,10 +335,10 @@ int CmdFPGAOff(const char *Cmd)
 
 int CmdLCD(const char *Cmd)
 {
 
 int CmdLCD(const char *Cmd)
 {

-  int i, j;
+  unsigned int i, j;

 
   UsbCommand c={CMD_LCD};
 
   UsbCommand c={CMD_LCD};

-  sscanf(Cmd, "%x %d", &i, &j);
+  sscanf(Cmd, "%x %u", &i, &j);

   while (j--) {
     c.arg[0] = i & 0x1ff;
     SendCommand(&c);
   while (j--) {
     c.arg[0] = i & 0x1ff;
     SendCommand(&c);


@@ -402,26 +404,23 @@ 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)
 {
 
        clearCommandBuffer();
        UsbCommand c = {CMD_VERSION};
 int CmdVersion(const char *Cmd)
 {
 
        clearCommandBuffer();
        UsbCommand c = {CMD_VERSION};

-       static UsbCommand resp = {0, {0, 0, 0}};
+       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)) {
-                       PrintAndLog("Prox/RFID mark3 RFID instrument");
-                       PrintAndLog((char*)resp.d.asBytes);
-                       lookupChipID(resp.arg[0], resp.arg[1]);
-               }
-       } else {
-               PrintAndLog("[[[ Cached information ]]]\n");
+       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]);

-               PrintAndLog("");
+               hw_capabilities = resp.arg[2];

        }
        return 0;
 }
        }
        return 0;
 }