CHG: Added support for tnp3xx in lua scripts.

[proxmark3-svn] / armsrc / iso14443.c

diff --git a/armsrc/iso14443.c b/armsrc/iso14443.c
index ca06fc813cc067f68d7abfc7f6dc9d1eb80eca39..e9483189d3c92fe4a293439d21d314a15fbc4774 100644 (file)
--- a/armsrc/iso14443.c
+++ b/armsrc/iso14443.c
@@ -269,7 +269,8 @@ static int Handle14443UartBit(int bit)
             break;
     }
 
             break;
     }
 

-    if (Uart.state == STATE_ERROR_WAIT) LED_A_OFF(); // Error
+    // This row make the error blew circular buffer in hf 14b snoop
+    //if (Uart.state == STATE_ERROR_WAIT) LED_A_OFF(); // Error

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -292,8 +293,7 @@ static int GetIso14443CommandFromReader(uint8_t *received, int *len, int maxLen)
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
     LED_D_OFF();
     // only, since we are receiving, not transmitting).
     // Signal field is off with the appropriate LED
     LED_D_OFF();

-    FpgaWriteConfWord(
-       FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);

 
 
     // Now run a `software UART' on the stream of incoming samples.
 
 
     // Now run a `software UART' on the stream of incoming samples.


@@ -349,6 +349,7 @@ void SimulateIso14443Tag(void)
 
     int cmdsRecvd = 0;
 
 
     int cmdsRecvd = 0;
 

+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

     memset(receivedCmd, 0x44, 400);
 
     CodeIso14443bAsTag(response1, sizeof(response1));
     memset(receivedCmd, 0x44, 400);
 
     CodeIso14443bAsTag(response1, sizeof(response1));


@@ -399,8 +400,7 @@ void SimulateIso14443Tag(void)
         // Modulate BPSK
         // Signal field is off with the appropriate LED
         LED_D_OFF();
         // Modulate BPSK
         // Signal field is off with the appropriate LED
         LED_D_OFF();

-        FpgaWriteConfWord(
-               FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK);
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK);

         AT91C_BASE_SSC->SSC_THR = 0xff;
         FpgaSetupSsc();
 
         AT91C_BASE_SSC->SSC_THR = 0xff;
         FpgaSetupSsc();
 


@@ -866,6 +866,7 @@ void ReadSTMemoryIso14443(uint32_t dwLast)
 {
     uint8_t i = 0x00;
 
 {
     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();
     // 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();


@@ -1010,6 +1011,7 @@ void RAMFUNC SnoopIso14443(void)
     // response from the tag.
     int triggered = TRUE;
 
     // response from the tag.
     int triggered = TRUE;
 

+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

     // The command (reader -> tag) that we're working on receiving.
     uint8_t *receivedCmd = (uint8_t *)(BigBuf) + DEMOD_TRACE_SIZE;
     // The response (tag -> reader) that we're working on receiving.
     // The command (reader -> tag) that we're working on receiving.
     uint8_t *receivedCmd = (uint8_t *)(BigBuf) + DEMOD_TRACE_SIZE;
     // The response (tag -> reader) that we're working on receiving.


@@ -1195,6 +1197,7 @@ done:
 
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv,uint8_t powerfield, uint8_t data[])
 {
 
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv,uint8_t powerfield, uint8_t data[])
 {

+    FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

     if(!powerfield)
     {
         // Make sure that we start from off, since the tags are stateful;
     if(!powerfield)
     {
         // Make sure that we start from off, since the tags are stateful;