Redesign of lf hid card format handler as discussed with @marshmellow42

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index bdab01eba35bc66f1a45ac656e581d238f9c3fc7..f994e938778cae8dffa590432240a053173e78d0 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -408,21 +408,13 @@ int CmdVersion(const char *Cmd)
 
        clearCommandBuffer();
        UsbCommand c = {CMD_VERSION};
 
        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("");

        }
        return 0;
 }
        }
        return 0;
 }