git.zerfleddert.de Git - proxmark3-svn/blobdiff

index 7fdf2a35056738991fea82d15e032a90fce12e52..85af0859ec8721a89d2a0d83d8784a0e12552d74 100644 (file)

--- a/armsrc/iso15693.c

+++ b/armsrc/iso15693.c

@@ -2,7 +2,7 @@

// Jonathan Westhues, split Nov 2006

// Modified by Greg Jones, Jan 2009

// Modified by Adrian Dabrowski "atrox", Mar-Sept 2010,Oct 2011

// Jonathan Westhues, split Nov 2006

// Modified by Greg Jones, Jan 2009

// Modified by Adrian Dabrowski "atrox", Mar-Sept 2010,Oct 2011

-// Modified by piwi, Oct 2018

+// Modified by piwi, Oct 2018

// This code is licensed to you under the terms of the GNU GPL, version 2 or,

// at your option, any later version. See the LICENSE.txt file for the text of

// This code is licensed to you under the terms of the GNU GPL, version 2 or,

// at your option, any later version. See the LICENSE.txt file for the text of

@@ -16,26 +16,26 @@

// transmission modes from tag to reader. As of Oct 2018 this code supports

// both reader modes and the high speed variant with one subcarrier from card to reader.

// As long as the card fully support ISO 15693 this is no problem, since the

// transmission modes from tag to reader. As of Oct 2018 this code supports

// both reader modes and the high speed variant with one subcarrier from card to reader.

// As long as the card fully support ISO 15693 this is no problem, since the

-// reader chooses both data rates, but some non-standard tags do not.

+// reader chooses both data rates, but some non-standard tags do not.

// For card simulation, the code supports both high and low speed modes with one subcarrier.

// VCD (reader) -> VICC (tag)

// 1 out of 256:

// For card simulation, the code supports both high and low speed modes with one subcarrier.

// VCD (reader) -> VICC (tag)

// 1 out of 256:

-// data rate: 1,66 kbit/s (fc/8192)

-// used for long range

+// data rate: 1,66 kbit/s (fc/8192)

+// used for long range

// 1 out of 4:

-// data rate: 26,48 kbit/s (fc/512)

-// used for short range, high speed

+// data rate: 26,48 kbit/s (fc/512)

+// used for short range, high speed

// VICC (tag) -> VCD (reader)

// Modulation:

// VICC (tag) -> VCD (reader)

// Modulation:

-// ASK / one subcarrier (423,75 khz)

-// FSK / two subcarriers (423,75 khz && 484,28 khz)

+// ASK / one subcarrier (423,75 khz)

+// FSK / two subcarriers (423,75 khz && 484,28 khz)

// Data Rates / Modes:

-// low ASK: 6,62 kbit/s

-// low FSK: 6.67 kbit/s

-// high ASK: 26,48 kbit/s

-// high FSK: 26,69 kbit/s

+// low ASK: 6,62 kbit/s

+// low FSK: 6.67 kbit/s

+// high ASK: 26,48 kbit/s

+// high FSK: 26,69 kbit/s

//-----------------------------------------------------------------------------

@@ -161,7 +161,7 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)

for(i = 0; i < 4; i++) {

ToSendStuffBit(1);

}

for(i = 0; i < 4; i++) {

ToSendStuffBit(1);

}

ToSendMax++;

}

ToSendMax++;

}

@@ -246,6 +246,8 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)

// }

+static const uint8_t encode_4bits[16] = { 0xaa, 0x6a, 0x9a, 0x5a, 0xa6, 0x66, 0x96, 0x56, 0xa9, 0x69, 0x99, 0x59, 0xa5, 0x65, 0x95, 0x55 };

void CodeIso15693AsTag(uint8_t *cmd, size_t len) {

* SOF comprises 3 parts;

void CodeIso15693AsTag(uint8_t *cmd, size_t len) {

* SOF comprises 3 parts;

@@ -280,16 +282,9 @@ void CodeIso15693AsTag(uint8_t *cmd, size_t len) {

ToSend[++ToSendMax] = 0x1D; // 00011101

// data

ToSend[++ToSendMax] = 0x1D; // 00011101

// data

- for(int i = 0; i < len; i++) {

- for(int j = 0; j < 8; j++) {

- if ((cmd[i] >> j) & 0x01) {

- ToSendStuffBit(0);

- ToSendStuffBit(1);

- } else {

- ToSendStuffBit(1);

- ToSendStuffBit(0);

- }

+ for (int i = 0; i < len; i++) {

+ ToSend[++ToSendMax] = encode_4bits[cmd[i] & 0xF];

+ ToSend[++ToSendMax] = encode_4bits[cmd[i] >> 4];

}

// EOF

}

// EOF

@@ -327,31 +322,44 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t start_time)

//-----------------------------------------------------------------------------

// Transmit the tag response (to the reader) that was placed in cmd[].

//-----------------------------------------------------------------------------

// Transmit the tag response (to the reader) that was placed in cmd[].

//-----------------------------------------------------------------------------

-void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t start_time, bool slow) {

+void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time, uint32_t slot_time, bool slow) {

// don't use the FPGA_HF_SIMULATOR_MODULATE_424K_8BIT minor mode. It would spoil GetCountSspClk()

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);

// don't use the FPGA_HF_SIMULATOR_MODULATE_424K_8BIT minor mode. It would spoil GetCountSspClk()

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);

- uint8_t shift_delay = start_time & 0x00000007;

+ uint32_t modulation_start_time = *start_time + 3 * 8; // no need to transfer the unmodulated start of SOF

+ while (GetCountSspClk() > (modulation_start_time & 0xfffffff8) + 3) { // we will miss the intended time

+ if (slot_time) {

+ modulation_start_time += slot_time; // use next available slot

+ } else {

+ modulation_start_time = (modulation_start_time & 0xfffffff8) + 8; // next possible time

+ }

+ while (GetCountSspClk() < (modulation_start_time & 0xfffffff8))

+ /* wait */ ;

+ uint8_t shift_delay = modulation_start_time & 0x00000007;

- while (GetCountSspClk() < (start_time & 0xfffffff8)) ;

+ *start_time = modulation_start_time - 3 * 8;

LED_C_ON();

uint8_t bits_to_shift = 0x00;

uint8_t bits_to_send = 0x00;

LED_C_ON();

uint8_t bits_to_shift = 0x00;

uint8_t bits_to_send = 0x00;

- for(size_t c = 0; c < len; c++) {

- for (int i = 7; i >= 0; i--) {

+ for (size_t c = 0; c < len; c++) {

+ for (int i = (c==0?4:7); i >= 0; i--) {

uint8_t cmd_bits = ((cmd[c] >> i) & 0x01) ? 0xff : 0x00;

for (int j = 0; j < (slow?4:1); ) {

uint8_t cmd_bits = ((cmd[c] >> i) & 0x01) ? 0xff : 0x00;

for (int j = 0; j < (slow?4:1); ) {

- bits_to_send = bits_to_shift << (8 - shift_delay) | cmd_bits >> shift_delay;

- bits_to_shift = cmd_bits;

if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {

+ bits_to_send = bits_to_shift << (8 - shift_delay) | cmd_bits >> shift_delay;

AT91C_BASE_SSC->SSC_THR = bits_to_send;

+ bits_to_shift = cmd_bits;

j++;

}

j++;

}

- }

+ }

WDT_HIT();

- }

+ }

// send the remaining bits, padded with 0:

bits_to_send = bits_to_shift << (8 - shift_delay);

for ( ; ; ) {

// send the remaining bits, padded with 0:

bits_to_send = bits_to_shift << (8 - shift_delay);

for ( ; ; ) {

@@ -361,7 +369,6 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t start_time,

}

LED_C_OFF();

}

LED_C_OFF();

}

@@ -408,7 +415,7 @@ typedef struct DecodeTag {

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:

+ case STATE_TAG_SOF_LOW:

// waiting for 12 times low (11 times low is accepted as well)

if (amplitude < NOISE_THRESHOLD) {

DecodeTag->posCount++;

// waiting for 12 times low (11 times low is accepted as well)

if (amplitude < NOISE_THRESHOLD) {

DecodeTag->posCount++;

@@ -422,7 +429,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1

}

break;

}

break;

case STATE_TAG_SOF_HIGH:

// waiting for 10 times high. Take average over the last 8

if (amplitude > NOISE_THRESHOLD) {

case STATE_TAG_SOF_HIGH:

// waiting for 10 times high. Take average over the last 8

if (amplitude > NOISE_THRESHOLD) {

@@ -592,7 +599,7 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim

bool gotFrame = false;

uint16_t *dmaBuf = (uint16_t*)BigBuf_malloc(ISO15693_DMA_BUFFER_SIZE*sizeof(uint16_t));

bool gotFrame = false;

uint16_t *dmaBuf = (uint16_t*)BigBuf_malloc(ISO15693_DMA_BUFFER_SIZE*sizeof(uint16_t));

// the Decoder data structure

DecodeTag_t DecodeTag = { 0 };

DecodeTagInit(&DecodeTag, response, max_len);

// the Decoder data structure

DecodeTag_t DecodeTag = { 0 };

DecodeTagInit(&DecodeTag, response, max_len);

@@ -643,9 +650,9 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim

FpgaDisableSscDma();

BigBuf_free();

FpgaDisableSscDma();

BigBuf_free();

if (DEBUG) Dbprintf("samples = %d, gotFrame = %d, Decoder: state = %d, len = %d, bitCount = %d, posCount = %d",

- samples, gotFrame, DecodeTag.state, DecodeTag.len, DecodeTag.bitCount, DecodeTag.posCount);

+ samples, gotFrame, DecodeTag.state, DecodeTag.len, DecodeTag.bitCount, DecodeTag.posCount);

if (DecodeTag.len > 0) {

LogTrace(DecodeTag.output, DecodeTag.len, 0, 0, NULL, false);

if (DecodeTag.len > 0) {

LogTrace(DecodeTag.output, DecodeTag.len, 0, 0, NULL, false);

@@ -671,6 +678,7 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim

typedef struct DecodeReader {

enum {

STATE_READER_UNSYNCD,

typedef struct DecodeReader {

enum {

STATE_READER_UNSYNCD,

+ STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF,

STATE_READER_AWAIT_1ST_RISING_EDGE_OF_SOF,

STATE_READER_AWAIT_2ND_FALLING_EDGE_OF_SOF,

STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF,

STATE_READER_AWAIT_1ST_RISING_EDGE_OF_SOF,

STATE_READER_AWAIT_2ND_FALLING_EDGE_OF_SOF,

STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF,

@@ -687,7 +695,7 @@ typedef struct DecodeReader {

int byteCount;

int byteCountMax;

int posCount;

int byteCount;

int byteCountMax;

int posCount;

- int sum1, sum2;

+ int sum1, sum2;

uint8_t *output;

} DecodeReader_t;

uint8_t *output;

} DecodeReader_t;

@@ -714,6 +722,13 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

{

switch (DecodeReader->state) {

case STATE_READER_UNSYNCD:

{

switch (DecodeReader->state) {

case STATE_READER_UNSYNCD:

+ // wait for unmodulated carrier

+ if (bit) {

+ DecodeReader->state = STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF;

+ }

+ break;

+ case STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF:

if (!bit) {

// we went low, so this could be the beginning of a SOF

DecodeReader->posCount = 1;

if (!bit) {

// we went low, so this could be the beginning of a SOF

DecodeReader->posCount = 1;

@@ -725,7 +740,7 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

DecodeReader->posCount++;

if (bit) { // detected rising edge

if (DecodeReader->posCount < 4) { // rising edge too early (nominally expected at 5)

DecodeReader->posCount++;

if (bit) { // detected rising edge

if (DecodeReader->posCount < 4) { // rising edge too early (nominally expected at 5)

- DecodeReaderReset(DecodeReader);

+ DecodeReader->state = STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF;

} else { // SOF

DecodeReader->state = STATE_READER_AWAIT_2ND_FALLING_EDGE_OF_SOF;

}

} else { // SOF

DecodeReader->state = STATE_READER_AWAIT_2ND_FALLING_EDGE_OF_SOF;

}

@@ -748,13 +763,13 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

DecodeReader->state = STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF;

} else if (DecodeReader->posCount < 28) { // falling edge too early (nominally expected at 29 latest)

DecodeReaderReset(DecodeReader);

DecodeReader->state = STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF;

} else if (DecodeReader->posCount < 28) { // falling edge too early (nominally expected at 29 latest)

DecodeReaderReset(DecodeReader);

- } else { // SOF for 1 out of 4 coding

+ } else { // SOF for 1 out of 256 coding

DecodeReader->Coding = CODING_1_OUT_OF_256;

DecodeReader->state = STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF;

}

} else {

if (DecodeReader->posCount > 29) { // stayed high for too long

DecodeReader->Coding = CODING_1_OUT_OF_256;

DecodeReader->state = STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF;

}

} else {

if (DecodeReader->posCount > 29) { // stayed high for too long

- DecodeReaderReset(DecodeReader);

+ DecodeReader->state = STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF;

} else {

// do nothing, keep waiting

}

} else {

// do nothing, keep waiting

}

@@ -766,7 +781,7 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

if (bit) { // detected rising edge

if (DecodeReader->Coding == CODING_1_OUT_OF_256) {

if (DecodeReader->posCount < 32) { // rising edge too early (nominally expected at 33)

if (bit) { // detected rising edge

if (DecodeReader->Coding == CODING_1_OUT_OF_256) {

if (DecodeReader->posCount < 32) { // rising edge too early (nominally expected at 33)

- DecodeReaderReset(DecodeReader);

+ DecodeReader->state = STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF;

} else {

DecodeReader->posCount = 1;

DecodeReader->bitCount = 0;

} else {

DecodeReader->posCount = 1;

DecodeReader->bitCount = 0;

@@ -777,21 +792,22 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

}

} else { // CODING_1_OUT_OF_4

if (DecodeReader->posCount < 24) { // rising edge too early (nominally expected at 25)

}

} else { // CODING_1_OUT_OF_4

if (DecodeReader->posCount < 24) { // rising edge too early (nominally expected at 25)

- DecodeReaderReset(DecodeReader);

+ DecodeReader->state = STATE_READER_AWAIT_1ST_FALLING_EDGE_OF_SOF;

} else {

+ DecodeReader->posCount = 1;

DecodeReader->state = STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4;

}

} else {

if (DecodeReader->Coding == CODING_1_OUT_OF_256) {

if (DecodeReader->posCount > 34) { // signal stayed low for too long

DecodeReader->state = STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4;

}

} else {

if (DecodeReader->Coding == CODING_1_OUT_OF_256) {

if (DecodeReader->posCount > 34) { // signal stayed low for too long

- DecodeReaderReset(DecodeReader);

+ DecodeReaderReset(DecodeReader);

} else {

// do nothing, keep waiting

}

} else { // CODING_1_OUT_OF_4

if (DecodeReader->posCount > 26) { // signal stayed low for too long

} else {

// do nothing, keep waiting

}

} else { // CODING_1_OUT_OF_4

if (DecodeReader->posCount > 26) { // signal stayed low for too long

- DecodeReaderReset(DecodeReader);

+ DecodeReaderReset(DecodeReader);

} else {

// do nothing, keep waiting

}

} else {

// do nothing, keep waiting

}

@@ -802,7 +818,7 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

case STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4:

DecodeReader->posCount++;

if (bit) {

case STATE_READER_AWAIT_END_OF_SOF_1_OUT_OF_4:

DecodeReader->posCount++;

if (bit) {

- if (DecodeReader->posCount == 33) {

+ if (DecodeReader->posCount == 9) {

DecodeReader->posCount = 1;

DecodeReader->bitCount = 0;

DecodeReader->byteCount = 0;

DecodeReader->posCount = 1;

DecodeReader->bitCount = 0;

DecodeReader->byteCount = 0;

@@ -818,6 +834,7 @@ 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->sum1 = bit;

DecodeReader->posCount++;

if (DecodeReader->posCount == 1) {

DecodeReader->sum1 = bit;

@@ -830,17 +847,14 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

}

if (DecodeReader->posCount == 8) {

DecodeReader->posCount = 0;

}

if (DecodeReader->posCount == 8) {

DecodeReader->posCount = 0;

- int corr10 = DecodeReader->sum1 - DecodeReader->sum2;

- int corr01 = DecodeReader->sum2 - DecodeReader->sum1;

- int corr11 = (DecodeReader->sum1 + DecodeReader->sum2) / 2;

- if (corr01 > corr11 && corr01 > corr10) { // EOF

+ if (DecodeReader->sum1 <= 1 && DecodeReader->sum2 >= 3) { // EOF

LED_B_OFF(); // Finished receiving

DecodeReaderReset(DecodeReader);

if (DecodeReader->byteCount != 0) {

return true;

}

LED_B_OFF(); // Finished receiving

DecodeReaderReset(DecodeReader);

if (DecodeReader->byteCount != 0) {

return true;

}

- if (corr10 > corr11) { // detected a 2bit position

+ 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);

}

@@ -860,6 +874,7 @@ 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->sum1 = bit;

DecodeReader->posCount++;

if (DecodeReader->posCount == 1) {

DecodeReader->sum1 = bit;

@@ -872,17 +887,14 @@ static int inline __attribute__((always_inline)) Handle15693SampleFromReader(uin

}

if (DecodeReader->posCount == 8) {

DecodeReader->posCount = 0;

}

if (DecodeReader->posCount == 8) {

DecodeReader->posCount = 0;

- int corr10 = DecodeReader->sum1 - DecodeReader->sum2;

- int corr01 = DecodeReader->sum2 - DecodeReader->sum1;

- int corr11 = (DecodeReader->sum1 + DecodeReader->sum2) / 2;

- if (corr01 > corr11 && corr01 > corr10) { // EOF

+ if (DecodeReader->sum1 <= 1 && DecodeReader->sum2 >= 3) { // EOF

LED_B_OFF(); // Finished receiving

DecodeReaderReset(DecodeReader);

if (DecodeReader->byteCount != 0) {

return true;

}

LED_B_OFF(); // Finished receiving

DecodeReaderReset(DecodeReader);

if (DecodeReader->byteCount != 0) {

return true;

}

- if (corr10 > corr11) { // detected the bit position

+ 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

@@ -985,12 +997,12 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo

}

FpgaDisableSscDma();

}

FpgaDisableSscDma();

if (DEBUG) Dbprintf("samples = %d, gotFrame = %d, Decoder: state = %d, len = %d, bitCount = %d, posCount = %d",

- samples, gotFrame, DecodeReader.state, DecodeReader.byteCount, DecodeReader.bitCount, DecodeReader.posCount);

+ samples, gotFrame, DecodeReader.state, DecodeReader.byteCount, DecodeReader.bitCount, DecodeReader.posCount);

if (DecodeReader.byteCount > 0) {

- uint32_t sof_time = *eof_time

+ uint32_t sof_time = *eof_time

- DecodeReader.byteCount * (DecodeReader.Coding==CODING_1_OUT_OF_4?128:2048) // time for byte transfers

- 32 // time for SOF transfer

- 16; // time for EOF transfer

- DecodeReader.byteCount * (DecodeReader.Coding==CODING_1_OUT_OF_4?128:2048) // time for byte transfers

- 32 // time for SOF transfer

- 16; // time for EOF transfer

@@ -1101,7 +1113,7 @@ void SnoopIso15693(void)

Dbprintf(" DMA: %i bytes", ISO15693_DMA_BUFFER_SIZE * sizeof(uint16_t));

}

Dbprintf("Snoop started. Press PM3 Button to stop.");

Dbprintf(" DMA: %i bytes", ISO15693_DMA_BUFFER_SIZE * sizeof(uint16_t));

}

Dbprintf("Snoop started. Press PM3 Button to stop.");

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE);

SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SNOOP_AMPLITUDE);

SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

@@ -1139,7 +1151,7 @@ void SnoopIso15693(void)

}

samples++;

}

samples++;

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

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

FpgaDisableSscDma();

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

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

FpgaDisableSscDma();

@@ -1168,7 +1180,7 @@ void SnoopIso15693(void)

ReaderIsActive = (DecodeReader.state >= STATE_READER_AWAIT_2ND_RISING_EDGE_OF_SOF);

}

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 (!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

if (Handle15693SamplesFromTag(snoopdata >> 2, &DecodeTag)) {

FpgaDisableSscDma();

//Use samples as a time measurement

@@ -1187,7 +1199,7 @@ void SnoopIso15693(void)

FpgaDisableSscDma();

BigBuf_free();

FpgaDisableSscDma();

BigBuf_free();

LEDsoff();

DbpString("Snoop statistics:");

LEDsoff();

DbpString("Snoop statistics:");

@@ -1234,7 +1246,7 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )

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

- cmd[0] = ISO15693_REQ_OPTION | ISO15693_REQ_ADDRESS | ISO15693_REQ_DATARATE_HIGH;

+ cmd[0] = ISO15693_REQ_OPTION | ISO15693_REQ_ADDRESS | ISO15693_REQ_DATARATE_HIGH;

// READ BLOCK command code

cmd[1] = ISO15693_READBLOCK;

// UID may be optionally specified here

// READ BLOCK command code

cmd[1] = ISO15693_READBLOCK;

// UID may be optionally specified here

@@ -1285,10 +1297,10 @@ static void BuildInventoryResponse(uint8_t *uid)

}

// Universal Method for sending to and recv bytes from a tag

}

// Universal Method for sending to and recv bytes from a tag

-// init ... should we initialize the reader?

-// speed ... 0 low speed, 1 hi speed

-// *recv will contain the tag's answer

-// return: lenght of received data

+// init ... should we initialize the reader?

+// speed ... 0 low speed, 1 hi speed

+// *recv will contain the tag's answer

+// return: lenght of received data

int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time) {

LED_A_ON();

int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time) {

LED_A_ON();

@@ -1405,7 +1417,7 @@ void ReaderIso15693(uint32_t parameter)

LED_A_ON();

set_tracing(true);

LED_A_ON();

set_tracing(true);

int answerLen = 0;

uint8_t TagUID[8] = {0x00};

int answerLen = 0;

uint8_t TagUID[8] = {0x00};

@@ -1418,8 +1430,8 @@ void ReaderIso15693(uint32_t parameter)

FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

// Start from off (no field generated)

FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);

// Start from off (no field generated)

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

- SpinDelay(200);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+ SpinDelay(200);

// Give the tags time to energize

LED_D_ON();

// Give the tags time to energize

LED_D_ON();

@@ -1434,7 +1446,7 @@ void ReaderIso15693(uint32_t parameter)

// Now send the IDENTIFY command

BuildIdentifyRequest();

TransmitTo15693Tag(ToSend, ToSendMax, 0);

// Now send the IDENTIFY command

BuildIdentifyRequest();

TransmitTo15693Tag(ToSend, ToSendMax, 0);

// Now wait for a response

answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2) ;

uint32_t start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;

// Now wait for a response

answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2) ;

uint32_t start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;

@@ -1489,7 +1501,7 @@ void ReaderIso15693(uint32_t parameter)

// 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

// 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);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

LED_D_OFF();

LED_A_OFF();

LED_D_OFF();

LED_A_OFF();

@@ -1506,7 +1518,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)

FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);

FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR);

StartCountSspClk();

FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR);

StartCountSspClk();

@@ -1524,14 +1536,14 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)

if ((cmd_len >= 5) && (cmd[0] & ISO15693_REQ_INVENTORY) && (cmd[1] == ISO15693_INVENTORY)) { // TODO: check more flags

bool slow = !(cmd[0] & ISO15693_REQ_DATARATE_HIGH);

start_time = eof_time + DELAY_ISO15693_VCD_TO_VICC_SIM - DELAY_ARM_TO_READER_SIM;

if ((cmd_len >= 5) && (cmd[0] & ISO15693_REQ_INVENTORY) && (cmd[1] == ISO15693_INVENTORY)) { // TODO: check more flags

bool slow = !(cmd[0] & ISO15693_REQ_DATARATE_HIGH);

start_time = eof_time + DELAY_ISO15693_VCD_TO_VICC_SIM - DELAY_ARM_TO_READER_SIM;

- TransmitTo15693Reader(ToSend, ToSendMax, start_time, slow);

+ TransmitTo15693Reader(ToSend, ToSendMax, &start_time, 0, slow);

}

Dbprintf("%d bytes read from reader:", cmd_len);

Dbhexdump(cmd_len, cmd, false);

}

Dbprintf("%d bytes read from reader:", cmd_len);

Dbhexdump(cmd_len, cmd, false);

}

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

LEDsoff();

}

LEDsoff();

}

@@ -1545,12 +1557,12 @@ void BruteforceIso15693Afi(uint32_t speed)

uint8_t data[6];

uint8_t recv[ISO15693_MAX_RESPONSE_LENGTH];

uint8_t data[6];

uint8_t recv[ISO15693_MAX_RESPONSE_LENGTH];

int datalen=0, recvlen=0;

Iso15693InitReader();

StartCountSspClk();

int datalen=0, recvlen=0;

Iso15693InitReader();

StartCountSspClk();

// first without AFI

// Tags should respond without AFI and with AFI=0 even when AFI is active

// first without AFI

// Tags should respond without AFI and with AFI=0 even when AFI is active

@@ -1584,7 +1596,7 @@ void BruteforceIso15693Afi(uint32_t speed)

}

Dbprintf("AFI Bruteforcing done.");

}

Dbprintf("AFI Bruteforcing done.");

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

LEDsoff();

}

LEDsoff();

}

@@ -1616,7 +1628,7 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint

// 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

// 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);

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

LED_D_OFF();

LED_A_OFF();

LED_D_OFF();

LED_A_OFF();

@@ -1630,76 +1642,76 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint

// Set the UID to the tag (based on Iceman work).

void SetTag15693Uid(uint8_t *uid)

{

// Set the UID to the tag (based on Iceman work).

void SetTag15693Uid(uint8_t *uid)

{

- uint8_t cmd[4][9] = {0x00};

- uint16_t crc;

- int recvlen = 0;

- uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];

- LED_A_ON();

- // 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)

- 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[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];

- 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;

- if (DEBUG) {

- Dbprintf("SEND:");

- Dbhexdump(sizeof(cmd[i]), cmd[i], false);

- }

- recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), true, 1, recvbuf, sizeof(recvbuf), 0);

- if (DEBUG) {

- Dbprintf("RECV:");

- 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);

- }

- LED_D_OFF();

- LED_A_OFF();

+ uint8_t cmd[4][9] = {0x00};

+ uint16_t crc;

+ int recvlen = 0;

+ uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];

+ LED_A_ON();

+ // 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)

+ 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[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];

+ 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;

+ if (DEBUG) {

+ Dbprintf("SEND:");

+ Dbhexdump(sizeof(cmd[i]), cmd[i], false);

+ }

+ recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), true, 1, recvbuf, sizeof(recvbuf), 0);

+ if (DEBUG) {

+ Dbprintf("RECV:");

+ 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);

+ }

+ LED_D_OFF();

+ LED_A_OFF();

}

@@ -1801,8 +1813,8 @@ static void __attribute__((unused)) BuildArbitraryRequest(uint8_t *uid,uint8_t C

cmd[10] = 0x00;

cmd[11] = 0x0a;

cmd[10] = 0x00;

cmd[11] = 0x0a;

-// cmd[12] = 0x00;

-// cmd[13] = 0x00; //Now the CRC

+// cmd[12] = 0x00;

+// cmd[13] = 0x00; //Now the CRC

crc = Iso15693Crc(cmd, 12); // the crc needs to be calculated over 2 bytes

cmd[12] = crc & 0xff;

cmd[13] = crc >> 8;

crc = Iso15693Crc(cmd, 12); // the crc needs to be calculated over 2 bytes

cmd[12] = crc & 0xff;

cmd[13] = crc >> 8;

@@ -1836,8 +1848,8 @@ static void __attribute__((unused)) BuildArbitraryCustomRequest(uint8_t uid[], u

cmd[10] = 0x05; // for custom codes this must be manufacturer code

cmd[11] = 0x00;

cmd[10] = 0x05; // for custom codes this must be manufacturer code

cmd[11] = 0x00;

-// cmd[12] = 0x00;

-// cmd[13] = 0x00; //Now the CRC

+// cmd[12] = 0x00;

+// cmd[13] = 0x00; //Now the CRC

crc = Iso15693Crc(cmd, 12); // the crc needs to be calculated over 2 bytes

cmd[12] = crc & 0xff;

cmd[13] = crc >> 8;

crc = Iso15693Crc(cmd, 12); // the crc needs to be calculated over 2 bytes

cmd[12] = crc & 0xff;

cmd[13] = crc >> 8;