osx: disable app-nap during serial comm (#687)

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 4a672255278a74d70062795c64dbc774d9af52d2..b973354d728acba1848922ba7fc9f0201f1fa9c7 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -9,17 +9,18 @@
 // High frequency commands
 //-----------------------------------------------------------------------------
 
 // High frequency commands
 //-----------------------------------------------------------------------------
 

+#include "cmdhf.h"
+

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

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

 #include "util.h"
 #include "ui.h"
 #include "iso14443crc.h"
 #include "parity.h"
 #include "cmdmain.h"
 #include "cmdparser.h"
 #include "util.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"
 #include "cmdhf14a.h"
 #include "cmdhf14b.h"
 #include "cmdhf15.h"


@@ -352,6 +353,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 int CmdHFList(const char *Cmd)
 {
 
 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;
        bool showWaitCycles = false;
        bool markCRCBytes = false;
        bool loadFromFile = false;


@@ -360,7 +367,7 @@ int CmdHFList(const char *Cmd)
        char param2 = '\0';
        char param3 = '\0';
        char type[40] = {0};
        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
        uint8_t protocol = 0;
        
        // parse command line