fix 'hf iclass replay' (#888)

[proxmark3-svn] / armsrc / iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 3ebaa5393a27c8a7f818407bc5ddb42f7a0b206a..6434409d905312b945f85a139fc8a91d03cb7f18 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -18,8 +18,9 @@
 #include "string.h"
 #include "iso14443crc.h"
 #include "fpgaloader.h"
 #include "string.h"
 #include "iso14443crc.h"
 #include "fpgaloader.h"

+#include "BigBuf.h"

 
 

-#define RECEIVE_SAMPLES_TIMEOUT 1000 // TR0 max is 256/fs = 256/(848kHz) = 302us or 64 samples from FPGA. 1000 seems to be much too high?
+#define RECEIVE_SAMPLES_TIMEOUT 64 // TR0 max is 256/fs = 256/(848kHz) = 302us or 64 samples from FPGA

 #define ISO14443B_DMA_BUFFER_SIZE 128
 
 // PCB Block number for APDUs
 #define ISO14443B_DMA_BUFFER_SIZE 128
 
 // PCB Block number for APDUs


@@ -327,6 +328,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(void)
 {
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(void)
 {

+       LED_A_ON();

        // the only commands we understand is WUPB, AFI=0, Select All, N=1:
        static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // WUPB
        // ... and REQB, AFI=0, Normal Request, N=1:
        // the only commands we understand is WUPB, AFI=0, Select All, N=1:
        static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // WUPB
        // ... and REQB, AFI=0, Normal Request, N=1:


@@ -465,6 +467,9 @@ void SimulateIso14443bTag(void)
                LogTrace(resp, respLen, 0, 0, NULL, false);
 
        }
                LogTrace(resp, respLen, 0, 0, NULL, false);
 
        }

+       
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LED_A_OFF();

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -581,9 +586,10 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                                        Demod.state = DEMOD_UNSYNCD;
                                } else {
                                        LED_C_ON(); // Got SOF
                                        Demod.state = DEMOD_UNSYNCD;
                                } else {
                                        LED_C_ON(); // Got SOF

-                                       Demod.state = DEMOD_AWAITING_START_BIT;

                                        Demod.posCount = 0;
                                        Demod.posCount = 0;

+                                       Demod.bitCount = 0;

                                        Demod.len = 0;
                                        Demod.len = 0;

+                                       Demod.state = DEMOD_AWAITING_START_BIT;

 /* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
                                        Demod.metricN = 0;
                                        Demod.metric = 0;
 /* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
                                        Demod.metricN = 0;
                                        Demod.metric = 0;


@@ -600,13 +606,16 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                case DEMOD_AWAITING_START_BIT:
                        Demod.posCount++;
                        MAKE_SOFT_DECISION();
                case DEMOD_AWAITING_START_BIT:
                        Demod.posCount++;
                        MAKE_SOFT_DECISION();

-                       if(v > 0) {
-                               if(Demod.posCount > 3*2) {              // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
-                                       Demod.state = DEMOD_UNSYNCD;
+                       if (v > 0) {
+                               if (Demod.posCount > 3*2) {             // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs

                                        LED_C_OFF();
                                        LED_C_OFF();

+                                       if (Demod.bitCount == 0 && Demod.len == 0) { // received SOF only, this is valid for iClass/Picopass
+                                               return true;
+                                       } else {
+                                               Demod.state = DEMOD_UNSYNCD;
+                                       }

                                }
                        } else {                                                        // start bit detected
                                }
                        } else {                                                        // start bit detected

-                               Demod.bitCount = 0;

                                Demod.posCount = 1;                             // this was the first half
                                Demod.thisBit = v;
                                Demod.shiftReg = 0;
                                Demod.posCount = 1;                             // this was the first half
                                Demod.thisBit = v;
                                Demod.shiftReg = 0;


@@ -616,7 +625,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 
                case DEMOD_RECEIVING_DATA:
                        MAKE_SOFT_DECISION();
 
                case DEMOD_RECEIVING_DATA:
                        MAKE_SOFT_DECISION();

-                       if(Demod.posCount == 0) {                       // first half of bit
+                       if (Demod.posCount == 0) {                      // first half of bit

                                Demod.thisBit = v;
                                Demod.posCount = 1;
                        } else {                                                        // second half of bit
                                Demod.thisBit = v;
                                Demod.posCount = 1;
                        } else {                                                        // second half of bit


@@ -632,22 +641,23 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 */
 
                                Demod.shiftReg >>= 1;
 */
 
                                Demod.shiftReg >>= 1;

-                               if(Demod.thisBit > 0) { // logic '1'
+                               if (Demod.thisBit > 0) {        // logic '1'

                                        Demod.shiftReg |= 0x200;
                                }
 
                                Demod.bitCount++;
                                        Demod.shiftReg |= 0x200;
                                }
 
                                Demod.bitCount++;

-                               if(Demod.bitCount == 10) {
+                               if (Demod.bitCount == 10) {

                                        uint16_t s = Demod.shiftReg;
                                        uint16_t s = Demod.shiftReg;

-                                       if((s & 0x200) && !(s & 0x001)) { // stop bit == '1', start bit == '0'
+                                       if ((s & 0x200) && !(s & 0x001)) { // stop bit == '1', start bit == '0'

                                                uint8_t b = (s >> 1);
                                                Demod.output[Demod.len] = b;
                                                Demod.len++;
                                                uint8_t b = (s >> 1);
                                                Demod.output[Demod.len] = b;
                                                Demod.len++;

+                                               Demod.bitCount = 0;

                                                Demod.state = DEMOD_AWAITING_START_BIT;
                                        } else {
                                                Demod.state = DEMOD_UNSYNCD;
                                                LED_C_OFF();
                                                Demod.state = DEMOD_AWAITING_START_BIT;
                                        } else {
                                                Demod.state = DEMOD_UNSYNCD;
                                                LED_C_OFF();

-                                               if(s == 0x000) {
+                                               if (s == 0x000) {

                                                        // This is EOF (start, stop and all data bits == '0'
                                                        return true;
                                                }
                                                        // This is EOF (start, stop and all data bits == '0'
                                                        return true;
                                                }


@@ -688,8 +698,8 @@ static void DemodInit(uint8_t *data)
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'true' to disable debug output
  */
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'true' to disable debug output
  */

-static void GetSamplesFor14443bDemod(int n, bool quiet)
-{
+static int GetSamplesFor14443bDemod(int timeout, bool quiet) {
+       int ret = 0;

        int maxBehindBy = 0;
        bool gotFrame = false;
        int lastRxCounter, samples = 0;
        int maxBehindBy = 0;
        bool gotFrame = false;
        int lastRxCounter, samples = 0;


@@ -712,7 +722,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY))
 
        // Setup and start DMA.
        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY))
 
        // Setup and start DMA.

-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
 
        uint16_t *upTo = dmaBuf;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
 
        uint16_t *upTo = dmaBuf;


@@ -721,7 +731,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        // Signal field is ON with the appropriate LED:
        LED_D_ON();
        // And put the FPGA in the appropriate mode
        // Signal field is ON with the appropriate LED:
        LED_D_ON();
        // And put the FPGA in the appropriate mode

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_848_KHZ | FPGA_HF_READER_MODE_RECEIVE_IQ);

 
        for(;;) {
                int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & (ISO14443B_DMA_BUFFER_SIZE-1);
 
        for(;;) {
                int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & (ISO14443B_DMA_BUFFER_SIZE-1);


@@ -745,12 +755,15 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
                }
                samples++;
 
                }
                samples++;
 

-               if(Handle14443bSamplesDemod(ci, cq)) {
+               if (Handle14443bSamplesDemod(ci, cq)) {
+                       ret = Demod.len;

                        gotFrame = true;
                        break;
                }
 
                        gotFrame = true;
                        break;
                }
 

-               if(samples > n) {
+               if(samples > timeout && Demod.state < DEMOD_PHASE_REF_TRAINING) {
+                       ret = -1;
+                       LED_C_OFF();

                        break;
                }
        }
                        break;
                }
        }


@@ -758,10 +771,14 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        FpgaDisableSscDma();
 
        if (!quiet) Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", maxBehindBy, samples, gotFrame, Demod.len, Demod.sumI, Demod.sumQ);
        FpgaDisableSscDma();
 
        if (!quiet) Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", maxBehindBy, samples, gotFrame, Demod.len, Demod.sumI, Demod.sumQ);

-       //Tracing
-       if (Demod.len > 0) {
-               LogTrace(Demod.output, Demod.len, 0, 0, NULL, false);
+
+       if (ret < 0) {
+               return ret;

        }
        }

+       //Tracing
+       LogTrace(Demod.output, Demod.len, 0, 0, NULL, false);
+
+       return ret;

 }
 
 
 }
 
 


@@ -770,28 +787,21 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
 //-----------------------------------------------------------------------------
 static void TransmitFor14443b(void)
 {
 //-----------------------------------------------------------------------------
 static void TransmitFor14443b(void)
 {

-       int c;
-
-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_TX);
-
-       // Signal field is ON with the appropriate Red LED
-       LED_D_ON();
-       // Signal we are transmitting with the Green LED
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_SHALLOW_MOD);

        LED_B_ON();
        LED_B_ON();

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
-
-       c = 0;
-       for(;;) {
-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-                       AT91C_BASE_SSC->SSC_THR = ~ToSend[c];
-                       c++;
-                       if(c >= ToSendMax) {
-                               break;
-                       }
+       for(int c = 0; c < ToSendMax; c++) {
+               uint8_t data = ToSend[c];
+               for (int i = 0; i < 8; i++) {
+                       uint16_t send_word = (data & 0x80) ? 0x0000 : 0xffff;
+                       while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) ;
+                       AT91C_BASE_SSC->SSC_THR = send_word;
+                       while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) ;
+                       AT91C_BASE_SSC->SSC_THR = send_word;
+                       data <<= 1;

                }
                WDT_HIT();
        }
                }
                WDT_HIT();
        }

-       LED_B_OFF(); // Finished sending
+       LED_B_OFF();

 }
 
 
 }
 
 


@@ -859,8 +869,8 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
 /* Sends an APDU to the tag
  * TODO: check CRC and preamble
  */
 /* Sends an APDU to the tag
  * TODO: check CRC and preamble
  */

-int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response)
-{
+int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response) {
+       LED_A_ON();

        uint8_t message_frame[message_length + 4];
        // PCB
        message_frame[0] = 0x0A | pcb_blocknum;
        uint8_t message_frame[message_length + 4];
        // PCB
        message_frame[0] = 0x0A | pcb_blocknum;


@@ -874,18 +884,19 @@ int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *respo
        // send
        CodeAndTransmit14443bAsReader(message_frame, message_length + 4);
        // get response
        // send
        CodeAndTransmit14443bAsReader(message_frame, message_length + 4);
        // get response

-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
-       if(Demod.len < 3)
-       {
+       int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       FpgaDisableTracing();
+       if (ret < 3) {
+               LED_A_OFF();

                return 0;
        }
        // TODO: Check CRC
        // copy response contents
                return 0;
        }
        // TODO: Check CRC
        // copy response contents

-       if(response != NULL)
-       {
+       if (response != NULL) {

                memcpy(response, Demod.output, Demod.len);
        }
                memcpy(response, Demod.output, Demod.len);
        }

-       return Demod.len;
+       LED_A_OFF();
+       return ret;

 }
 
 /* Perform the ISO 14443 B Card Selection procedure
 }
 
 /* Perform the ISO 14443 B Card Selection procedure


@@ -904,10 +915,9 @@ int iso14443b_select_card()
 
        // first, wake up the tag
        CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
 
        // first, wake up the tag
        CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));

-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);

        // ATQB too short?
        // ATQB too short?

-       if (Demod.len < 14)
-       {
+       if (ret < 14) {

                return 2;
        }
 
                return 2;
        }
 


@@ -919,10 +929,9 @@ int iso14443b_select_card()
     attrib[7] = Demod.output[10] & 0x0F;
     ComputeCrc14443(CRC_14443_B, attrib, 9, attrib + 9, attrib + 10);
     CodeAndTransmit14443bAsReader(attrib, sizeof(attrib));
     attrib[7] = Demod.output[10] & 0x0F;
     ComputeCrc14443(CRC_14443_B, attrib, 9, attrib + 9, attrib + 10);
     CodeAndTransmit14443bAsReader(attrib, sizeof(attrib));

-    GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+    ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);

     // Answer to ATTRIB too short?
     // Answer to ATTRIB too short?

-    if(Demod.len < 3)
-       {
+    if (ret < 3) {

                return 2;
        }
        // reset PCB block number
                return 2;
        }
        // reset PCB block number


@@ -934,13 +943,13 @@ int iso14443b_select_card()
 void iso14443b_setup() {
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Set up the synchronous serial port
 void iso14443b_setup() {
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Set up the synchronous serial port

-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_TX);
+       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

        // connect Demodulated Signal to ADC:
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // Signal field is on with the appropriate LED
     LED_D_ON();
        // connect Demodulated Signal to ADC:
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // Signal field is on with the appropriate LED
     LED_D_ON();

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_SHALLOW_MOD);

 
        DemodReset();
        UartReset();
 
        DemodReset();
        UartReset();


@@ -957,6 +966,7 @@ void iso14443b_setup() {
 //-----------------------------------------------------------------------------
 void ReadSTMemoryIso14443b(uint32_t dwLast)
 {
 //-----------------------------------------------------------------------------
 void ReadSTMemoryIso14443b(uint32_t dwLast)
 {

+       LED_A_ON();

        uint8_t i = 0x00;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        uint8_t i = 0x00;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -967,12 +977,12 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        SpinDelay(200);
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        SpinDelay(200);
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

 
        // Now give it time to spin up.
        // Signal field is on with the appropriate LED
        LED_D_ON();
 
        // Now give it time to spin up.
        // Signal field is on with the appropriate LED
        LED_D_ON();

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_SHALLOW_MOD);

        SpinDelay(200);
 
        clear_trace();
        SpinDelay(200);
 
        clear_trace();


@@ -981,12 +991,12 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        // First command: wake up the tag using the INITIATE command
        uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b};
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
        // First command: wake up the tag using the INITIATE command
        uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b};
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));

-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);

 
 

-       if (Demod.len == 0) {
-               DbpString("No response from tag");
-               LED_D_OFF();
+       if (ret < 0) {

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+               DbpString("No response from tag");
+               LEDsoff();

                return;
        } else {
                Dbprintf("Randomly generated Chip ID (+ 2 byte CRC): %02x %02x %02x",
                return;
        } else {
                Dbprintf("Randomly generated Chip ID (+ 2 byte CRC): %02x %02x %02x",


@@ -999,26 +1009,26 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        cmd1[1] = Demod.output[0];
        ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
        cmd1[1] = Demod.output[0];
        ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));

-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);

        if (Demod.len != 3) {
        if (Demod.len != 3) {

-               Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
-               LED_D_OFF();

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+               Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
+               LEDsoff();

                return;
        }
        // Check the CRC of the answer:
        ComputeCrc14443(CRC_14443_B, Demod.output, 1 , &cmd1[2], &cmd1[3]);
        if(cmd1[2] != Demod.output[1] || cmd1[3] != Demod.output[2]) {
                return;
        }
        // Check the CRC of the answer:
        ComputeCrc14443(CRC_14443_B, Demod.output, 1 , &cmd1[2], &cmd1[3]);
        if(cmd1[2] != Demod.output[1] || cmd1[3] != Demod.output[2]) {

-               DbpString("CRC Error reading select response.");
-               LED_D_OFF();

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+               DbpString("CRC Error reading select response.");
+               LEDsoff();

                return;
        }
        // Check response from the tag: should be the same UID as the command we just sent:
        if (cmd1[1] != Demod.output[0]) {
                return;
        }
        // Check response from the tag: should be the same UID as the command we just sent:
        if (cmd1[1] != Demod.output[0]) {

-               Dbprintf("Bad response to SELECT from Tag, aborting: %02x %02x", cmd1[1], Demod.output[0]);
-               LED_D_OFF();

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+               Dbprintf("Bad response to SELECT from Tag, aborting: %02x %02x", cmd1[1], Demod.output[0]);
+               LEDsoff();

                return;
        }
 
                return;
        }
 


@@ -1027,11 +1037,11 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        cmd1[0] = 0x0B;
        ComputeCrc14443(CRC_14443_B, cmd1, 1 , &cmd1[1], &cmd1[2]);
        CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one
        cmd1[0] = 0x0B;
        ComputeCrc14443(CRC_14443_B, cmd1, 1 , &cmd1[1], &cmd1[2]);
        CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one

-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
-       if (Demod.len != 10) {
-               Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
-               LED_D_OFF();
+       ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       if (ret != 10) {

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+               Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
+               LEDsoff();

                return;
        }
        // The check the CRC of the answer (use cmd1 as temporary variable):
                return;
        }
        // The check the CRC of the answer (use cmd1 as temporary variable):


@@ -1058,16 +1068,16 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
                cmd1[1] = i;
                ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
                CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
                cmd1[1] = i;
                ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
                CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));

-               GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
-               if (Demod.len != 6) { // Check if we got an answer from the tag
-                       DbpString("Expected 6 bytes from tag, got less...");
-                       LED_D_OFF();
+               ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+               if (ret != 6) { // Check if we got an answer from the tag

                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+                       DbpString("Expected 6 bytes from tag, got less...");
+                       LEDsoff();

                        return;
                }
                // The check the CRC of the answer (use cmd1 as temporary variable):
                ComputeCrc14443(CRC_14443_B, Demod.output, 4, &cmd1[2], &cmd1[3]);
                        return;
                }
                // The check the CRC of the answer (use cmd1 as temporary variable):
                ComputeCrc14443(CRC_14443_B, Demod.output, 4, &cmd1[2], &cmd1[3]);

-               if(cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) {
+               if (cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) {

                        Dbprintf("CRC Error reading block! Expected: %04x got: %04x",
                                        (cmd1[2]<<8)+cmd1[3], (Demod.output[4]<<8)+Demod.output[5]);
                        // Do not return;, let's go on... (we should retry, maybe ?)
                        Dbprintf("CRC Error reading block! Expected: %04x got: %04x",
                                        (cmd1[2]<<8)+cmd1[3], (Demod.output[4]<<8)+Demod.output[5]);
                        // Do not return;, let's go on... (we should retry, maybe ?)


@@ -1082,8 +1092,8 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
                i++;
        }
        
                i++;
        }
        

-       LED_D_OFF();

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+       LEDsoff();

 }
 
 
 }
 
 


@@ -1106,6 +1116,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
  */
 void RAMFUNC SnoopIso14443b(void)
 {
  */
 void RAMFUNC SnoopIso14443b(void)
 {

+       LED_A_ON();

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        BigBuf_free();
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        BigBuf_free();
 


@@ -1133,15 +1144,15 @@ void RAMFUNC SnoopIso14443b(void)
        Dbprintf("  tag -> Reader: %i bytes", MAX_FRAME_SIZE);
        Dbprintf("  DMA: %i bytes", ISO14443B_DMA_BUFFER_SIZE);
 
        Dbprintf("  tag -> Reader: %i bytes", MAX_FRAME_SIZE);
        Dbprintf("  DMA: %i bytes", ISO14443B_DMA_BUFFER_SIZE);
 

-       // Signal field is off, no reader signal, no tag signal
-       LEDsoff();
+       // Signal field is off
+       LED_D_OFF();

 
        // And put the FPGA in the appropriate mode
 
        // And put the FPGA in the appropriate mode

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_848_KHZ | FPGA_HF_READER_MODE_SNOOP_IQ);

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // Setup for the DMA.
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // Setup for the DMA.

-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

        upTo = dmaBuf;
        lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
        upTo = dmaBuf;
        lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);


@@ -1208,8 +1219,8 @@ void RAMFUNC SnoopIso14443b(void)
                        ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
                }
 
                        ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
                }
 

-               if(!ReaderIsActive && triggered) {                                              // no need to try decoding tag data if the reader is sending or not yet triggered
-                       if(Handle14443bSamplesDemod(ci/2, cq/2)) {
+               if (!ReaderIsActive && triggered) {                                             // no need to try decoding tag data if the reader is sending or not yet triggered
+                       if (Handle14443bSamplesDemod(ci/2, cq/2) >= 0) {

                                //Use samples as a time measurement
                                LogTrace(Demod.output, Demod.len, samples, samples, NULL, false);
                                // And ready to receive another response.
                                //Use samples as a time measurement
                                LogTrace(Demod.output, Demod.len, samples, samples, NULL, false);
                                // And ready to receive another response.


@@ -1221,13 +1232,13 @@ void RAMFUNC SnoopIso14443b(void)
        }
 
        FpgaDisableSscDma();
        }
 
        FpgaDisableSscDma();

-       LEDsoff();

        DbpString("Snoop statistics:");
        Dbprintf("  Max behind by: %i", maxBehindBy);
        Dbprintf("  Uart State: %x", Uart.state);
        Dbprintf("  Uart ByteCnt: %i", Uart.byteCnt);
        Dbprintf("  Uart ByteCntMax: %i", Uart.byteCntMax);
        Dbprintf("  Trace length: %i", BigBuf_get_traceLen());
        DbpString("Snoop statistics:");
        Dbprintf("  Max behind by: %i", maxBehindBy);
        Dbprintf("  Uart State: %x", Uart.state);
        Dbprintf("  Uart ByteCnt: %i", Uart.byteCnt);
        Dbprintf("  Uart ByteCntMax: %i", Uart.byteCntMax);
        Dbprintf("  Trace length: %i", BigBuf_get_traceLen());

+       LEDsoff();

 }
 
 
 }
 
 


@@ -1245,12 +1256,14 @@ void RAMFUNC SnoopIso14443b(void)
  */
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[])
 {
  */
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[])
 {

+       LED_A_ON();

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // switch field on and give tag some time to power up
        LED_D_ON();
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        // switch field on and give tag some time to power up
        LED_D_ON();

-       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_TX);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_SHALLOW_MOD);
+       FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

        SpinDelay(10);
 
        if (datalen){
        SpinDelay(10);
 
        if (datalen){


@@ -1258,16 +1271,21 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
                
                CodeAndTransmit14443bAsReader(data, datalen);
 
                
                CodeAndTransmit14443bAsReader(data, datalen);
 

-               if(recv) {
-                       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+               if (recv) {
+                       int ret = GetSamplesFor14443bDemod(5*RECEIVE_SAMPLES_TIMEOUT, true);
+                       FpgaDisableTracing();

                        uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
                        uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);

-                       cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
+                       cmd_send(CMD_ACK, ret, 0, 0, Demod.output, iLen);

                }
                }

+
+               FpgaDisableTracing();

        }
 
        }
 

-       if(!powerfield) {
+       if (!powerfield) {

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                LED_D_OFF();
        }
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                LED_D_OFF();
        }

+       
+       LED_A_OFF();

 }
 
 }