X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/705bfa1058837ae60f014458b0a01e88cdf5839d..6de14cec0e6914b3c881884d3582a32a551439b1:/armsrc/iso14443b.c diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c index 416c31f9..ee7f18f2 100644 --- a/armsrc/iso14443b.c +++ b/armsrc/iso14443b.c @@ -240,7 +240,7 @@ static RAMFUNC int Handle14443bUartBit(uint8_t bit) LED_A_OFF(); // Finished receiving Uart.state = STATE_UNSYNCD; if (Uart.byteCnt != 0) { - return TRUE; + return TRUE; } } else { // this is an error @@ -334,6 +334,10 @@ void SimulateIso14443bTag(void) 0x00, 0x21, 0x85, 0x5e, 0xd7 }; + uint8_t parity[MAX_PARITY_SIZE]; + + FpgaDownloadAndGo(FPGA_BITSTREAM_HF); + clear_trace(); set_tracing(TRUE); @@ -348,8 +352,6 @@ void SimulateIso14443bTag(void) uint16_t len; uint16_t cmdsRecvd = 0; - FpgaDownloadAndGo(FPGA_BITSTREAM_HF); - // prepare the (only one) tag answer: CodeIso14443bAsTag(response1, sizeof(response1)); uint8_t *resp1Code = BigBuf_malloc(ToSendMax); @@ -365,12 +367,11 @@ void SimulateIso14443bTag(void) for(;;) { if(!GetIso14443bCommandFromReader(receivedCmd, &len)) { - Dbprintf("button pressed, received %d commands", cmdsRecvd); - break; + Dbprintf("button pressed, received %d commands", cmdsRecvd); + break; } if (tracing) { - uint8_t parity[MAX_PARITY_SIZE]; LogTrace(receivedCmd, len, 0, 0, parity, TRUE); } @@ -411,32 +412,41 @@ void SimulateIso14443bTag(void) AT91C_BASE_SSC->SSC_THR = 0xff; FpgaSetupSsc(); + uint8_t c; + // clear receiving shift register and holding register + while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)); + c = AT91C_BASE_SSC->SSC_RHR; (void) c; + while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)); + c = AT91C_BASE_SSC->SSC_RHR; (void) c; + + // Clear TXRDY: + AT91C_BASE_SSC->SSC_THR = 0x00; + // Transmit the response. + uint16_t FpgaSendQueueDelay = 0; uint16_t i = 0; - for(;;) { + for(;i < respCodeLen; ) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { - uint8_t b = respCode[i]; - - AT91C_BASE_SSC->SSC_THR = b; - - i++; - if(i > respCodeLen) { - break; - } + AT91C_BASE_SSC->SSC_THR = respCode[i++]; + FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR; } - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { - volatile uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; - (void)b; + if(BUTTON_PRESS()) break; + } + + // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again: + uint8_t fpga_queued_bits = FpgaSendQueueDelay >> 3; + for (i = 0; i <= fpga_queued_bits/8 + 1; ) { + if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + AT91C_BASE_SSC->SSC_THR = 0x00; + FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR; + i++; } } // trace the response: - if (tracing) { - uint8_t parity[MAX_PARITY_SIZE]; - LogTrace(resp, respLen, 0, 0, parity, FALSE); - } - + if (tracing) LogTrace(resp, respLen, 0, 0, parity, FALSE); } + //FpgaDisableSscDma(); } //============================================================================= @@ -556,7 +566,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq) Demod.sumI = ci; Demod.sumQ = cq; Demod.posCount = 1; - } + } break; case DEMOD_PHASE_REF_TRAINING: @@ -565,14 +575,14 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq) 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.sumQ += cq; + Demod.sumI += ci; + Demod.sumQ += cq; Demod.posCount++; } else { // subcarrier lost - Demod.state = DEMOD_UNSYNCD; + Demod.state = DEMOD_UNSYNCD; } } else { - Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF; + Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF; } break; @@ -665,7 +675,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq) LED_C_OFF(); if(s == 0x000) { // This is EOF (start, stop and all data bits == '0' - return TRUE; + return TRUE; } } } @@ -715,13 +725,13 @@ static void GetSamplesFor14443bDemod(int n, bool quiet) BigBuf_free(); // The response (tag -> reader) that we're receiving. - uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE); + uint8_t *resp = BigBuf_malloc(MAX_FRAME_SIZE); // The DMA buffer, used to stream samples from the FPGA int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE); // Set up the demodulator for tag -> reader responses. - DemodInit(receivedResponse); + DemodInit(resp); // Setup and start DMA. FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE); @@ -733,6 +743,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet) LED_D_ON(); // And put the FPGA in the appropriate mode FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ); + SpinDelayUs(151); // T0 time between reader send, tag answer. 151us. for(;;) { int behindBy = lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR; @@ -757,8 +768,8 @@ static void GetSamplesFor14443bDemod(int n, bool quiet) if(Handle14443bSamplesDemod(ci, cq)) { gotFrame = TRUE; break; - } } + } if(samples > n || gotFrame) { break; @@ -908,12 +919,14 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) //----------------------------------------------------------------------------- void ReadSTMemoryIso14443b(uint32_t dwLast) { + FpgaDownloadAndGo(FPGA_BITSTREAM_HF); + BigBuf_free(); + clear_trace(); set_tracing(TRUE); uint8_t i = 0x00; - FpgaDownloadAndGo(FPGA_BITSTREAM_HF); // Make sure that we start from off, since the tags are stateful; // confusing things will happen if we don't reset them between reads. LED_D_OFF(); @@ -980,7 +993,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast) if(cmd1[2] != Demod.output[8] || cmd1[3] != Demod.output[9]) { Dbprintf("CRC Error reading block! Expected: %04x got: %04x", (cmd1[2]<<8)+cmd1[3], (Demod.output[8]<<8)+Demod.output[9]); - // Do not return;, let's go on... (we should retry, maybe ?) + // Do not return;, let's go on... (we should retry, maybe ?) } Dbprintf("Tag UID (64 bits): %08x %08x", (Demod.output[7]<<24) + (Demod.output[6]<<16) + (Demod.output[5]<<8) + Demod.output[4], @@ -992,7 +1005,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast) i = 0x00; dwLast++; for (;;) { - if (i == dwLast) { + if (i == dwLast) { DbpString("System area block (0xff):"); i = 0xff; } @@ -1001,15 +1014,15 @@ void ReadSTMemoryIso14443b(uint32_t dwLast) CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1)); GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE); if (Demod.len != 6) { // Check if we got an answer from the tag - DbpString("Expected 6 bytes from tag, got less..."); - return; + DbpString("Expected 6 bytes from tag, got less..."); + return; } // The check the CRC of the answer (use cmd1 as temporary variable): ComputeCrc14443(CRC_14443_B, Demod.output, 4, &cmd1[2], &cmd1[3]); - if(cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) { + if(cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) { Dbprintf("CRC Error reading block! Expected: %04x got: %04x", (cmd1[2]<<8)+cmd1[3], (Demod.output[4]<<8)+Demod.output[5]); - // Do not return;, let's go on... (we should retry, maybe ?) + // Do not return;, let's go on... (we should retry, maybe ?) } // Now print out the memory location: Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i, @@ -1090,7 +1103,7 @@ void RAMFUNC SnoopIso14443b(void) bool TagIsActive = FALSE; bool ReaderIsActive = FALSE; - + // And now we loop, receiving samples. for(;;) { int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & @@ -1129,42 +1142,42 @@ void RAMFUNC SnoopIso14443b(void) if (!TagIsActive) { // no need to try decoding reader data if the tag is sending if(Handle14443bUartBit(ci & 0x01)) { - if(triggered && tracing) { + if(triggered && tracing) { LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE); - } - /* And ready to receive another command. */ - UartReset(); - /* And also reset the demod code, which might have been */ - /* false-triggered by the commands from the reader. */ - DemodReset(); } + /* And ready to receive another command. */ + UartReset(); + /* And also reset the demod code, which might have been */ + /* false-triggered by the commands from the reader. */ + DemodReset(); + } if(Handle14443bUartBit(cq & 0x01)) { - if(triggered && tracing) { + if(triggered && tracing) { LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE); - } - /* And ready to receive another command. */ - UartReset(); - /* And also reset the demod code, which might have been */ - /* false-triggered by the commands from the reader. */ - DemodReset(); } + /* And ready to receive another command. */ + UartReset(); + /* And also reset the demod code, which might have been */ + /* false-triggered by the commands from the reader. */ + DemodReset(); + } ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF); } if(!ReaderIsActive) { // no need to try decoding tag data if the reader is sending - and we cannot afford the time if(Handle14443bSamplesDemod(ci | 0x01, cq | 0x01)) { - //Use samples as a time measurement - if(tracing) - { - uint8_t parity[MAX_PARITY_SIZE]; - LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE); - } - triggered = TRUE; - - // And ready to receive another response. - DemodReset(); + //Use samples as a time measurement + if(tracing) + { + //uint8_t parity[MAX_PARITY_SIZE]; + LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE); } + triggered = TRUE; + + // And ready to receive another response. + DemodReset(); + } TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF); } @@ -1197,12 +1210,16 @@ void RAMFUNC SnoopIso14443b(void) void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[]) { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); + BigBuf_free(); SetAdcMuxFor(GPIO_MUXSEL_HIPKD); FpgaSetupSsc(); - set_tracing(TRUE); - - CodeAndTransmit14443bAsReader(data, datalen); + if ( datalen == 0 && recv == 0 && powerfield == 0){ + clear_trace(); + } else { + set_tracing(TRUE); + CodeAndTransmit14443bAsReader(data, datalen); + } if(recv) { GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE); @@ -1214,5 +1231,7 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LED_D_OFF(); } + + FpgaDisableSscDma(); }