Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / client / cmdlfvisa2000.c

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 9148a435b05767328c6b9ed60cbf571202430c94..b74a318a1924f9c171481f89c569c6b32cfbfc2b 100644 (file)
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -48,10 +48,16 @@ static uint8_t visa_chksum( uint32_t id ) {
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
 
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
 

+       // save GraphBuffer - to restore it later       
+       save_restoreGB(1);
+       
+       CmdAskEdgeDetect("");
+       

        //ASK / Manchester
        bool st = TRUE;
        if (!ASKDemod_ext("64 0 0", FALSE, FALSE, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
        //ASK / Manchester
        bool st = TRUE;
        if (!ASKDemod_ext("64 0 0", FALSE, FALSE, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Visa2k: ASK/Manchester Demod failed");

+               save_restoreGB(0);

                return 0;
        }
        size_t size = DemodBufferLen;
                return 0;
        }
        size_t size = DemodBufferLen;


@@ -67,6 +73,7 @@ int CmdVisa2kDemod(const char *Cmd) {
                        else
                                PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans);
                }
                        else
                                PrintAndLog("DEBUG: Error - Visa2k: ans: %d", ans);
                }

+               save_restoreGB(0);

                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);


@@ -82,10 +89,11 @@ int CmdVisa2kDemod(const char *Cmd) {
        // test checksums
        if ( chk != calc ) { 
                printf("DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);
        // test checksums
        if ( chk != calc ) { 
                printf("DEBUG: error: Visa2000 checksum failed %x - %x\n", chk, calc);

+               save_restoreGB(0);

                return 0;
        }
        PrintAndLog("Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);
                return 0;
        }
        PrintAndLog("Visa2000 Tag Found: Card ID %u,  Raw: %08X%08X%08X", raw2,  raw1 ,raw2, raw3);

-
+       save_restoreGB(0);

        return 1;
 }
 
        return 1;
 }