ADD: Enio's intuative function for the command: "hw tune", where you plot the tunin...

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index bd19cee41990aa1056852854450a4f1dd53c5382..391908e7643a306c8d44c7c2f6d641474b168062 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -44,7 +44,7 @@ int CmdHF14AList(const char *Cmd)
                ShowWaitCycles = true;
        }
                
                ShowWaitCycles = true;
        }
                

-       uint8_t got[1920];
+       uint8_t got[TRACE_BUFFER_SIZE];

        GetFromBigBuf(got,sizeof(got),0);
        WaitForResponse(CMD_ACK,NULL);
 
        GetFromBigBuf(got,sizeof(got),0);
        WaitForResponse(CMD_ACK,NULL);
 


@@ -62,7 +62,7 @@ int CmdHF14AList(const char *Cmd)
        uint32_t EndOfTransmissionTimestamp = 0;
        
        for (;;) {
        uint32_t EndOfTransmissionTimestamp = 0;
        
        for (;;) {

-               if(i >= 1900) {
+               if(i >= TRACE_BUFFER_SIZE) {

                        break;
                }
 
                        break;
                }
 


@@ -86,7 +86,7 @@ int CmdHF14AList(const char *Cmd)
                if (len > 100) {
                        break;
                }
                if (len > 100) {
                        break;
                }

-               if (i + len >= 1900) {
+               if (i + len >= TRACE_BUFFER_SIZE) {

                        break;
                }
 
                        break;
                }
 


@@ -202,6 +202,7 @@ int CmdHF14AReader(const char *Cmd)
 
        switch (card->sak) {
                case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
 
        switch (card->sak) {
                case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;

+               case 0x01: PrintAndLog("TYPE : NXP TNP3xxx  Activision Game Appliance"); break;

                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
                case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
                case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
                case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
                case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;


@@ -399,6 +400,7 @@ int CmdHF14ASim(const char *Cmd)
                PrintAndLog("           2 = MIFARE Ultralight");
                PrintAndLog("           3 = MIFARE DESFIRE");
                PrintAndLog("           4 = ISO/IEC 14443-4");
                PrintAndLog("           2 = MIFARE Ultralight");
                PrintAndLog("           3 = MIFARE DESFIRE");
                PrintAndLog("           4 = ISO/IEC 14443-4");

+               PrintAndLog("           5 = MIFARE TNP3XXX");           

                PrintAndLog("");
                return 1;
        }
                PrintAndLog("");
                return 1;
        }


@@ -627,7 +629,7 @@ static void waitCmd(uint8_t iSelect)
     UsbCommand resp;
     char *hexout;
 
     UsbCommand resp;
     char *hexout;
 

-    if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+    if (WaitForResponseTimeout(CMD_ACK,&resp,10000)) {

         recv = resp.d.asBytes;
         uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
         PrintAndLog("received %i octets",iLen);
         recv = resp.d.asBytes;
         uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
         PrintAndLog("received %i octets",iLen);