github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add: @pwpipi 's fixes to 14B

Browse source
This commit is contained in:
iceman1001 2015-06-18 09:52:53 +02:00
commit abb215301c
4 changed files with 253 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/appmain.c
View file

@ -782,19 +782,19 @@ void UsbPacketReceived(uint8_t *packet, int len)
#ifdef WITH_ISO14443b #ifdef WITH_ISO14443b
case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443: case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
AcquireRawAdcSamplesIso14443(c->arg[0]); AcquireRawAdcSamplesIso14443b(c->arg[0]);
break; break;
case CMD_READ_SRI512_TAG: case CMD_READ_SRI512_TAG:
ReadSTMemoryIso14443(0x0F); ReadSTMemoryIso14443b(0x0F);
break; break;
case CMD_READ_SRIX4K_TAG: case CMD_READ_SRIX4K_TAG:
ReadSTMemoryIso14443(0x7F); ReadSTMemoryIso14443b(0x7F);
break; break;
case CMD_SNOOP_ISO_14443: case CMD_SNOOP_ISO_14443:
SnoopIso14443(); SnoopIso14443b();
break; break;
case CMD_SIMULATE_TAG_ISO_14443: case CMD_SIMULATE_TAG_ISO_14443:
SimulateIso14443Tag(); SimulateIso14443bTag();
break; break;
case CMD_ISO_14443B_COMMAND: case CMD_ISO_14443B_COMMAND:
SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);

8
armsrc/apps.h
View file

@ -150,10 +150,10 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode); void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
/// iso14443.h /// iso14443.h
void SimulateIso14443Tag(void); void SimulateIso14443bTag(void);
void AcquireRawAdcSamplesIso14443(uint32_t parameter); void AcquireRawAdcSamplesIso14443b(uint32_t parameter);
void ReadSTMemoryIso14443(uint32_t); void ReadSTMemoryIso14443b(uint32_t);
void RAMFUNC SnoopIso14443(void); void RAMFUNC SnoopIso14443b(void);
void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]); void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
/// iso14443a.h /// iso14443a.h

404
armsrc/iso14443b.c
View file

@ -5,9 +5,8 @@
// at your option, any later version. See the LICENSE.txt file for the text of // at your option, any later version. See the LICENSE.txt file for the text of
// the license. // the license.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Routines to support ISO 14443. This includes both the reader software and // Routines to support ISO 14443B. This includes both the reader software and
// the `fake tag' modes. At the moment only the Type B modulation is // the `fake tag' modes.
// supported.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "proxmark3.h" #include "proxmark3.h"
@ -17,15 +16,8 @@
#include "iso14443crc.h" #include "iso14443crc.h"
//static void GetSamplesFor14443(int weTx, int n);
/*#define DEMOD_TRACE_SIZE 4096
#define READER_TAG_BUFFER_SIZE 2048
#define TAG_READER_BUFFER_SIZE 2048
#define DEMOD_DMA_BUFFER_SIZE 1024
*/
#define RECEIVE_SAMPLES_TIMEOUT 2000 #define RECEIVE_SAMPLES_TIMEOUT 2000
#define ISO14443B_DMA_BUFFER_SIZE 512
//============================================================================= //=============================================================================
// An ISO 14443 Type B tag. We listen for commands from the reader, using // An ISO 14443 Type B tag. We listen for commands from the reader, using
@ -104,14 +96,14 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len)
ToSendStuffBit(1); ToSendStuffBit(1);
} }
// Send SOF. // Send EOF.
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {
ToSendStuffBit(0); ToSendStuffBit(0);
ToSendStuffBit(0); ToSendStuffBit(0);
ToSendStuffBit(0); ToSendStuffBit(0);
ToSendStuffBit(0); ToSendStuffBit(0);
} }
for(i = 0; i < 10; i++) { for(i = 0; i < 2; i++) {
ToSendStuffBit(1); ToSendStuffBit(1);
ToSendStuffBit(1); ToSendStuffBit(1);
ToSendStuffBit(1); ToSendStuffBit(1);
@ -120,9 +112,6 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len)
// Convert from last byte pos to length // Convert from last byte pos to length
ToSendMax++; ToSendMax++;
// Add a few more for slop
ToSendMax += 2;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -146,6 +135,9 @@ static struct {
} Uart; } Uart;
/* Receive & handle a bit coming from the reader. /* Receive & handle a bit coming from the reader.
*
* This function is called 4 times per bit (every 2 subcarrier cycles).
* Subcarrier frequency fs is 848kHz, 1/fs = 1,18us, i.e. function is called every 2,36us
* *
* LED handling: * LED handling:
* LED A -> ON once we have received the SOF and are expecting the rest. * LED A -> ON once we have received the SOF and are expecting the rest.
@ -154,7 +146,7 @@ static struct {
* Returns: true if we received a EOF * Returns: true if we received a EOF
* false if we are still waiting for some more * false if we are still waiting for some more
*/ */
static int Handle14443UartBit(int bit) static int Handle14443bUartBit(int bit)
{ {
switch(Uart.state) { switch(Uart.state) {
case STATE_UNSYNCD: case STATE_UNSYNCD:
@ -169,9 +161,9 @@ static int Handle14443UartBit(int bit)
case STATE_GOT_FALLING_EDGE_OF_SOF: case STATE_GOT_FALLING_EDGE_OF_SOF:
Uart.posCnt++; Uart.posCnt++;
if(Uart.posCnt == 2) { if(Uart.posCnt == 2) { // sample every 4 1/fs in the middle of a bit
if(bit) { if(bit) {
if(Uart.bitCnt >= 10) { if(Uart.bitCnt > 9) {
// we've seen enough consecutive // we've seen enough consecutive
// zeros that it's a valid SOF // zeros that it's a valid SOF
Uart.posCnt = 0; Uart.posCnt = 0;
@ -189,7 +181,7 @@ static int Handle14443UartBit(int bit)
Uart.bitCnt++; Uart.bitCnt++;
} }
if(Uart.posCnt >= 4) Uart.posCnt = 0; if(Uart.posCnt >= 4) Uart.posCnt = 0;
if(Uart.bitCnt > 14) { if(Uart.bitCnt > 12) {
// Give up if we see too many zeros without // Give up if we see too many zeros without
// a one, too. // a one, too.
Uart.state = STATE_ERROR_WAIT; Uart.state = STATE_ERROR_WAIT;
@ -199,7 +191,7 @@ static int Handle14443UartBit(int bit)
case STATE_AWAITING_START_BIT: case STATE_AWAITING_START_BIT:
Uart.posCnt++; Uart.posCnt++;
if(bit) { if(bit) {
if(Uart.posCnt > 25) { if(Uart.posCnt > 50/2) { // max 57us between characters = 49 1/fs, max 3 etus after low phase of SOF = 24 1/fs
// stayed high for too long between // stayed high for too long between
// characters, error // characters, error
Uart.state = STATE_ERROR_WAIT; Uart.state = STATE_ERROR_WAIT;
@ -283,12 +275,12 @@ static int Handle14443UartBit(int bit)
// Assume that we're called with the SSC (to the FPGA) and ADC path set // Assume that we're called with the SSC (to the FPGA) and ADC path set
// correctly. // correctly.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static int GetIso14443CommandFromReader(uint8_t *received, int *len, int maxLen) static int GetIso14443bCommandFromReader(uint8_t *received, int *len, int maxLen)
{ {
uint8_t mask; uint8_t mask;
int i, bit; int i, bit;
// Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen // Set FPGA mode to "simulated ISO 14443B tag", no modulation (listen
// only, since we are receiving, not transmitting). // only, since we are receiving, not transmitting).
// Signal field is off with the appropriate LED // Signal field is off with the appropriate LED
LED_D_OFF(); LED_D_OFF();
@ -314,7 +306,7 @@ static int GetIso14443CommandFromReader(uint8_t *received, int *len, int maxLen)
mask = 0x80; mask = 0x80;
for(i = 0; i < 8; i++, mask >>= 1) { for(i = 0; i < 8; i++, mask >>= 1) {
bit = (b & mask); bit = (b & mask);
if(Handle14443UartBit(bit)) { if(Handle14443bUartBit(bit)) {
*len = Uart.byteCnt; *len = Uart.byteCnt;
return TRUE; return TRUE;
} }
@ -327,9 +319,13 @@ static int GetIso14443CommandFromReader(uint8_t *received, int *len, int maxLen)
// Main loop of simulated tag: receive commands from reader, decide what // Main loop of simulated tag: receive commands from reader, decide what
// response to send, and send it. // response to send, and send it.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void SimulateIso14443Tag(void) void SimulateIso14443bTag(void)
{ {
// the only command we understand is REQB, AFI=0, Select All, N=0:
static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 };
// ... and we respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
// supports only 106kBit/s in both directions, max frame size = 32Bytes,
// supports ISO14443-4, FWI=8 (77ms), NAD supported, CID not supported:
static const uint8_t response1[] = { static const uint8_t response1[] = {
0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19, 0x22, 0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19, 0x22,
0x00, 0x21, 0x85, 0x5e, 0xd7 0x00, 0x21, 0x85, 0x5e, 0xd7
@ -338,10 +334,9 @@ void SimulateIso14443Tag(void)
uint8_t *resp; uint8_t *resp;
int respLen; int respLen;
uint8_t *resp1 = BigBuf_get_addr() + 800; // allocate command receive buffer
int resp1Len; BigBuf_free();
uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
uint8_t *receivedCmd = BigBuf_get_addr();
int len; int len;
int i; int i;
@ -349,10 +344,12 @@ void SimulateIso14443Tag(void)
int cmdsRecvd = 0; int cmdsRecvd = 0;
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
memset(receivedCmd, 0x44, 400);
// prepare the (only one) tag answer:
CodeIso14443bAsTag(response1, sizeof(response1)); CodeIso14443bAsTag(response1, sizeof(response1));
memcpy(resp1, ToSend, ToSendMax); resp1Len = ToSendMax; uint8_t *resp1 = BigBuf_malloc(ToSendMax);
memcpy(resp1, ToSend, ToSendMax);
uint16_t resp1Len = ToSendMax;
// We need to listen to the high-frequency, peak-detected path. // We need to listen to the high-frequency, peak-detected path.
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@ -363,7 +360,7 @@ void SimulateIso14443Tag(void)
for(;;) { for(;;) {
uint8_t b1, b2; uint8_t b1, b2;
if(!GetIso14443CommandFromReader(receivedCmd, &len, 100)) { if(!GetIso14443bCommandFromReader(receivedCmd, &len, 100)) {
Dbprintf("button pressed, received %d commands", cmdsRecvd); Dbprintf("button pressed, received %d commands", cmdsRecvd);
break; break;
} }
@ -385,8 +382,6 @@ void SimulateIso14443Tag(void)
break; break;
} }
memset(receivedCmd, 0x44, 32);
cmdsRecvd++; cmdsRecvd++;
if(cmdsRecvd > 0x30) { if(cmdsRecvd > 0x30) {
@ -444,8 +439,10 @@ static struct {
int bitCount; int bitCount;
int posCount; int posCount;
int thisBit; int thisBit;
/* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
int metric; int metric;
int metricN; int metricN;
*/
uint16_t shiftReg; uint16_t shiftReg;
uint8_t *output; uint8_t *output;
int len; int len;
@ -456,6 +453,9 @@ static struct {
/* /*
* Handles reception of a bit from the tag * Handles reception of a bit from the tag
* *
* This function is called 2 times per bit (every 4 subcarrier cycles).
* Subcarrier frequency fs is 848kHz, 1/fs = 1,18us, i.e. function is called every 4,72us
*
* LED handling: * LED handling:
* LED C -> ON once we have received the SOF and are expecting the rest. * LED C -> ON once we have received the SOF and are expecting the rest.
* LED C -> OFF once we have received EOF or are unsynced * LED C -> OFF once we have received EOF or are unsynced
@ -464,7 +464,7 @@ static struct {
* false if we are still waiting for some more * false if we are still waiting for some more
* *
*/ */
static RAMFUNC int Handle14443SamplesDemod(int ci, int cq) static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
{ {
int v; int v;
@ -483,47 +483,87 @@ static RAMFUNC int Handle14443SamplesDemod(int ci, int cq)
} \ } \
} }
#define SUBCARRIER_DETECT_THRESHOLD 8
// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by abs(ci) + abs(cq)
/* #define CHECK_FOR_SUBCARRIER() { \
v = ci; \
if(v < 0) v = -v; \
if(cq > 0) { \
v += cq; \
} else { \
v -= cq; \
} \
}
*/
// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
#define CHECK_FOR_SUBCARRIER() { \
if(ci < 0) { \
if(cq < 0) { /* ci < 0, cq < 0 */ \
if (cq < ci) { \
v = -cq - (ci >> 1); \
} else { \
v = -ci - (cq >> 1); \
} \
} else { /* ci < 0, cq >= 0 */ \
if (cq < -ci) { \
v = -ci + (cq >> 1); \
} else { \
v = cq - (ci >> 1); \
} \
} \
} else { \
if(cq < 0) { /* ci >= 0, cq < 0 */ \
if (-cq < ci) { \
v = ci - (cq >> 1); \
} else { \
v = -cq + (ci >> 1); \
} \
} else { /* ci >= 0, cq >= 0 */ \
if (cq < ci) { \
v = ci + (cq >> 1); \
} else { \
v = cq + (ci >> 1); \
} \
} \
} \
}
switch(Demod.state) { switch(Demod.state) {
case DEMOD_UNSYNCD: case DEMOD_UNSYNCD:
v = ci; CHECK_FOR_SUBCARRIER();
if(v < 0) v = -v; if(v > SUBCARRIER_DETECT_THRESHOLD) { // subcarrier detected
if(cq > 0) {
v += cq;
} else {
v -= cq;
}
if(v > 40) {
Demod.posCount = 0;
Demod.state = DEMOD_PHASE_REF_TRAINING; Demod.state = DEMOD_PHASE_REF_TRAINING;
Demod.sumI = 0; Demod.sumI = ci;
Demod.sumQ = 0; Demod.sumQ = cq;
Demod.posCount = 1;
} }
break; break;
case DEMOD_PHASE_REF_TRAINING: case DEMOD_PHASE_REF_TRAINING:
if(Demod.posCount < 8) { if(Demod.posCount < 8) {
CHECK_FOR_SUBCARRIER();
if (v > SUBCARRIER_DETECT_THRESHOLD) {
// set the reference phase (will code a logic '1') by averaging over 32 1/fs.
// note: synchronization time > 80 1/fs
Demod.sumI += ci; Demod.sumI += ci;
Demod.sumQ += cq; Demod.sumQ += cq;
} else if(Demod.posCount > 100) { Demod.posCount++;
// error, waited too long } else { // subcarrier lost
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
} else {
MAKE_SOFT_DECISION();
if(v < 0) {
Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
Demod.posCount = 0;
} }
} else {
Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
} }
Demod.posCount++;
break; break;
case DEMOD_AWAITING_FALLING_EDGE_OF_SOF: case DEMOD_AWAITING_FALLING_EDGE_OF_SOF:
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(v < 0) { if(v < 0) { // logic '0' detected
Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF; Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
Demod.posCount = 0; Demod.posCount = 0; // start of SOF sequence
} else { } else {
if(Demod.posCount > 100) { if(Demod.posCount > 200/4) { // maximum length of TR1 = 200 1/fs
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
} }
} }
@ -531,37 +571,40 @@ static RAMFUNC int Handle14443SamplesDemod(int ci, int cq)
break; break;
case DEMOD_GOT_FALLING_EDGE_OF_SOF: case DEMOD_GOT_FALLING_EDGE_OF_SOF:
Demod.posCount++;
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(v > 0) { if(v > 0) {
if(Demod.posCount < 12) { if(Demod.posCount < 9*2) { // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
} else { } else {
LED_C_ON(); // Got SOF LED_C_ON(); // Got SOF
Demod.state = DEMOD_AWAITING_START_BIT; Demod.state = DEMOD_AWAITING_START_BIT;
Demod.posCount = 0; Demod.posCount = 0;
Demod.len = 0; Demod.len = 0;
/* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
Demod.metricN = 0; Demod.metricN = 0;
Demod.metric = 0; Demod.metric = 0;
*/
} }
} else { } else {
if(Demod.posCount > 100) { if(Demod.posCount > 12*2) { // low phase of SOF too long (> 12 etu)
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
LED_C_OFF(); LED_C_OFF();
} }
} }
Demod.posCount++;
break; break;
case DEMOD_AWAITING_START_BIT: case DEMOD_AWAITING_START_BIT:
Demod.posCount++;
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(v > 0) { if(v > 0) {
if(Demod.posCount > 10) { if(Demod.posCount > 3*2) { // max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
LED_C_OFF(); LED_C_OFF();
} }
} else { } else { // start bit detected
Demod.bitCount = 0; Demod.bitCount = 0;
Demod.posCount = 1; Demod.posCount = 1; // this was the first half
Demod.thisBit = v; Demod.thisBit = v;
Demod.shiftReg = 0; Demod.shiftReg = 0;
Demod.state = DEMOD_RECEIVING_DATA; Demod.state = DEMOD_RECEIVING_DATA;
@ -570,28 +613,30 @@ static RAMFUNC int Handle14443SamplesDemod(int ci, int cq)
case DEMOD_RECEIVING_DATA: case DEMOD_RECEIVING_DATA:
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(Demod.posCount == 0) { if(Demod.posCount == 0) { // first half of bit
Demod.thisBit = v; Demod.thisBit = v;
Demod.posCount = 1; Demod.posCount = 1;
} else { } else { // second half of bit
Demod.thisBit += v; Demod.thisBit += v;
/* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
if(Demod.thisBit > 0) { if(Demod.thisBit > 0) {
Demod.metric += Demod.thisBit; Demod.metric += Demod.thisBit;
} else { } else {
Demod.metric -= Demod.thisBit; Demod.metric -= Demod.thisBit;
} }
(Demod.metricN)++; (Demod.metricN)++;
*/
Demod.shiftReg >>= 1; Demod.shiftReg >>= 1;
if(Demod.thisBit > 0) { if(Demod.thisBit > 0) { // logic '1'
Demod.shiftReg |= 0x200; Demod.shiftReg |= 0x200;
} }
Demod.bitCount++; Demod.bitCount++;
if(Demod.bitCount == 10) { if(Demod.bitCount == 10) {
uint16_t s = Demod.shiftReg; uint16_t s = Demod.shiftReg;
if((s & 0x200) && !(s & 0x001)) { if((s & 0x200) && !(s & 0x001)) { // stop bit == '1', start bit == '0'
uint8_t b = (s >> 1); uint8_t b = (s >> 1);
Demod.output[Demod.len] = b; Demod.output[Demod.len] = b;
Demod.len++; Demod.len++;
@ -600,7 +645,7 @@ static RAMFUNC int Handle14443SamplesDemod(int ci, int cq)
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
LED_C_OFF(); LED_C_OFF();
if(s == 0x000) { if(s == 0x000) {
// This is EOF // This is EOF (start, stop and all data bits == '0'
return TRUE; return TRUE;
} }
} }
@ -624,6 +669,7 @@ static void DemodReset()
// Clear out the state of the "UART" that receives from the tag. // Clear out the state of the "UART" that receives from the tag.
Demod.len = 0; Demod.len = 0;
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
Demod.posCount = 0;
memset(Demod.output, 0x00, MAX_FRAME_SIZE); memset(Demod.output, 0x00, MAX_FRAME_SIZE);
} }
@ -653,14 +699,12 @@ static void UartInit(uint8_t *data)
/* /*
* Demodulate the samples we received from the tag, also log to tracebuffer * Demodulate the samples we received from the tag, also log to tracebuffer
* weTx: set to 'TRUE' if we behave like a reader
* set to 'FALSE' if we behave like a snooper
* quiet: set to 'TRUE' to disable debug output * quiet: set to 'TRUE' to disable debug output
*/ */
static void GetSamplesFor14443Demod(int weTx, int n, int quiet) static void GetSamplesFor14443bDemod(int n, bool quiet)
{ {
int max = 0; int max = 0;
int gotFrame = FALSE; bool gotFrame = FALSE;
int lastRxCounter, ci, cq, samples = 0; int lastRxCounter, ci, cq, samples = 0;
// Allocate memory from BigBuf for some buffers // Allocate memory from BigBuf for some buffers
@ -671,57 +715,56 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE); uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE);
// The DMA buffer, used to stream samples from the FPGA // The DMA buffer, used to stream samples from the FPGA
int8_t *dmaBuf = (int8_t*) BigBuf_malloc(DMA_BUFFER_SIZE); int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
// Set up the demodulator for tag -> reader responses. // Set up the demodulator for tag -> reader responses.
DemodInit(receivedResponse); DemodInit(receivedResponse);
// Setup and start DMA. // Setup and start DMA.
FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE); FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
int8_t *upTo = dmaBuf; int8_t *upTo = dmaBuf;
lastRxCounter = DMA_BUFFER_SIZE; lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
// Signal field is ON with the appropriate LED: // Signal field is ON with the appropriate LED:
if (weTx) LED_D_ON(); else LED_D_OFF(); LED_D_ON();
// And put the FPGA in the appropriate mode // And put the FPGA in the appropriate mode
FpgaWriteConfWord( FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ |
(weTx ? 0 : FPGA_HF_READER_RX_XCORR_SNOOP));
for(;;) { for(;;) {
int behindBy = lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR; int behindBy = lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR;
if(behindBy > max) max = behindBy; if(behindBy > max) max = behindBy;
while(((lastRxCounter-AT91C_BASE_PDC_SSC->PDC_RCR) & (DMA_BUFFER_SIZE-1)) while(((lastRxCounter-AT91C_BASE_PDC_SSC->PDC_RCR) & (ISO14443B_DMA_BUFFER_SIZE-1)) > 2) {
> 2)
{
ci = upTo[0]; ci = upTo[0];
cq = upTo[1]; cq = upTo[1];
upTo += 2; upTo += 2;
if(upTo >= dmaBuf + DMA_BUFFER_SIZE) { if(upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
upTo = dmaBuf; upTo = dmaBuf;
AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo; AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo;
AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE; AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
} }
lastRxCounter -= 2; lastRxCounter -= 2;
if(lastRxCounter <= 0) { if(lastRxCounter <= 0) {
lastRxCounter += DMA_BUFFER_SIZE; lastRxCounter += ISO14443B_DMA_BUFFER_SIZE;
} }
samples += 2; samples += 2;
if(Handle14443SamplesDemod(ci, cq)) { if(Handle14443bSamplesDemod(ci, cq)) {
gotFrame = 1; gotFrame = TRUE;
}
}
if(samples > n) {
break; break;
} }
} }
if(samples > n || gotFrame) {
break;
}
}
AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS; AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
if (!quiet) Dbprintf("%x %x %x", max, gotFrame, Demod.len);
if (!quiet) Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", max, samples, gotFrame, Demod.len, Demod.sumI, Demod.sumQ);
//Tracing //Tracing
if (tracing && Demod.len > 0) { if (tracing && Demod.len > 0) {
uint8_t parity[MAX_PARITY_SIZE]; uint8_t parity[MAX_PARITY_SIZE];
@ -731,43 +774,10 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
} }
//-----------------------------------------------------------------------------
// Read the tag's response. We just receive a stream of slightly-processed
// samples from the FPGA, which we will later do some signal processing on,
// to get the bits.
//-----------------------------------------------------------------------------
/*static void GetSamplesFor14443(int weTx, int n)
{
uint8_t *dest = (uint8_t *)BigBuf;
int c;
FpgaWriteConfWord(
FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ |
(weTx ? 0 : FPGA_HF_READER_RX_XCORR_SNOOP));
c = 0;
for(;;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
AT91C_BASE_SSC->SSC_THR = 0x43;
}
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
int8_t b;
b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
dest[c++] = (uint8_t)b;
if(c >= n) {
break;
}
}
}
}*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Transmit the command (to the tag) that was placed in ToSend[]. // Transmit the command (to the tag) that was placed in ToSend[].
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void TransmitFor14443(void) static void TransmitFor14443b(void)
{ {
int c; int c;
@ -781,8 +791,7 @@ static void TransmitFor14443(void)
LED_D_ON(); LED_D_ON();
// Signal we are transmitting with the Green LED // Signal we are transmitting with the Green LED
LED_B_ON(); LED_B_ON();
FpgaWriteConfWord( FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
for(c = 0; c < 10;) { for(c = 0; c < 10;) {
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
@ -817,7 +826,7 @@ static void TransmitFor14443(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Code a layer 2 command (string of octets, including CRC) into ToSend[], // Code a layer 2 command (string of octets, including CRC) into ToSend[],
// so that it is ready to transmit to the tag using TransmitFor14443(). // so that it is ready to transmit to the tag using TransmitFor14443b().
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void CodeIso14443bAsReader(const uint8_t *cmd, int len) static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
{ {
@ -873,16 +882,16 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Read an ISO 14443 tag. We send it some set of commands, and record the // Read an ISO 14443B tag. We send it some set of commands, and record the
// responses. // responses.
// The command name is misleading, it actually decodes the reponse in HEX // The command name is misleading, it actually decodes the reponse in HEX
// into the output buffer (read the result using hexsamples, not hisamples) // into the output buffer (read the result using hexsamples, not hisamples)
// //
// obsolete function only for test // obsolete function only for test
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void AcquireRawAdcSamplesIso14443(uint32_t parameter) void AcquireRawAdcSamplesIso14443b(uint32_t parameter)
{ {
uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // REQB with AFI=0, Request All, N=0
SendRawCommand14443B(sizeof(cmd1),1,1,cmd1); SendRawCommand14443B(sizeof(cmd1),1,1,cmd1);
} }
@ -894,7 +903,7 @@ void AcquireRawAdcSamplesIso14443(uint32_t parameter)
static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
{ {
CodeIso14443bAsReader(cmd, len); CodeIso14443bAsReader(cmd, len);
TransmitFor14443(); TransmitFor14443b();
if (tracing) { if (tracing) {
uint8_t parity[MAX_PARITY_SIZE]; uint8_t parity[MAX_PARITY_SIZE];
GetParity(cmd, len, parity); GetParity(cmd, len, parity);
@ -904,7 +913,7 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Read a SRI512 ISO 14443 tag. // Read a SRI512 ISO 14443B tag.
// //
// SRI512 tags are just simple memory tags, here we're looking at making a dump // SRI512 tags are just simple memory tags, here we're looking at making a dump
// of the contents of the memory. No anticollision algorithm is done, we assume // of the contents of the memory. No anticollision algorithm is done, we assume
@ -912,7 +921,7 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
// //
// I tried to be systematic and check every answer of the tag, every CRC, etc... // I tried to be systematic and check every answer of the tag, every CRC, etc...
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ReadSTMemoryIso14443(uint32_t dwLast) void ReadSTMemoryIso14443b(uint32_t dwLast)
{ {
clear_trace(); clear_trace();
set_tracing(TRUE); set_tracing(TRUE);
@ -941,7 +950,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE); GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
// LED_A_OFF(); // LED_A_OFF();
if (Demod.len == 0) { if (Demod.len == 0) {
@ -959,7 +968,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE); GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
// LED_A_OFF(); // LED_A_OFF();
if (Demod.len != 3) { if (Demod.len != 3) {
Dbprintf("Expected 3 bytes from tag, got %d", Demod.len); Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
@ -983,7 +992,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE); GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
// LED_A_OFF(); // LED_A_OFF();
if (Demod.len != 10) { if (Demod.len != 10) {
Dbprintf("Expected 10 bytes from tag, got %d", Demod.len); Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
@ -1015,7 +1024,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE); GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
// LED_A_OFF(); // LED_A_OFF();
if (Demod.len != 6) { // Check if we got an answer from the tag if (Demod.len != 6) { // Check if we got an answer from the tag
DbpString("Expected 6 bytes from tag, got less..."); DbpString("Expected 6 bytes from tag, got less...");
@ -1054,10 +1063,10 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
* Memory usage for this function, (within BigBuf) * Memory usage for this function, (within BigBuf)
* Last Received command (reader->tag) - MAX_FRAME_SIZE * Last Received command (reader->tag) - MAX_FRAME_SIZE
* Last Received command (tag->reader) - MAX_FRAME_SIZE * Last Received command (tag->reader) - MAX_FRAME_SIZE
* DMA Buffer, 1024 bytes (samples) - DMA_BUFFER_SIZE * DMA Buffer - ISO14443B_DMA_BUFFER_SIZE
* Demodulated samples received - all the rest * Demodulated samples received - all the rest
*/ */
void RAMFUNC SnoopIso14443(void) void RAMFUNC SnoopIso14443b(void)
{ {
// We won't start recording the frames that we acquire until we trigger; // We won't start recording the frames that we acquire until we trigger;
// a good trigger condition to get started is probably when we see a // a good trigger condition to get started is probably when we see a
@ -1071,7 +1080,7 @@ void RAMFUNC SnoopIso14443(void)
set_tracing(TRUE); set_tracing(TRUE);
// The DMA buffer, used to stream samples from the FPGA // The DMA buffer, used to stream samples from the FPGA
int8_t *dmaBuf = (int8_t*) BigBuf_malloc(DMA_BUFFER_SIZE); int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
int lastRxCounter; int lastRxCounter;
int8_t *upTo; int8_t *upTo;
int ci, cq; int ci, cq;
@ -1089,10 +1098,10 @@ void RAMFUNC SnoopIso14443(void)
Dbprintf(" Trace: %i bytes", BigBuf_max_traceLen()); Dbprintf(" Trace: %i bytes", BigBuf_max_traceLen());
Dbprintf(" Reader -> tag: %i bytes", MAX_FRAME_SIZE); Dbprintf(" Reader -> tag: %i bytes", MAX_FRAME_SIZE);
Dbprintf(" tag -> Reader: %i bytes", MAX_FRAME_SIZE); Dbprintf(" tag -> Reader: %i bytes", MAX_FRAME_SIZE);
Dbprintf(" DMA: %i bytes", DMA_BUFFER_SIZE); Dbprintf(" DMA: %i bytes", ISO14443B_DMA_BUFFER_SIZE);
// Signal field is off with the appropriate LED // Signal field is off, no reader signal, no tag signal
LED_D_OFF(); LEDsoff();
// And put the FPGA in the appropriate mode // And put the FPGA in the appropriate mode
FpgaWriteConfWord( FpgaWriteConfWord(
@ -1103,10 +1112,9 @@ void RAMFUNC SnoopIso14443(void)
// Setup for the DMA. // Setup for the DMA.
FpgaSetupSsc(); FpgaSetupSsc();
upTo = dmaBuf; upTo = dmaBuf;
lastRxCounter = DMA_BUFFER_SIZE; lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
FpgaSetupSscDma((uint8_t*) dmaBuf, DMA_BUFFER_SIZE); FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
uint8_t parity[MAX_PARITY_SIZE]; uint8_t parity[MAX_PARITY_SIZE];
LED_A_ON();
bool TagIsActive = FALSE; bool TagIsActive = FALSE;
bool ReaderIsActive = FALSE; bool ReaderIsActive = FALSE;
@ -1114,50 +1122,56 @@ void RAMFUNC SnoopIso14443(void)
// And now we loop, receiving samples. // And now we loop, receiving samples.
for(;;) { for(;;) {
int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) &
(DMA_BUFFER_SIZE-1); (ISO14443B_DMA_BUFFER_SIZE-1);
if(behindBy > maxBehindBy) { if(behindBy > maxBehindBy) {
maxBehindBy = behindBy; maxBehindBy = behindBy;
if(behindBy > (9*DMA_BUFFER_SIZE/10)) { // TODO: understand whether we can increase/decrease as we want or not?
Dbprintf("blew circular buffer! behindBy=0x%x", behindBy);
break;
}
} }
if(behindBy < 2) continue; if(behindBy < 2) continue;
ci = upTo[0]; ci = upTo[0];
cq = upTo[1]; cq = upTo[1];
upTo += 2; upTo += 2;
lastRxCounter -= 2; lastRxCounter -= 2;
if(upTo >= dmaBuf + DMA_BUFFER_SIZE) { if(upTo >= dmaBuf + ISO14443B_DMA_BUFFER_SIZE) {
upTo = dmaBuf; upTo = dmaBuf;
lastRxCounter += DMA_BUFFER_SIZE; lastRxCounter += ISO14443B_DMA_BUFFER_SIZE;
AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf; AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE; AT91C_BASE_PDC_SSC->PDC_RNCR = ISO14443B_DMA_BUFFER_SIZE;
WDT_HIT();
if(behindBy > (9*ISO14443B_DMA_BUFFER_SIZE/10)) { // TODO: understand whether we can increase/decrease as we want or not?
Dbprintf("blew circular buffer! behindBy=0x%x", behindBy);
break;
}
if(!tracing) {
DbpString("Reached trace limit");
break;
}
if(BUTTON_PRESS()) {
DbpString("cancelled");
break;
}
} }
samples += 2; samples += 2;
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(Handle14443UartBit(ci & 0x01)) { if(Handle14443bUartBit(ci & 0x01)) {
if(triggered && tracing) { if(triggered && tracing) {
GetParity(Uart.output, Uart.byteCnt, parity); GetParity(Uart.output, Uart.byteCnt, parity);
LogTrace(Uart.output,Uart.byteCnt,samples, samples,parity,TRUE); LogTrace(Uart.output,Uart.byteCnt,samples, samples,parity,TRUE);
} }
if(Uart.byteCnt==0) Dbprintf("[1] Error, Uart.byteCnt==0, Uart.bitCnt=%d", Uart.bitCnt);
/* And ready to receive another command. */ /* And ready to receive another command. */
UartReset(); UartReset();
/* And also reset the demod code, which might have been */ /* And also reset the demod code, which might have been */
/* false-triggered by the commands from the reader. */ /* false-triggered by the commands from the reader. */
DemodReset(); DemodReset();
} }
if(Handle14443UartBit(cq & 0x01)) { if(Handle14443bUartBit(cq & 0x01)) {
if(triggered && tracing) { if(triggered && tracing) {
GetParity(Uart.output, Uart.byteCnt, parity); GetParity(Uart.output, Uart.byteCnt, parity);
LogTrace(Uart.output,Uart.byteCnt,samples, samples, parity, TRUE); LogTrace(Uart.output,Uart.byteCnt,samples, samples, parity, TRUE);
} }
if(Uart.byteCnt==0) Dbprintf("[2] Error, Uart.byteCnt==0, Uart.bitCnt=%d", Uart.bitCnt);
/* And ready to receive another command. */ /* And ready to receive another command. */
UartReset(); UartReset();
/* And also reset the demod code, which might have been */ /* And also reset the demod code, which might have been */
@ -1168,7 +1182,7 @@ void RAMFUNC SnoopIso14443(void)
} }
if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending - and we cannot afford the time if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending - and we cannot afford the time
if(Handle14443SamplesDemod(ci & 0xFE, cq & 0xFE)) { if(Handle14443bSamplesDemod(ci & 0xFE, cq & 0xFE)) {
//Use samples as a time measurement //Use samples as a time measurement
if(tracing) if(tracing)
@ -1178,31 +1192,17 @@ void RAMFUNC SnoopIso14443(void)
LogTrace(Demod.output, Demod.len,samples, samples, parity, FALSE); LogTrace(Demod.output, Demod.len,samples, samples, parity, FALSE);
} }
triggered = TRUE; triggered = TRUE;
LED_A_OFF();
LED_B_ON();
// And ready to receive another response. // And ready to receive another response.
DemodReset(); DemodReset();
} }
TagIsActive = (Demod.state != DEMOD_UNSYNCD); TagIsActive = (Demod.state > DEMOD_PHASE_REF_TRAINING);
} }
WDT_HIT();
if(!tracing) {
DbpString("Reached trace limit");
break;
}
if(BUTTON_PRESS()) {
DbpString("cancelled");
break;
}
} }
FpgaDisableSscDma(); FpgaDisableSscDma();
LED_A_OFF(); LEDsoff();
LED_B_OFF();
LED_C_OFF();
AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS; AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
DbpString("Snoop statistics:"); DbpString("Snoop statistics:");
Dbprintf(" Max behind by: %i", maxBehindBy); Dbprintf(" Max behind by: %i", maxBehindBy);
@ -1225,47 +1225,39 @@ void RAMFUNC SnoopIso14443(void)
* none * none
* *
*/ */
void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield_trace, uint8_t data[]) void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[])
{ {
uint8_t powerfield = powerfield_trace & 1;
uint8_t trace = powerfield_trace & 2;
if (trace){
clear_trace();
set_tracing(TRUE);
}
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
if(!powerfield) SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
{ FpgaSetupSsc();
set_tracing(TRUE);
/* if(!powerfield) {
// Make sure that we start from off, since the tags are stateful; // Make sure that we start from off, since the tags are stateful;
// confusing things will happen if we don't reset them between reads. // confusing things will happen if we don't reset them between reads.
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_D_OFF(); LED_D_OFF();
SpinDelay(200); SpinDelay(200);
} }
*/
if(!GETBIT(GPIO_LED_D)) // if(!GETBIT(GPIO_LED_D)) { // if field is off
{ // FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); // // Signal field is on with the appropriate LED
FpgaSetupSsc(); // LED_D_ON();
// SpinDelay(200);
// Now give it time to spin up. // }
// Signal field is on with the appropriate LED
LED_D_ON();
FpgaWriteConfWord(
FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ);
SpinDelay(200);
}
CodeAndTransmit14443bAsReader(data, datalen); CodeAndTransmit14443bAsReader(data, datalen);
if(recv) if(recv) {
{ GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE);
uint16_t iLen = MIN(Demod.len,USB_CMD_DATA_SIZE); uint16_t iLen = MIN(Demod.len,USB_CMD_DATA_SIZE);
cmd_send(CMD_ACK,iLen,0,0,Demod.output,iLen); cmd_send(CMD_ACK,iLen,0,0,Demod.output,iLen);
} }
if(!powerfield)
{ if(!powerfield) {
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_D_OFF(); LED_D_OFF();
} }

80
client/cmdhf14b.c
View file

@ -23,7 +23,8 @@
#include "cmdhf14b.h" #include "cmdhf14b.h"
#include "cmdmain.h" #include "cmdmain.h"
#include "cmdhf14a.h" #include "cmdhf14a.h"
#include "sleep.h" //#include "sleep.h"
#include "cmddata.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -155,6 +156,7 @@ int CmdHF14BList(const char *Cmd)
int CmdHF14Sim(const char *Cmd) int CmdHF14Sim(const char *Cmd)
{ {
UsbCommand c={CMD_SIMULATE_TAG_ISO_14443}; UsbCommand c={CMD_SIMULATE_TAG_ISO_14443};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -162,6 +164,7 @@ int CmdHF14Sim(const char *Cmd)
int CmdHFSimlisten(const char *Cmd) int CmdHFSimlisten(const char *Cmd)
{ {
UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN}; UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -169,6 +172,7 @@ int CmdHFSimlisten(const char *Cmd)
int CmdHF14BSnoop(const char *Cmd) int CmdHF14BSnoop(const char *Cmd)
{ {
UsbCommand c = {CMD_SNOOP_ISO_14443}; UsbCommand c = {CMD_SNOOP_ISO_14443};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -180,6 +184,7 @@ int CmdHF14BSnoop(const char *Cmd)
int CmdSri512Read(const char *Cmd) int CmdSri512Read(const char *Cmd)
{ {
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}}; UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -191,6 +196,7 @@ int CmdSri512Read(const char *Cmd)
int CmdSrix4kRead(const char *Cmd) int CmdSrix4kRead(const char *Cmd)
{ {
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}}; UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -198,6 +204,7 @@ int CmdSrix4kRead(const char *Cmd)
int rawClose(void){ int rawClose(void){
UsbCommand resp; UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) { if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
return 0; return 0;
@ -207,7 +214,7 @@ int rawClose(void){
int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8_t *datalen, bool verbose){ int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8_t *datalen, bool verbose){
UsbCommand resp; UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power/trace
if(*crc) if(*crc)
{ {
uint8_t first, second; uint8_t first, second;
@ -221,6 +228,7 @@ int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8
c.arg[1] = reply; c.arg[1] = reply;
c.arg[2] = power_trace; c.arg[2] = power_trace;
memcpy(c.d.asBytes,data,*datalen); memcpy(c.d.asBytes,data,*datalen);
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (!reply) return 1; if (!reply) return 1;
@ -231,8 +239,7 @@ int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8
} }
*datalen = resp.arg[0]; *datalen = resp.arg[0];
if (verbose) PrintAndLog("received %u octets", *datalen); if (verbose) PrintAndLog("received %u octets", *datalen);
if(!*datalen) if(*datalen<2) return 0;
return 0;
memcpy(data, resp.d.asBytes, *datalen); memcpy(data, resp.d.asBytes, *datalen);
if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen)); if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
@ -400,10 +407,9 @@ int HF14BStdRead(uint8_t *data, uint8_t *datalen){
data[1] = 0x00; data[1] = 0x00;
data[2] = 0x08; data[2] = 0x08;
int ans = HF14BCmdRaw(true, &crc, 2, data, datalen, false); if (HF14BCmdRaw(true, &crc, 0, data, datalen, false)==0) return 0;
if (!ans) return 0; if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
if (data[0] != 0x50 || *datalen < 14 || !crc) return 0;
PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("\n14443-3b tag found:");
print_atqb_resp(data); print_atqb_resp(data);
@ -411,46 +417,44 @@ int HF14BStdRead(uint8_t *data, uint8_t *datalen){
return 1; return 1;
} }
int HF14B_ST_Read(uint8_t *data, uint8_t *datalen){ int HF14B_ST_Read(uint8_t *data, uint8_t *datalen){
bool crc = true; bool crc = true;
*datalen = 2; *datalen = 2;
//wake cmd //wake cmd
data[0] = 0x06; data[0] = 0x06;
data[1] = 0x00; data[1] = 0x00;
//power on and reset tracing
int ans = HF14BCmdRaw(true, &crc, 3, data, datalen, true);
if (!ans) return rawClose(); //leave power on
if (*datalen < 3 || !crc) return rawClose(); // verbose on for now for testing - turn off when functional
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return rawClose();
if (*datalen != 3 || !crc) return rawClose();
uint8_t chipID = data[0]; uint8_t chipID = data[0];
// select // select
data[0] = 0x0E; data[0] = 0x0E;
data[1] = chipID; data[1] = chipID;
*datalen = 2; *datalen = 2;
msleep(100);
//power on
ans = HF14BCmdRaw(true, &crc, 1, data, datalen, true);
if (!ans) return rawClose(); //leave power on
if (*datalen < 3 || !crc) return rawClose(); // verbose on for now for testing - turn off when functional
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return rawClose();
if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();
// get uid // get uid
data[0] = 0x0B; data[0] = 0x0B;
*datalen = 1; *datalen = 1;
msleep(100);
//power off
ans = HF14BCmdRaw(true, &crc, 0, data, datalen, true);
if (!ans) return 0; //power off
if (*datalen < 10 || !crc) return 0; // verbose on for now for testing - turn off when functional
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return 0;
rawClose();
if (*datalen != 10 || !crc) return 0;
PrintAndLog("\n14443-3b ST tag found:"); PrintAndLog("\n14443-3b ST tag found:");
print_st_info(data); print_st_info(data);
return 1; return 1;
} }
int HF14BReader(bool verbose){ int HF14BReader(bool verbose){
@ -458,26 +462,33 @@ int HF14BReader(bool verbose){
uint8_t datalen = 5; uint8_t datalen = 5;
// try std 14b (atqb) // try std 14b (atqb)
int ans = HF14BStdRead(data, &datalen); if (HF14BStdRead(data, &datalen)) return 1;
if (ans) return 1;
// try st 14b // try st 14b
ans = HF14B_ST_Read(data, &datalen); if (HF14B_ST_Read(data, &datalen)) return 1;
if (ans) return 1;
if (verbose) PrintAndLog("no 14443B tag found"); if (verbose) PrintAndLog("no 14443B tag found");
return 0; return 0;
} }
int CmdHF14BReader(const char *Cmd) int CmdHF14BReader(const char *Cmd){
{
return HF14BReader(true); return HF14BReader(true);
//UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd, NULL, 0), 0, 0}}; }
//SendCommand(&c);
int CmdHFRawSamples(const char *Cmd){
UsbCommand resp;
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd,NULL,0), 0, 0}};
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
PrintAndLog("timeout while waiting for reply.");
return 0;
}
getSamples("39999", true);
return 1;
} }
int CmdHF14BWrite( const char *Cmd){ int CmdHF14BWrite( const char *Cmd){
/* /*
* For SRIX4K blocks 00 - 7F * For SRIX4K blocks 00 - 7F
* hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
@ -548,6 +559,7 @@ static command_t CommandTable[] =
{ {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"demod", CmdHF14BDemod, 1, "Demodulate ISO14443 Type B from tag"}, {"demod", CmdHF14BDemod, 1, "Demodulate ISO14443 Type B from tag"},
{"getsamples", CmdHFRawSamples,0, "[atqb=0 or ST=1] Send wake cmd and Get raw HF samples to GraphBuffer"},
{"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443b history"}, {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443b history"},
{"reader", CmdHF14BReader, 0, "Find 14b tag (HF ISO 14443b)"}, {"reader", CmdHF14BReader, 0, "Find 14b tag (HF ISO 14443b)"},
{"sim", CmdHF14Sim, 0, "Fake ISO 14443 tag"}, {"sim", CmdHF14Sim, 0, "Fake ISO 14443 tag"},