CHG: removed a delay in readblock

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c5585386e4a9f333d9f5df9b01a6224d6985cdd6..6411a919fe684f7632783e45374a20357296a56c 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -216,16 +216,15 @@ int CmdHF14AReader(const char *Cmd) {
                        ul_switch_off_field();
                        
                        uint32_t tagT = GetHF14AMfU_Type();
                        ul_switch_off_field();
                        
                        uint32_t tagT = GetHF14AMfU_Type();

-                       ul_print_type(tagT, 0);
+                       if (tagT != UL_ERROR)
+                               ul_print_type(tagT, 0);

 
                        // reconnect for further tests
                        c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
                        c.arg[1] = 0;
                        c.arg[2] = 0;
 
                        // reconnect for further tests
                        c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
                        c.arg[1] = 0;
                        c.arg[2] = 0;

-

                        clearCommandBuffer();
                        SendCommand(&c);
                        clearCommandBuffer();
                        SendCommand(&c);

-

                        UsbCommand resp;
                        WaitForResponse(CMD_ACK, &resp);
                        
                        UsbCommand resp;
                        WaitForResponse(CMD_ACK, &resp);
                        


@@ -448,7 +447,7 @@ int CmdHF14ASim(const char *Cmd) {
        uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
        int uidlen = 0;
        bool useUIDfromEML = TRUE;
        uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
        int uidlen = 0;
        bool useUIDfromEML = TRUE;

-       bool showMaths = false;
+       bool verbose = false;

 
        while(param_getchar(Cmd, cmdp) != 0x00) {
                switch(param_getchar(Cmd, cmdp)) {
 
        while(param_getchar(Cmd, cmdp) != 0x00) {
                switch(param_getchar(Cmd, cmdp)) {


@@ -481,7 +480,7 @@ int CmdHF14ASim(const char *Cmd) {
                                break;
                        case 'v':
                        case 'V':
                                break;
                        case 'v':
                        case 'V':

-                               showMaths = true;
+                               verbose = true;

                                cmdp++;
                                break;
                        case 'x':
                                cmdp++;
                                break;
                        case 'x':


@@ -520,7 +519,7 @@ int CmdHF14ASim(const char *Cmd) {
                if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
                        
                memcpy( data, resp.d.asBytes, sizeof(data) );
                if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
                        
                memcpy( data, resp.d.asBytes, sizeof(data) );

-               readerAttack(data, TRUE, showMaths);
+               readerAttack(data, TRUE, verbose);

        }
        return 0;
 }
        }
        return 0;
 }