Add Smartcard functions (RDV4.0) (#646)

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 82313ae0cae0da63341566c68055f117426f02c5..b973354d728acba1848922ba7fc9f0201f1fa9c7 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -9,18 +9,18 @@
 // High frequency commands
 //-----------------------------------------------------------------------------
 
+#include "cmdhf.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "proxmark3.h"
+#include "comms.h"
 #include "util.h"
-#include "data.h"
 #include "ui.h"
 #include "iso14443crc.h"
 #include "parity.h"
 #include "cmdmain.h"
 #include "cmdparser.h"
-#include "cmdhf.h"
 #include "cmdhf14a.h"
 #include "cmdhf14b.h"
 #include "cmdhf15.h"
@@ -353,6 +353,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 int CmdHFList(const char *Cmd)
 {
+       #ifdef WITH_SMARTCARD
+               PrintAndLog("TEST_WITH_SMARTCARD");
+       #endif
+       #ifdef WITH_TEST
+               PrintAndLog("TEST_WITH_TEST");
+       #endif
        bool showWaitCycles = false;
        bool markCRCBytes = false;
        bool loadFromFile = false;
@@ -361,7 +367,7 @@ int CmdHFList(const char *Cmd)
        char param2 = '\0';
        char param3 = '\0';
        char type[40] = {0};
-       char filename[FILE_PATH_SIZE];
+       char filename[FILE_PATH_SIZE] = {0};
        uint8_t protocol = 0;
        
        // parse command line
@@ -497,8 +503,7 @@ int CmdHFList(const char *Cmd)
                trace = malloc(USB_CMD_DATA_SIZE);
                // Query for the size of the trace
                UsbCommand response;
-               GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
-               WaitForResponse(CMD_ACK, &response);
+               GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0, &response, -1, false);
                traceLen = response.arg[2];
                if (traceLen > USB_CMD_DATA_SIZE) {
                        uint8_t *p = realloc(trace, traceLen);
@@ -508,8 +513,7 @@ int CmdHFList(const char *Cmd)
                                return 2;
                        }
                        trace = p;
-                       GetFromBigBuf(trace, traceLen, 0);
-                       WaitForResponse(CMD_ACK, NULL);
+                       GetFromBigBuf(trace, traceLen, 0, NULL, -1, false);
                }
        }