usb communication (device side) refactoring

[proxmark3-svn] / armsrc / iso15693.c

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index bb5bdfe273385d8428ea9689d1c933d8dcb9eab3..9f6516aad3398c5df4524ee1b3c1d377c0b313e4 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -58,7 +58,7 @@
 #include "string.h"
 #include "iso15693tools.h"
 #include "protocols.h"
 #include "string.h"
 #include "iso15693tools.h"
 #include "protocols.h"

-#include "cmd.h"
+#include "usb_cdc.h"

 #include "BigBuf.h"
 #include "fpgaloader.h"
 
 #include "BigBuf.h"
 #include "fpgaloader.h"
 


@@ -69,19 +69,19 @@
 #define DELAY_READER_TO_ARM               8
 #define DELAY_ARM_TO_READER               0
 //SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader. All values should be multiples of 16
 #define DELAY_READER_TO_ARM               8
 #define DELAY_ARM_TO_READER               0
 //SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader. All values should be multiples of 16

-#define DELAY_TAG_TO_ARM                 32

 #define DELAY_ARM_TO_TAG                 16
 #define DELAY_ARM_TO_TAG                 16

+#define DELAY_TAG_TO_ARM                 32
+//SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when snooping. All values should be multiples of 16
+#define DELAY_TAG_TO_ARM_SNOOP           32
+#define DELAY_READER_TO_ARM_SNOOP        32

 
 

-static int DEBUG = 0;
+// times in samples @ 212kHz when acting as reader
+//#define ISO15693_READER_TIMEOUT              80 // 80/212kHz = 378us, nominal t1_max=313,9us
+#define ISO15693_READER_TIMEOUT             330 // 330/212kHz = 1558us, should be even enough for iClass tags responding to ACTALL
+#define ISO15693_READER_TIMEOUT_WRITE      4700 // 4700/212kHz = 22ms, nominal 20ms

 
 
 
 

-// specific LogTrace function for ISO15693: the duration needs to be scaled because otherwise it won't fit into a uint16_t
-bool LogTrace_ISO15693(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
-       uint32_t duration = timestamp_end - timestamp_start;
-       duration /= 32;
-       timestamp_end = timestamp_start + duration;
-       return LogTrace(btBytes, iLen, timestamp_start, timestamp_end, parity, readerToTag);
-}
+static int DEBUG = 0;

 
 
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////


@@ -90,10 +90,20 @@ bool LogTrace_ISO15693(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp
 ///////////////////////////////////////////////////////////////////////
 
 // buffers
 ///////////////////////////////////////////////////////////////////////
 
 // buffers

-#define ISO15693_DMA_BUFFER_SIZE       2048 // must be a power of 2
+#define ISO15693_DMA_BUFFER_SIZE        256 // must be a power of 2

 #define ISO15693_MAX_RESPONSE_LENGTH     36 // allows read single block with the maximum block size of 256bits. Read multiple blocks not supported yet
 #define ISO15693_MAX_COMMAND_LENGTH      45 // allows write single block with the maximum block size of 256bits. Write multiple blocks not supported yet
 
 #define ISO15693_MAX_RESPONSE_LENGTH     36 // allows read single block with the maximum block size of 256bits. Read multiple blocks not supported yet
 #define ISO15693_MAX_COMMAND_LENGTH      45 // allows write single block with the maximum block size of 256bits. Write multiple blocks not supported yet
 

+
+// specific LogTrace function for ISO15693: the duration needs to be scaled because otherwise it won't fit into a uint16_t
+bool LogTrace_ISO15693(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
+       uint32_t duration = timestamp_end - timestamp_start;
+       duration /= 32;
+       timestamp_end = timestamp_start + duration;
+       return LogTrace(btBytes, iLen, timestamp_start, timestamp_end, parity, readerToTag);
+}
+
+

 // ---------------------------
 // Signal Processing
 // ---------------------------
 // ---------------------------
 // Signal Processing
 // ---------------------------


@@ -136,6 +146,15 @@ void CodeIso15693AsReader(uint8_t *cmd, int n) {
        ToSendMax++;
 }
 
        ToSendMax++;
 }
 

+
+// Encode EOF only
+static void CodeIso15693AsReaderEOF() {
+       ToSendReset();
+       ToSend[++ToSendMax] = 0x20;
+       ToSendMax++;
+}
+
+

 // encode data using "1 out of 256" scheme
 // data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances
 // encode data using "1 out of 256" scheme
 // data rate is 1,66 kbit/s (fc/8192)
 // is designed for more robust communication over longer distances


@@ -383,14 +402,13 @@ typedef struct DecodeTag {
 } DecodeTag_t;
 
 
 } DecodeTag_t;
 
 

-static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint16_t amplitude, DecodeTag_t *DecodeTag)
-{
-       switch(DecodeTag->state) {
+static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint16_t amplitude, DecodeTag_t *DecodeTag) {
+       switch (DecodeTag->state) {

                case STATE_TAG_SOF_LOW:
                        // waiting for a rising edge
                        if (amplitude > NOISE_THRESHOLD + DecodeTag->previous_amplitude) {
                                if (DecodeTag->posCount > 10) {
                case STATE_TAG_SOF_LOW:
                        // waiting for a rising edge
                        if (amplitude > NOISE_THRESHOLD + DecodeTag->previous_amplitude) {
                                if (DecodeTag->posCount > 10) {

-                                       DecodeTag->threshold_sof = amplitude - DecodeTag->previous_amplitude;
+                                       DecodeTag->threshold_sof = amplitude - DecodeTag->previous_amplitude; // to be divided by 2

                                        DecodeTag->threshold_half = 0;
                                        DecodeTag->state = STATE_TAG_SOF_RISING_EDGE;
                                } else {
                                        DecodeTag->threshold_half = 0;
                                        DecodeTag->state = STATE_TAG_SOF_RISING_EDGE;
                                } else {


@@ -403,8 +421,8 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
                        break;
 
                case STATE_TAG_SOF_RISING_EDGE:
                        break;
 
                case STATE_TAG_SOF_RISING_EDGE:

-                       if (amplitude - DecodeTag->previous_amplitude > DecodeTag->threshold_sof) { // edge still rising
-                               if (amplitude - DecodeTag->threshold_sof > DecodeTag->threshold_sof) { // steeper edge, take this as time reference
+                       if (amplitude > DecodeTag->threshold_sof + DecodeTag->previous_amplitude) { // edge still rising
+                               if (amplitude > DecodeTag->threshold_sof + DecodeTag->threshold_sof) { // steeper edge, take this as time reference

                                        DecodeTag->posCount = 1;
                                } else {
                                        DecodeTag->posCount = 2;
                                        DecodeTag->posCount = 1;
                                } else {
                                        DecodeTag->posCount = 2;


@@ -447,7 +465,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
                                DecodeTag->sum2 = 0;
                                DecodeTag->posCount = 2;
                                DecodeTag->state = STATE_TAG_RECEIVING_DATA;
                                DecodeTag->sum2 = 0;
                                DecodeTag->posCount = 2;
                                DecodeTag->state = STATE_TAG_RECEIVING_DATA;

-                               FpgaDisableTracing(); // DEBUGGING
+                               // FpgaDisableTracing(); // DEBUGGING

                                // Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d",
                                        // amplitude,
                                        // DecodeTag->threshold_sof,
                                // Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d",
                                        // amplitude,
                                        // DecodeTag->threshold_sof,


@@ -466,6 +484,12 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
                        break;
 
                case STATE_TAG_RECEIVING_DATA:
                        break;
 
                case STATE_TAG_RECEIVING_DATA:

+                               // FpgaDisableTracing(); // DEBUGGING
+                               // Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d",
+                                       // amplitude,
+                                       // DecodeTag->threshold_sof,
+                                       // DecodeTag->threshold_half/4,
+                                       // DecodeTag->previous_amplitude); // DEBUGGING

                        if (DecodeTag->posCount == 1) {
                                DecodeTag->sum1 = 0;
                                DecodeTag->sum2 = 0;
                        if (DecodeTag->posCount == 1) {
                                DecodeTag->sum1 = 0;
                                DecodeTag->sum2 = 0;


@@ -658,7 +682,7 @@ int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeo
 
                if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                // we have read all of the DMA buffer content.
                        upTo = dmaBuf;                                             // start reading the circular buffer from the beginning
 
                if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                // we have read all of the DMA buffer content.
                        upTo = dmaBuf;                                             // start reading the circular buffer from the beginning

-                       if(behindBy > (9*ISO15693_DMA_BUFFER_SIZE/10)) {
+                       if (behindBy > (9*ISO15693_DMA_BUFFER_SIZE/10)) {

                                Dbprintf("About to blow circular buffer - aborted! behindBy=%d", behindBy);
                                ret = -1;
                                break;
                                Dbprintf("About to blow circular buffer - aborted! behindBy=%d", behindBy);
                                ret = -1;
                                break;


@@ -731,7 +755,8 @@ typedef struct DecodeReader {
                STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF,
                STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4,
                STATE_READER_RECEIVE_DATA_1_OUT_OF_4,
                STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF,
                STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4,
                STATE_READER_RECEIVE_DATA_1_OUT_OF_4,

-               STATE_READER_RECEIVE_DATA_1_OUT_OF_256
+               STATE_READER_RECEIVE_DATA_1_OUT_OF_256,
+               STATE_READER_RECEIVE_JAMMING

        }           state;
        enum {
                CODING_1_OUT_OF_4,
        }           state;
        enum {
                CODING_1_OUT_OF_4,


@@ -744,11 +769,12 @@ typedef struct DecodeReader {
        int         posCount;
        int         sum1, sum2;
        uint8_t     *output;
        int         posCount;
        int         sum1, sum2;
        uint8_t     *output;

+       uint8_t     jam_search_len;
+       uint8_t     *jam_search_string;

 } DecodeReader_t;
 
 
 } DecodeReader_t;
 
 

-static void DecodeReaderInit(DecodeReader_t* DecodeReader, uint8_t *data, uint16_t max_len)
-{
+static void DecodeReaderInit(DecodeReader_t* DecodeReader, uint8_t *data, uint16_t max_len, uint8_t jam_search_len, uint8_t *jam_search_string) {

        DecodeReader->output = data;
        DecodeReader->byteCountMax = max_len;
        DecodeReader->state = STATE_READER_UNSYNCD;
        DecodeReader->output = data;
        DecodeReader->byteCountMax = max_len;
        DecodeReader->state = STATE_READER_UNSYNCD;


@@ -756,17 +782,17 @@ static void DecodeReaderInit(DecodeReader_t* DecodeReader, uint8_t *data, uint16
        DecodeReader->bitCount = 0;
        DecodeReader->posCount = 1;
        DecodeReader->shiftReg = 0;
        DecodeReader->bitCount = 0;
        DecodeReader->posCount = 1;
        DecodeReader->shiftReg = 0;

+       DecodeReader->jam_search_len = jam_search_len;
+       DecodeReader->jam_search_string = jam_search_string;

 }
 
 
 }
 
 

-static void DecodeReaderReset(DecodeReader_t* DecodeReader)
-{
+static void DecodeReaderReset(DecodeReader_t* DecodeReader) {

        DecodeReader->state = STATE_READER_UNSYNCD;
 }
 
 
        DecodeReader->state = STATE_READER_UNSYNCD;
 }
 
 

-static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uint8_t bit, DecodeReader_t *restrict DecodeReader)
-{
+static int inline __attribute__((always_inline)) Handle15693SampleFromReader(bool bit, DecodeReader_t *DecodeReader) {

        switch (DecodeReader->state) {
                case STATE_READER_UNSYNCD:
                        // wait for unmodulated carrier
        switch (DecodeReader->state) {
                case STATE_READER_UNSYNCD:
                        // wait for unmodulated carrier


@@ -881,16 +907,15 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                        break;
 
                case STATE_READER_RECEIVE_DATA_1_OUT_OF_4:
                        break;
 
                case STATE_READER_RECEIVE_DATA_1_OUT_OF_4:

-                       bit = !!bit;

                        DecodeReader->posCount++;
                        if (DecodeReader->posCount == 1) {
                        DecodeReader->posCount++;
                        if (DecodeReader->posCount == 1) {

-                               DecodeReader->sum1 = bit;
+                               DecodeReader->sum1 = bit?1:0;

                        } else if (DecodeReader->posCount <= 4) {
                        } else if (DecodeReader->posCount <= 4) {

-                               DecodeReader->sum1 += bit;
+                               if (bit) DecodeReader->sum1++;

                        } else if (DecodeReader->posCount == 5) {
                        } else if (DecodeReader->posCount == 5) {

-                               DecodeReader->sum2 = bit;
+                               DecodeReader->sum2 = bit?1:0;

                        } else {
                        } else {

-                               DecodeReader->sum2 += bit;
+                               if (bit) DecodeReader->sum2++;

                        }
                        if (DecodeReader->posCount == 8) {
                                DecodeReader->posCount = 0;
                        }
                        if (DecodeReader->posCount == 8) {
                                DecodeReader->posCount = 0;


@@ -900,8 +925,7 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                                        if (DecodeReader->byteCount != 0) {
                                                return true;
                                        }
                                        if (DecodeReader->byteCount != 0) {
                                                return true;
                                        }

-                               }
-                               if (DecodeReader->sum1 >= 3 && DecodeReader->sum2 <= 1) { // detected a 2bit position
+                               } else if (DecodeReader->sum1 >= 3 && DecodeReader->sum2 <= 1) { // detected a 2bit position

                                        DecodeReader->shiftReg >>= 2;
                                        DecodeReader->shiftReg |= (DecodeReader->bitCount << 6);
                                }
                                        DecodeReader->shiftReg >>= 2;
                                        DecodeReader->shiftReg |= (DecodeReader->bitCount << 6);
                                }


@@ -914,6 +938,13 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                                        }
                                        DecodeReader->bitCount = 0;
                                        DecodeReader->shiftReg = 0;
                                        }
                                        DecodeReader->bitCount = 0;
                                        DecodeReader->shiftReg = 0;

+                                       if (DecodeReader->byteCount == DecodeReader->jam_search_len) {
+                                               if (!memcmp(DecodeReader->output, DecodeReader->jam_search_string, DecodeReader->jam_search_len)) {
+                                                       LED_D_ON();
+                                                       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_JAM);
+                                                       DecodeReader->state = STATE_READER_RECEIVE_JAMMING;
+                                               }
+                                       }

                                } else {
                                        DecodeReader->bitCount++;
                                }
                                } else {
                                        DecodeReader->bitCount++;
                                }


@@ -921,16 +952,15 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                        break;
 
                case STATE_READER_RECEIVE_DATA_1_OUT_OF_256:
                        break;
 
                case STATE_READER_RECEIVE_DATA_1_OUT_OF_256:

-                       bit = !!bit;

                        DecodeReader->posCount++;
                        if (DecodeReader->posCount == 1) {
                        DecodeReader->posCount++;
                        if (DecodeReader->posCount == 1) {

-                               DecodeReader->sum1 = bit;
+                               DecodeReader->sum1 = bit?1:0;

                        } else if (DecodeReader->posCount <= 4) {
                        } else if (DecodeReader->posCount <= 4) {

-                               DecodeReader->sum1 += bit;
+                               if (bit) DecodeReader->sum1++;

                        } else if (DecodeReader->posCount == 5) {
                        } else if (DecodeReader->posCount == 5) {

-                               DecodeReader->sum2 = bit;
-                       } else {
-                               DecodeReader->sum2 += bit;
+                               DecodeReader->sum2 = bit?1:0;
+                       } else if (bit) {
+                               DecodeReader->sum2++;

                        }
                        if (DecodeReader->posCount == 8) {
                                DecodeReader->posCount = 0;
                        }
                        if (DecodeReader->posCount == 8) {
                                DecodeReader->posCount = 0;


@@ -940,8 +970,7 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                                        if (DecodeReader->byteCount != 0) {
                                                return true;
                                        }
                                        if (DecodeReader->byteCount != 0) {
                                                return true;
                                        }

-                               }
-                               if (DecodeReader->sum1 >= 3 && DecodeReader->sum2 <= 1) { // detected the bit position
+                               } else if (DecodeReader->sum1 >= 3 && DecodeReader->sum2 <= 1) { // detected the bit position

                                        DecodeReader->shiftReg = DecodeReader->bitCount;
                                }
                                if (DecodeReader->bitCount == 255) { // we have a full byte
                                        DecodeReader->shiftReg = DecodeReader->bitCount;
                                }
                                if (DecodeReader->bitCount == 255) { // we have a full byte


@@ -951,11 +980,42 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin
                                                LED_B_OFF();
                                                DecodeReaderReset(DecodeReader);
                                        }
                                                LED_B_OFF();
                                                DecodeReaderReset(DecodeReader);
                                        }

+                                       if (DecodeReader->byteCount == DecodeReader->jam_search_len) {
+                                               if (!memcmp(DecodeReader->output, DecodeReader->jam_search_string, DecodeReader->jam_search_len)) {
+                                                       LED_D_ON();
+                                                       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_JAM);
+                                                       DecodeReader->state = STATE_READER_RECEIVE_JAMMING;
+                                               }
+                                       }

                                }
                                DecodeReader->bitCount++;
                        }
                        break;
 
                                }
                                DecodeReader->bitCount++;
                        }
                        break;
 

+               case STATE_READER_RECEIVE_JAMMING:
+                       DecodeReader->posCount++;
+                       if (DecodeReader->Coding == CODING_1_OUT_OF_4) {
+                               if (DecodeReader->posCount == 7*16) { // 7 bits jammed
+                                       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE); // stop jamming
+                                       // FpgaDisableTracing();
+                                       LED_D_OFF();
+                               } else if (DecodeReader->posCount == 8*16) {
+                                       DecodeReader->posCount = 0;
+                                       DecodeReader->output[DecodeReader->byteCount++] = 0x00;
+                                       DecodeReader->state = STATE_READER_RECEIVE_DATA_1_OUT_OF_4;
+                               }
+                       } else {
+                               if (DecodeReader->posCount == 7*256) { // 7 bits jammend
+                                       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE); // stop jamming
+                                       LED_D_OFF();
+                               } else if (DecodeReader->posCount == 8*256) {
+                                       DecodeReader->posCount = 0;
+                                       DecodeReader->output[DecodeReader->byteCount++] = 0x00;
+                                       DecodeReader->state = STATE_READER_RECEIVE_DATA_1_OUT_OF_256;
+                               }
+                       }
+                       break;
+

                default:
                        LED_B_OFF();
                        DecodeReaderReset(DecodeReader);
                default:
                        LED_B_OFF();
                        DecodeReaderReset(DecodeReader);


@@ -985,7 +1045,7 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo
 
        // the decoder data structure
        DecodeReader_t DecodeReader = {0};
 
        // the decoder data structure
        DecodeReader_t DecodeReader = {0};

-       DecodeReaderInit(&DecodeReader, received, max_len);
+       DecodeReaderInit(&DecodeReader, received, max_len, 0, NULL);

 
        // wait for last transfer to complete
        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY));
 
        // wait for last transfer to complete
        while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY));


@@ -1060,16 +1120,12 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo
 }
 
 
 }
 
 

-// Encode (into the ToSend buffers) an identify request, which is the first
+// Construct an identify (Inventory) request, which is the first

 // thing that you must send to a tag to get a response.
 // thing that you must send to a tag to get a response.

-static void BuildIdentifyRequest(void)
-{
-       uint8_t cmd[5];
-
+static void BuildIdentifyRequest(uint8_t *cmd) {

        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate
        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate

-       // AFI is at bit 5 (1<<4) when doing an INVENTORY
-       cmd[0] = (1 << 2) | (1 << 5) | (1 << 1);
+       cmd[0] = ISO15693_REQ_INVENTORY | ISO15693_REQINV_SLOT1 | ISO15693_REQ_DATARATE_HIGH;

        // inventory command code
        cmd[1] = 0x01;
        // no mask
        // inventory command code
        cmd[1] = 0x01;
        // no mask


@@ -1078,8 +1134,6 @@ static void BuildIdentifyRequest(void)
        crc = Iso15693Crc(cmd, 3);
        cmd[3] = crc & 0xff;
        cmd[4] = crc >> 8;
        crc = Iso15693Crc(cmd, 3);
        cmd[3] = crc & 0xff;
        cmd[4] = crc >> 8;

-
-       CodeIso15693AsReader(cmd, sizeof(cmd));

 }
 
 
 }
 
 


@@ -1088,8 +1142,7 @@ static void BuildIdentifyRequest(void)
 // for the response. The response is not demodulated, just left in the buffer
 // so that it can be downloaded to a PC and processed there.
 //-----------------------------------------------------------------------------
 // for the response. The response is not demodulated, just left in the buffer
 // so that it can be downloaded to a PC and processed there.
 //-----------------------------------------------------------------------------

-void AcquireRawAdcSamplesIso15693(void)
-{
+void AcquireRawAdcSamplesIso15693(void) {

        LED_A_ON();
 
        uint8_t *dest = BigBuf_get_addr();
        LED_A_ON();
 
        uint8_t *dest = BigBuf_get_addr();


@@ -1100,7 +1153,9 @@ void AcquireRawAdcSamplesIso15693(void)
        FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 

-       BuildIdentifyRequest();
+       uint8_t cmd[5];
+       BuildIdentifyRequest(cmd);
+       CodeIso15693AsReader(cmd, sizeof(cmd));

 
        // Give the tags time to energize
        SpinDelay(100);
 
        // Give the tags time to energize
        SpinDelay(100);


@@ -1126,19 +1181,17 @@ void AcquireRawAdcSamplesIso15693(void)
 }
 
 
 }
 
 

-void SnoopIso15693(void)
-{
+void SnoopIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
+

        LED_A_ON();
        LED_A_ON();

-       
+

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-       BigBuf_free();

 
        clear_trace();
        set_tracing(true);
 
        // The DMA buffer, used to stream samples from the FPGA
 
        clear_trace();
        set_tracing(true);
 
        // The DMA buffer, used to stream samples from the FPGA

-       uint16_t* dmaBuf = (uint16_t*)BigBuf_malloc(ISO15693_DMA_BUFFER_SIZE*sizeof(uint16_t));
-       uint16_t *upTo;
+       uint16_t dmaBuf[ISO15693_DMA_BUFFER_SIZE];

 
        // Count of samples received so far, so that we can include timing
        // information in the trace buffer.
 
        // Count of samples received so far, so that we can include timing
        // information in the trace buffer.


@@ -1148,9 +1201,9 @@ void SnoopIso15693(void)
        uint8_t response[ISO15693_MAX_RESPONSE_LENGTH];
        DecodeTagInit(&DecodeTag, response, sizeof(response));
 
        uint8_t response[ISO15693_MAX_RESPONSE_LENGTH];
        DecodeTagInit(&DecodeTag, response, sizeof(response));
 

-       DecodeReader_t DecodeReader = {0};;
+       DecodeReader_t DecodeReader = {0};

        uint8_t cmd[ISO15693_MAX_COMMAND_LENGTH];
        uint8_t cmd[ISO15693_MAX_COMMAND_LENGTH];

-       DecodeReaderInit(&DecodeReader, cmd, sizeof(cmd));
+       DecodeReaderInit(&DecodeReader, cmd, sizeof(cmd), jam_search_len, jam_search_string);

 
        // Print some debug information about the buffer sizes
        if (DEBUG) {
 
        // Print some debug information about the buffer sizes
        if (DEBUG) {


@@ -1163,28 +1216,41 @@ void SnoopIso15693(void)
        Dbprintf("Snoop started. Press PM3 Button to stop.");
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE);
        Dbprintf("Snoop started. Press PM3 Button to stop.");
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE);

+       LED_D_OFF();

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

-
-       // Setup for the DMA.

        FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
        FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

-       upTo = dmaBuf;
+       StartCountSspClk();

        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
 
        bool TagIsActive = false;
        bool ReaderIsActive = false;
        bool ExpectTagAnswer = false;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
 
        bool TagIsActive = false;
        bool ReaderIsActive = false;
        bool ExpectTagAnswer = false;

+       uint32_t dma_start_time = 0;
+       uint16_t *upTo = dmaBuf;

 
 

+       uint16_t max_behindBy = 0;
+       

        // And now we loop, receiving samples.
        for(;;) {
                uint16_t behindBy = ((uint16_t*)AT91C_BASE_PDC_SSC->PDC_RPR - upTo) & (ISO15693_DMA_BUFFER_SIZE-1);
        // And now we loop, receiving samples.
        for(;;) {
                uint16_t behindBy = ((uint16_t*)AT91C_BASE_PDC_SSC->PDC_RPR - upTo) & (ISO15693_DMA_BUFFER_SIZE-1);

-
+               if (behindBy > max_behindBy) {
+                       max_behindBy = behindBy;
+               }
+               

                if (behindBy == 0) continue;
 
                if (behindBy == 0) continue;
 

+               samples++;
+               if (samples == 1) {
+                       // DMA has transferred the very first data
+                       dma_start_time = GetCountSspClk() & 0xfffffff0;
+               }
+

                uint16_t snoopdata = *upTo++;
 
                uint16_t snoopdata = *upTo++;
 

-               if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                    // we have read all of the DMA buffer content.
+               if (upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                   // we have read all of the DMA buffer content.

                        upTo = dmaBuf;                                                 // start reading the circular buffer from the beginning
                        upTo = dmaBuf;                                                 // start reading the circular buffer from the beginning

-                       if(behindBy > (9*ISO15693_DMA_BUFFER_SIZE/10)) {
+                       if (behindBy > (9*ISO15693_DMA_BUFFER_SIZE/10)) {
+                               // FpgaDisableTracing();

                                Dbprintf("About to blow circular buffer - aborted! behindBy=%d, samples=%d", behindBy, samples);
                                break;
                        }
                                Dbprintf("About to blow circular buffer - aborted! behindBy=%d, samples=%d", behindBy, samples);
                                break;
                        }


@@ -1192,71 +1258,101 @@ void SnoopIso15693(void)
                                AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;          // refresh the DMA Next Buffer and
                                AT91C_BASE_PDC_SSC->PDC_RNCR = ISO15693_DMA_BUFFER_SIZE;   // DMA Next Counter registers
                                WDT_HIT();
                                AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;          // refresh the DMA Next Buffer and
                                AT91C_BASE_PDC_SSC->PDC_RNCR = ISO15693_DMA_BUFFER_SIZE;   // DMA Next Counter registers
                                WDT_HIT();

-                               if(BUTTON_PRESS()) {
+                               if (BUTTON_PRESS()) {

                                        DbpString("Snoop stopped.");
                                        break;
                                }
                        }
                }
                                        DbpString("Snoop stopped.");
                                        break;
                                }
                        }
                }

-               samples++;

 
 

-               if (!TagIsActive) {                                            // no need to try decoding reader data if the tag is sending
+               if (!TagIsActive) {                                                // no need to try decoding reader data if the tag is sending

                        if (Handle15693SampleFromReader(snoopdata & 0x02, &DecodeReader)) {
                        if (Handle15693SampleFromReader(snoopdata & 0x02, &DecodeReader)) {

-                               FpgaDisableSscDma();
-                               ExpectTagAnswer = true;
-                               LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, samples*64, samples*64, NULL, true);
+                               // FpgaDisableSscDma();
+                               uint32_t eof_time = dma_start_time + samples*16 + 8 - DELAY_READER_TO_ARM_SNOOP; // end of EOF
+                               if (DecodeReader.byteCount > 0) {
+                                       uint32_t sof_time = eof_time
+                                                                       - DecodeReader.byteCount * (DecodeReader.Coding==CODING_1_OUT_OF_4?128*16:2048*16) // time for byte transfers
+                                                                       - 32*16  // time for SOF transfer
+                                                                       - 16*16; // time for EOF transfer
+                                       LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, sof_time*4, eof_time*4, NULL, true);
+                               }

                                /* And ready to receive another command. */
                                DecodeReaderReset(&DecodeReader);
                                /* And also reset the demod code, which might have been */
                                /* false-triggered by the commands from the reader. */
                                DecodeTagReset(&DecodeTag);
                                /* And ready to receive another command. */
                                DecodeReaderReset(&DecodeReader);
                                /* And also reset the demod code, which might have been */
                                /* false-triggered by the commands from the reader. */
                                DecodeTagReset(&DecodeTag);

-                               upTo = dmaBuf;
-                               FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
-                       }
-                       if (Handle15693SampleFromReader(snoopdata & 0x01, &DecodeReader)) {
-                               FpgaDisableSscDma();
+                               ReaderIsActive = false;

                                ExpectTagAnswer = true;
                                ExpectTagAnswer = true;

-                               LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, samples*64, samples*64, NULL, true);
+                               // upTo = dmaBuf;
+                               // samples = 0;
+                               // FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+                               // continue;
+                       } else if (Handle15693SampleFromReader(snoopdata & 0x01, &DecodeReader)) {
+                               // FpgaDisableSscDma();
+                               uint32_t eof_time = dma_start_time + samples*16 + 16 - DELAY_READER_TO_ARM_SNOOP; // end of EOF
+                               if (DecodeReader.byteCount > 0) {
+                                       uint32_t sof_time = eof_time
+                                                                       - DecodeReader.byteCount * (DecodeReader.Coding==CODING_1_OUT_OF_4?128*16:2048*16) // time for byte transfers
+                                                                       - 32*16  // time for SOF transfer
+                                                                       - 16*16; // time for EOF transfer
+                                       LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, sof_time*4, eof_time*4, NULL, true);
+                               }

                                /* And ready to receive another command. */
                                DecodeReaderReset(&DecodeReader);
                                /* And also reset the demod code, which might have been */
                                /* false-triggered by the commands from the reader. */
                                DecodeTagReset(&DecodeTag);
                                /* And ready to receive another command. */
                                DecodeReaderReset(&DecodeReader);
                                /* And also reset the demod code, which might have been */
                                /* false-triggered by the commands from the reader. */
                                DecodeTagReset(&DecodeTag);

-                               upTo = dmaBuf;
-                               FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+                               ReaderIsActive = false;
+                               ExpectTagAnswer = true;
+                               // upTo = dmaBuf;
+                               // samples = 0;
+                               // FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+                               // continue;
+                       } else {
+                               ReaderIsActive = (DecodeReader.state >= STATE_READER_RECEIVE_DATA_1_OUT_OF_4);

                        }
                        }

-                       ReaderIsActive = (DecodeReader.state >= STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF);

                }
 
                if (!ReaderIsActive && ExpectTagAnswer) {                       // no need to try decoding tag data if the reader is currently sending or no answer expected yet
                        if (Handle15693SamplesFromTag(snoopdata >> 2, &DecodeTag)) {
                }
 
                if (!ReaderIsActive && ExpectTagAnswer) {                       // no need to try decoding tag data if the reader is currently sending or no answer expected yet
                        if (Handle15693SamplesFromTag(snoopdata >> 2, &DecodeTag)) {

-                               FpgaDisableSscDma();
-                               //Use samples as a time measurement
-                               LogTrace_ISO15693(DecodeTag.output, DecodeTag.len, samples*64, samples*64, NULL, false);
+                               // FpgaDisableSscDma();
+                               uint32_t eof_time = dma_start_time + samples*16 - DELAY_TAG_TO_ARM_SNOOP; // end of EOF
+                               if (DecodeTag.lastBit == SOF_PART2) {
+                                       eof_time -= 8*16; // needed 8 additional samples to confirm single SOF (iCLASS)
+                               }
+                               uint32_t sof_time = eof_time
+                                                                       - DecodeTag.len * 8 * 8 * 16 // time for byte transfers
+                                                                       - 32 * 16  // time for SOF transfer
+                                                                       - (DecodeTag.lastBit != SOF_PART2?32*16:0); // time for EOF transfer
+                               LogTrace_ISO15693(DecodeTag.output, DecodeTag.len, sof_time*4, eof_time*4, NULL, false);

                                // And ready to receive another response.
                                DecodeTagReset(&DecodeTag);
                                DecodeReaderReset(&DecodeReader);
                                ExpectTagAnswer = false;
                                // And ready to receive another response.
                                DecodeTagReset(&DecodeTag);
                                DecodeReaderReset(&DecodeReader);
                                ExpectTagAnswer = false;

-                               upTo = dmaBuf;
-                               FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+                               TagIsActive = false;
+                               // upTo = dmaBuf;
+                               // samples = 0;
+                               // FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+                               // continue;
+                       } else {
+                               TagIsActive = (DecodeTag.state >= STATE_TAG_RECEIVING_DATA);

                        }
                        }

-                       TagIsActive = (DecodeTag.state >= STATE_TAG_RECEIVING_DATA);

                }
 
        }
 
        FpgaDisableSscDma();
                }
 
        }
 
        FpgaDisableSscDma();

-       BigBuf_free();
-
-       LEDsoff();

 
        DbpString("Snoop statistics:");
 
        DbpString("Snoop statistics:");

-       Dbprintf("  ExpectTagAnswer: %d", ExpectTagAnswer);
+       Dbprintf("  ExpectTagAnswer: %d, TagIsActive: %d, ReaderIsActive: %d", ExpectTagAnswer, TagIsActive, ReaderIsActive);

        Dbprintf("  DecodeTag State: %d", DecodeTag.state);
        Dbprintf("  DecodeTag byteCnt: %d", DecodeTag.len);
        Dbprintf("  DecodeTag State: %d", DecodeTag.state);
        Dbprintf("  DecodeTag byteCnt: %d", DecodeTag.len);

+       Dbprintf("  DecodeTag posCount: %d", DecodeTag.posCount);

        Dbprintf("  DecodeReader State: %d", DecodeReader.state);
        Dbprintf("  DecodeReader byteCnt: %d", DecodeReader.byteCount);
        Dbprintf("  DecodeReader State: %d", DecodeReader.state);
        Dbprintf("  DecodeReader byteCnt: %d", DecodeReader.byteCount);

+       Dbprintf("  DecodeReader posCount: %d", DecodeReader.posCount);

        Dbprintf("  Trace length: %d", BigBuf_get_traceLen());
        Dbprintf("  Trace length: %d", BigBuf_get_traceLen());

+       Dbprintf("  Max behindBy: %d", max_behindBy);

 }
 
 
 }
 
 


@@ -1285,10 +1381,7 @@ void Iso15693InitReader() {
 
 
 // uid is in transmission order (which is reverse of display order)
 
 
 // uid is in transmission order (which is reverse of display order)

-static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
-{
-       uint8_t cmd[13];
-
+static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber, uint8_t *cmd) {

        uint16_t crc;
        // If we set the Option_Flag in this request, the VICC will respond with the security status of the block
        // followed by the block data
        uint16_t crc;
        // If we set the Option_Flag in this request, the VICC will respond with the security status of the block
        // followed by the block data


@@ -1312,13 +1405,11 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
        cmd[11] = crc & 0xff;
        cmd[12] = crc >> 8;
 
        cmd[11] = crc & 0xff;
        cmd[12] = crc >> 8;
 

-       CodeIso15693AsReader(cmd, sizeof(cmd));

 }
 
 
 // Now the VICC>VCD responses when we are simulating a tag
 }
 
 
 // Now the VICC>VCD responses when we are simulating a tag

-static void BuildInventoryResponse(uint8_t *uid)
-{
+static void BuildInventoryResponse(uint8_t *uid) {

        uint8_t cmd[12];
 
        uint16_t crc;
        uint8_t cmd[12];
 
        uint16_t crc;


@@ -1347,7 +1438,7 @@ static void BuildInventoryResponse(uint8_t *uid)
 //  speed ... 0 low speed, 1 hi speed
 //  *recv will contain the tag's answer
 //  return: length of received data, or -1 for timeout
 //  speed ... 0 low speed, 1 hi speed
 //  *recv will contain the tag's answer
 //  return: length of received data, or -1 for timeout

-int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint32_t *eof_time) {
+int SendDataTag(uint8_t *send, int sendlen, bool init, bool speed_fast, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time) {

 
        if (init) {
                Iso15693InitReader();
 
        if (init) {
                Iso15693InitReader();


@@ -1356,19 +1447,40 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv,
 
        int answerLen = 0;
 
 
        int answerLen = 0;
 

-       if (!speed) {
-               // low speed (1 out of 256)
-               CodeIso15693AsReader256(send, sendlen);
-       } else {
+       if (speed_fast) {

                // high speed (1 out of 4)
                CodeIso15693AsReader(send, sendlen);
                // high speed (1 out of 4)
                CodeIso15693AsReader(send, sendlen);

+       } else {
+               // low speed (1 out of 256)
+               CodeIso15693AsReader256(send, sendlen);

        }
 
        TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
        }
 
        TransmitTo15693Tag(ToSend, ToSendMax, &start_time);

+       uint32_t end_time = start_time + 32*(8*ToSendMax-4); // substract the 4 padding bits after EOF
+       LogTrace_ISO15693(send, sendlen, start_time*4, end_time*4, NULL, true);

 
        // Now wait for a response
        if (recv != NULL) {
 
        // Now wait for a response
        if (recv != NULL) {

-               answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, ISO15693_READER_TIMEOUT, eof_time);
+               answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time);
+       }
+
+       return answerLen;
+}
+
+
+int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time) {
+
+       int answerLen = 0;
+
+       CodeIso15693AsReaderEOF();
+
+       TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
+       uint32_t end_time = start_time + 32*(8*ToSendMax-4); // substract the 4 padding bits after EOF
+       LogTrace_ISO15693(NULL, 0, start_time*4, end_time*4, NULL, true);
+
+       // Now wait for a response
+       if (recv != NULL) {
+               answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time);

        }
 
        return answerLen;
        }
 
        return answerLen;


@@ -1460,7 +1572,6 @@ void ReaderIso15693(uint32_t parameter) {
 
        set_tracing(true);
 
 
        set_tracing(true);
 

-       int answerLen = 0;

        uint8_t TagUID[8] = {0x00};
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        uint8_t TagUID[8] = {0x00};
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -1486,17 +1597,14 @@ void ReaderIso15693(uint32_t parameter) {
        // THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
 
        // Now send the IDENTIFY command
        // THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
 
        // Now send the IDENTIFY command

-       BuildIdentifyRequest();
+       uint8_t cmd[5];
+       BuildIdentifyRequest(cmd);

        uint32_t start_time = 0;
        uint32_t start_time = 0;

-       TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
-
-       // Now wait for a response

        uint32_t eof_time;
        uint32_t eof_time;

-       answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2, &eof_time) ;
+       int answerLen = SendDataTag(cmd, sizeof(cmd), true, true, answer, sizeof(answer), start_time, ISO15693_READER_TIMEOUT, &eof_time);

        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 
        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 

-       if (answerLen >=12) // we should do a better check than this
-       {
+       if (answerLen >= 12) { // we should do a better check than this

                TagUID[0] = answer[2];
                TagUID[1] = answer[3];
                TagUID[2] = answer[4];
                TagUID[0] = answer[2];
                TagUID[1] = answer[3];
                TagUID[2] = answer[4];


@@ -1505,7 +1613,6 @@ void ReaderIso15693(uint32_t parameter) {
                TagUID[5] = answer[7];
                TagUID[6] = answer[8]; // IC Manufacturer code
                TagUID[7] = answer[9]; // always E0
                TagUID[5] = answer[7];
                TagUID[6] = answer[8]; // IC Manufacturer code
                TagUID[7] = answer[9]; // always E0

-

        }
 
        Dbprintf("%d octets read from IDENTIFY request:", answerLen);
        }
 
        Dbprintf("%d octets read from IDENTIFY request:", answerLen);


@@ -1518,21 +1625,12 @@ void ReaderIso15693(uint32_t parameter) {
                        TagUID[7],TagUID[6],TagUID[5],TagUID[4],
                        TagUID[3],TagUID[2],TagUID[1],TagUID[0]);
 
                        TagUID[7],TagUID[6],TagUID[5],TagUID[4],
                        TagUID[3],TagUID[2],TagUID[1],TagUID[0]);
 

-
-       // Dbprintf("%d octets read from SELECT request:", answerLen2);
-       // DbdecodeIso15693Answer(answerLen2,answer2);
-       // Dbhexdump(answerLen2,answer2,true);
-
-       // Dbprintf("%d octets read from XXX request:", answerLen3);
-       // DbdecodeIso15693Answer(answerLen3,answer3);
-       // Dbhexdump(answerLen3,answer3,true);
-

        // read all pages
        if (answerLen >= 12 && DEBUG) {
                for (int i = 0; i < 32; i++) {  // sanity check, assume max 32 pages
        // read all pages
        if (answerLen >= 12 && DEBUG) {
                for (int i = 0; i < 32; i++) {  // sanity check, assume max 32 pages

-                       BuildReadBlockRequest(TagUID, i);
-                       TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
-                       int answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2, &eof_time);
+                       uint8_t cmd[13];
+                       BuildReadBlockRequest(TagUID, i, cmd);
+                       answerLen = SendDataTag(cmd, sizeof(cmd), false, true, answer, sizeof(answer), start_time, ISO15693_READER_TIMEOUT, &eof_time);

                        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
                        if (answerLen > 0) {
                                Dbprintf("READ SINGLE BLOCK %d returned %d octets:", i, answerLen);
                        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
                        if (answerLen > 0) {
                                Dbprintf("READ SINGLE BLOCK %d returned %d octets:", i, answerLen);


@@ -1543,7 +1641,7 @@ void ReaderIso15693(uint32_t parameter) {
                }
        }
 
                }
        }
 

-       // for the time being, switch field off to protect rdv4.0
+       // for the time being, switch field off to protect RDV4

        // note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LED_D_OFF();
        // note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LED_D_OFF();


@@ -1594,8 +1692,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)
 
 // Since there is no standardized way of reading the AFI out of a tag, we will brute force it
 // (some manufactures offer a way to read the AFI, though)

-void BruteforceIso15693Afi(uint32_t speed)
-{
+void BruteforceIso15693Afi(uint32_t speed) {

        LED_A_ON();
 
        uint8_t data[6];
        LED_A_ON();
 
        uint8_t data[6];


@@ -1611,7 +1708,7 @@ void BruteforceIso15693Afi(uint32_t speed)
        data[2] = 0; // mask length
        datalen = Iso15693AddCrc(data,3);
        uint32_t start_time = GetCountSspClk();
        data[2] = 0; // mask length
        datalen = Iso15693AddCrc(data,3);
        uint32_t start_time = GetCountSspClk();

-       recvlen = SendDataTag(data, datalen, true, speed, recv, sizeof(recv), 0, &eof_time);
+       recvlen = SendDataTag(data, datalen, true, speed, recv, sizeof(recv), 0, ISO15693_READER_TIMEOUT, &eof_time);

        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
        WDT_HIT();
        if (recvlen>=12) {
        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
        WDT_HIT();
        if (recvlen>=12) {


@@ -1628,7 +1725,7 @@ void BruteforceIso15693Afi(uint32_t speed)
        for (int i = 0; i < 256; i++) {
                data[2] = i & 0xFF;
                datalen = Iso15693AddCrc(data,4);
        for (int i = 0; i < 256; i++) {
                data[2] = i & 0xFF;
                datalen = Iso15693AddCrc(data,4);

-               recvlen = SendDataTag(data, datalen, false, speed, recv, sizeof(recv), start_time, &eof_time);
+               recvlen = SendDataTag(data, datalen, false, speed, recv, sizeof(recv), start_time, ISO15693_READER_TIMEOUT, &eof_time);

                start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
                WDT_HIT();
                if (recvlen >= 12) {
                start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
                WDT_HIT();
                if (recvlen >= 12) {


@@ -1652,13 +1749,35 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
        uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
        uint32_t eof_time;
 
        uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
        uint32_t eof_time;
 

+       uint16_t timeout;
+    bool request_answer = false;
+       
+       switch (data[1]) {
+               case ISO15693_WRITEBLOCK:
+               case ISO15693_LOCKBLOCK:
+               case ISO15693_WRITE_MULTI_BLOCK:
+               case ISO15693_WRITE_AFI:
+               case ISO15693_LOCK_AFI:
+               case ISO15693_WRITE_DSFID:
+               case ISO15693_LOCK_DSFID:
+                       timeout = ISO15693_READER_TIMEOUT_WRITE;
+                       request_answer = data[0] & ISO15693_REQ_OPTION;
+                       break;
+               default:
+                       timeout = ISO15693_READER_TIMEOUT;
+       }               
+

        if (DEBUG) {
                Dbprintf("SEND:");
                Dbhexdump(datalen, data, false);
        }
 
        if (DEBUG) {
                Dbprintf("SEND:");
                Dbhexdump(datalen, data, false);
        }
 

-       recvlen = SendDataTag(data, datalen, true, speed, (recv?recvbuf:NULL), sizeof(recvbuf), 0, &eof_time);
+       recvlen = SendDataTag(data, datalen, true, speed, (recv?recvbuf:NULL), sizeof(recvbuf), 0, timeout, &eof_time);

 
 

+       if (request_answer) { // send a single EOF to get the tag response
+               recvlen = SendDataTagEOF((recv?recvbuf:NULL), sizeof(recvbuf), 0, ISO15693_READER_TIMEOUT, &eof_time);
+       }
+       

        // for the time being, switch field off to protect rdv4.0
        // note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        // for the time being, switch field off to protect rdv4.0
        // note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);


@@ -1686,78 +1805,65 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
 //
 //-----------------------------------------------------------------------------
 
 //
 //-----------------------------------------------------------------------------
 

-// Set the UID to the tag (based on Iceman work).
+// Set the UID on Magic ISO15693 tag (based on Iceman's LUA-script).

 void SetTag15693Uid(uint8_t *uid) {
 
        LED_A_ON();
 
 void SetTag15693Uid(uint8_t *uid) {
 
        LED_A_ON();
 

-       uint8_t cmd[4][9] = {0x00};
+       uint8_t cmd[4][9] = {
+               {ISO15693_REQ_DATARATE_HIGH, ISO15693_WRITEBLOCK, 0x3e, 0x00, 0x00, 0x00, 0x00},
+               {ISO15693_REQ_DATARATE_HIGH, ISO15693_WRITEBLOCK, 0x3f, 0x69, 0x96, 0x00, 0x00},
+               {ISO15693_REQ_DATARATE_HIGH, ISO15693_WRITEBLOCK, 0x38},
+               {ISO15693_REQ_DATARATE_HIGH, ISO15693_WRITEBLOCK, 0x39}
+       };
+

        uint16_t crc;
 
        int recvlen = 0;
        uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
        uint32_t eof_time;
 
        uint16_t crc;
 
        int recvlen = 0;
        uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
        uint32_t eof_time;
 

-       // Command 1 : 02213E00000000
-       cmd[0][0] = 0x02;
-       cmd[0][1] = 0x21;
-       cmd[0][2] = 0x3e;
-       cmd[0][3] = 0x00;
-       cmd[0][4] = 0x00;
-       cmd[0][5] = 0x00;
-       cmd[0][6] = 0x00;
-
-       // Command 2 : 02213F69960000
-       cmd[1][0] = 0x02;
-       cmd[1][1] = 0x21;
-       cmd[1][2] = 0x3f;
-       cmd[1][3] = 0x69;
-       cmd[1][4] = 0x96;
-       cmd[1][5] = 0x00;
-       cmd[1][6] = 0x00;
-

        // Command 3 : 022138u8u7u6u5 (where uX = uid byte X)
        // Command 3 : 022138u8u7u6u5 (where uX = uid byte X)

-       cmd[2][0] = 0x02;
-       cmd[2][1] = 0x21;
-       cmd[2][2] = 0x38;

        cmd[2][3] = uid[7];
        cmd[2][4] = uid[6];
        cmd[2][5] = uid[5];
        cmd[2][6] = uid[4];
 
        // Command 4 : 022139u4u3u2u1 (where uX = uid byte X)
        cmd[2][3] = uid[7];
        cmd[2][4] = uid[6];
        cmd[2][5] = uid[5];
        cmd[2][6] = uid[4];
 
        // Command 4 : 022139u4u3u2u1 (where uX = uid byte X)

-       cmd[3][0] = 0x02;
-       cmd[3][1] = 0x21;
-       cmd[3][2] = 0x39;

        cmd[3][3] = uid[3];
        cmd[3][4] = uid[2];
        cmd[3][5] = uid[1];
        cmd[3][6] = uid[0];
 
        cmd[3][3] = uid[3];
        cmd[3][4] = uid[2];
        cmd[3][5] = uid[1];
        cmd[3][6] = uid[0];
 

+       uint32_t start_time = 0;
+       

        for (int i = 0; i < 4; i++) {
                // Add the CRC
                crc = Iso15693Crc(cmd[i], 7);
                cmd[i][7] = crc & 0xff;
                cmd[i][8] = crc >> 8;
 
        for (int i = 0; i < 4; i++) {
                // Add the CRC
                crc = Iso15693Crc(cmd[i], 7);
                cmd[i][7] = crc & 0xff;
                cmd[i][8] = crc >> 8;
 

+               recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), i==0?true:false, true, recvbuf, sizeof(recvbuf), start_time, ISO15693_READER_TIMEOUT_WRITE, &eof_time);
+               start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;

                if (DEBUG) {
                        Dbprintf("SEND:");
                        Dbhexdump(sizeof(cmd[i]), cmd[i], false);
                if (DEBUG) {
                        Dbprintf("SEND:");
                        Dbhexdump(sizeof(cmd[i]), cmd[i], false);

-               }
-
-               recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), true, 1, recvbuf, sizeof(recvbuf), 0, &eof_time);
-
-               if (DEBUG) {

                        Dbprintf("RECV:");
                        if (recvlen > 0) {
                                Dbhexdump(recvlen, recvbuf, false);
                                DbdecodeIso15693Answer(recvlen, recvbuf);
                        }
                }
                        Dbprintf("RECV:");
                        if (recvlen > 0) {
                                Dbhexdump(recvlen, recvbuf, false);
                                DbdecodeIso15693Answer(recvlen, recvbuf);
                        }
                }

-
-               cmd_send(CMD_ACK, recvlen>ISO15693_MAX_RESPONSE_LENGTH?ISO15693_MAX_RESPONSE_LENGTH:recvlen, 0, 0, recvbuf, ISO15693_MAX_RESPONSE_LENGTH);
+               // Note: need to know if we expect an answer from one of the magic commands
+               // if (recvlen < 0) {
+                       // break;
+               // }

        }
 
        }
 

+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LED_D_OFF();
+
+       cmd_send(CMD_ACK, recvlen, 0, 0, recvbuf, recvlen);

        LED_A_OFF();
 }
 
        LED_A_OFF();
 }