Merge branch 'master' into fix_printf

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 39029d4e3429dcc2e4202aaf80e21477a99d4c84..fcfd7e8fddb80f9c1bac092def66cd5fbb1d23c0 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -694,10 +694,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        continue;\r
                }\r
 \r
-               // send a dummy byte as reader response in order to trigger the cards authentication timeout\r
-               uint8_t dummy_answer = 0;\r
-               ReaderTransmit(&dummy_answer, 1, NULL);\r
-               timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
+               // send a dummy response in order to trigger the cards authentication failure timeout\r
+               uint8_t dummy_answer[8] = {0};\r
+               ReaderTransmit(dummy_answer, 8, NULL);\r
 \r
                num_nonces++;\r
                if (num_nonces % 2) {\r
@@ -710,9 +709,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        i += 9;\r
                }\r
 \r
-               // wait for the card to become ready again\r
-               while(GetCountSspClk() < timeout);\r
-\r
        }\r
 \r
        LED_C_OFF();\r
@@ -1514,8 +1510,6 @@ void MifareCIdent(){
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
-//     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-//     SpinDelay(100);\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r