Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-27 09:05:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113 from pwpiwi/iso14443b_fix

Browse source 
Fix issue #103 (hopefully). Quite an old bug which was previously
This commit is contained in:
pwpiwi 2015-06-01 20:02:40 +02:00
commit 01d5b635cf
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
armsrc/iso14443.c
View file

@ -24,6 +24,9 @@
#define TAG_READER_BUFFER_SIZE 2048 #define TAG_READER_BUFFER_SIZE 2048
#define DEMOD_DMA_BUFFER_SIZE 1024 #define DEMOD_DMA_BUFFER_SIZE 1024
*/ */
#define RECEIVE_SAMPLES_TIMEOUT 2000
//============================================================================= //=============================================================================
// 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
// a UART kind of thing that's implemented in software. When we get a // a UART kind of thing that's implemented in software. When we get a
@ -658,9 +661,6 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
// free all previous allocations first // free all previous allocations first
BigBuf_free(); BigBuf_free();
// The command (reader -> tag) that we're receiving.
uint8_t *receivedCmd = BigBuf_malloc(MAX_FRAME_SIZE);
// The response (tag -> reader) that we're receiving. // The response (tag -> reader) that we're receiving.
uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE); uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE);
@ -669,8 +669,6 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
// Set up the demodulator for tag -> reader responses. // Set up the demodulator for tag -> reader responses.
DemodInit(receivedResponse); DemodInit(receivedResponse);
// Set up the demodulator for the reader -> tag commands
UartInit(receivedCmd);
// Setup and start DMA. // Setup and start DMA.
FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE); FpgaSetupSscDma(dmaBuf, DMA_BUFFER_SIZE);
@ -695,8 +693,8 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
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 + DMA_BUFFER_SIZE) {
upTo -= DMA_BUFFER_SIZE; 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 = DMA_BUFFER_SIZE;
} }
@ -707,15 +705,12 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
samples += 2; samples += 2;
Handle14443UartBit(1);
Handle14443UartBit(1);
if(Handle14443SamplesDemod(ci, cq)) { if(Handle14443SamplesDemod(ci, cq)) {
gotFrame = 1; gotFrame = 1;
} }
} }
if(samples > 2000) { if(samples > n) {
break; break;
} }
} }
@ -724,8 +719,8 @@ static void GetSamplesFor14443Demod(int weTx, int n, int quiet)
//Tracing //Tracing
if (tracing && Demod.len > 0) { if (tracing && Demod.len > 0) {
uint8_t parity[MAX_PARITY_SIZE]; uint8_t parity[MAX_PARITY_SIZE];
GetParity(Demod.output , Demod.len, parity); GetParity(Demod.output, Demod.len, parity);
LogTrace(Demod.output,Demod.len, 0, 0, parity, FALSE); LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
} }
} }
@ -934,7 +929,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, 2000,TRUE); GetSamplesFor14443Demod(TRUE, RECEIVE_SAMPLES_TIMEOUT, TRUE);
// LED_A_OFF(); // LED_A_OFF();
if (Demod.len == 0) { if (Demod.len == 0) {
@ -952,7 +947,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, 2000,TRUE); GetSamplesFor14443Demod(TRUE, 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);
@ -976,7 +971,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, 2000,TRUE); GetSamplesFor14443Demod(TRUE, 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);
@ -1008,7 +1003,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
// LED_A_ON(); // LED_A_ON();
GetSamplesFor14443Demod(TRUE, 2000,TRUE); GetSamplesFor14443Demod(TRUE, 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...");
@ -1118,10 +1113,10 @@ void RAMFUNC SnoopIso14443(void)
cq = upTo[1]; cq = upTo[1];
upTo += 2; upTo += 2;
lastRxCounter -= 2; lastRxCounter -= 2;
if(upTo - dmaBuf > DMA_BUFFER_SIZE) { if(upTo >= dmaBuf + DMA_BUFFER_SIZE) {
upTo -= DMA_BUFFER_SIZE; upTo = dmaBuf;
lastRxCounter += DMA_BUFFER_SIZE; lastRxCounter += DMA_BUFFER_SIZE;
AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) upTo; AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;
AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE; AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE;
} }
@ -1237,8 +1232,8 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv,uint8_t powerfield, ui
if(recv) if(recv)
{ {
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);
GetSamplesFor14443Demod(TRUE, 2000, TRUE);
cmd_send(CMD_ACK,iLen,0,0,Demod.output,iLen); cmd_send(CMD_ACK,iLen,0,0,Demod.output,iLen);
} }
if(!powerfield) if(!powerfield)