USB comms: part 2 towards @micolous PR#463 (#595)

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 42f73fa1f6592bd1f3989936ae4f08abf4209b4b..63dd737e68a11fdcdaeab971a6cadc8b32b89ed9 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -327,7 +327,7 @@ int CmdLFSetConfig(const char *Cmd)
 }
 
 bool lf_read(bool silent, uint32_t samples) {
 }
 
 bool lf_read(bool silent, uint32_t samples) {

-       if (offline) return false;
+       if (IsOffline()) return false;

        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent,samples,0}};
        clearCommandBuffer();
        //And ship it to device
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent,samples,0}};
        clearCommandBuffer();
        //And ship it to device


@@ -870,7 +870,7 @@ int CmdVchDemod(const char *Cmd)
 int CheckChipType(char cmdp) {
        uint32_t wordData = 0;
 
 int CheckChipType(char cmdp) {
        uint32_t wordData = 0;
 

-       if (offline || cmdp == '1') return 0;
+       if (IsOffline() || cmdp == '1') return 0;

 
        save_restoreGB(GRAPH_SAVE);
        save_restoreDB(GRAPH_SAVE);
 
        save_restoreGB(GRAPH_SAVE);
        save_restoreDB(GRAPH_SAVE);


@@ -915,7 +915,7 @@ int CmdLFfind(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       if (!offline && (cmdp != '1')) {
+       if (!IsOffline() && (cmdp != '1')) {

                lf_read(true, 30000);
        } else if (GraphTraceLen < minLength) {
                PrintAndLog("Data in Graphbuffer was too small.");
                lf_read(true, 30000);
        } else if (GraphTraceLen < minLength) {
                PrintAndLog("Data in Graphbuffer was too small.");


@@ -931,7 +931,7 @@ int CmdLFfind(const char *Cmd)
        // only run if graphbuffer is just noise as it should be for hitag/cotag
        if (graphJustNoise(GraphBuffer, testLen)) {
                // only run these tests if we are in online mode 
        // only run if graphbuffer is just noise as it should be for hitag/cotag
        if (graphJustNoise(GraphBuffer, testLen)) {
                // only run these tests if we are in online mode 

-               if (!offline && (cmdp != '1')) {
+               if (!IsOffline() && (cmdp != '1')) {

                        // test for em4x05 in reader talk first mode.
                        if (EM4x05Block0Test(&wordData)) {
                                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");
                        // test for em4x05 in reader talk first mode.
                        if (EM4x05Block0Test(&wordData)) {
                                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");