FIX: strange bug in "lf em em410xwatch" , which the client crasches when it reads...

[proxmark3-svn] / armsrc / iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index bfcf83c6a2d85c9bbeeb197880902c991e11be50..ed035d3a5e29d780a248da43ea2ca14dbee41e69 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -40,7 +40,7 @@
 //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
  // iceman, this threshold value,  what makes 8 a good amplituted for this IQ values? 
 #ifndef SUBCARRIER_DETECT_THRESHOLD
 //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
  // iceman, this threshold value,  what makes 8 a good amplituted for this IQ values? 
 #ifndef SUBCARRIER_DETECT_THRESHOLD

-# define SUBCARRIER_DETECT_THRESHOLD   6
+# define SUBCARRIER_DETECT_THRESHOLD   8

 #endif
 
 static void iso14b_set_timeout(uint32_t timeout);
 #endif
 
 static void iso14b_set_timeout(uint32_t timeout);


@@ -216,16 +216,19 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
        *  -TO VERIFY THIS BELOW-
        * The mode FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK which we use to simulate tag
        * works like this:  
        *  -TO VERIFY THIS BELOW-
        * The mode FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_BPSK which we use to simulate tag
        * works like this:  

-       * - A 1-bit input to the FPGA becomes 8 pulses at 847.5kHz (9.44µS)
-       * - A 0-bit input to the FPGA becomes an unmodulated time of 9.44µS
-       *
+       * - A 1-bit input to the FPGA becomes 8 pulses at 847.5kHz (1.18µS / pulse) == 9.44us
+       * - A 0-bit input to the FPGA becomes an unmodulated time of 1.18µS  or does it become 8 nonpulses for 9.44us

        *
        *

+       * FPGA doesn't seem to work with ETU.  It seems to work with pulse / duration instead.

        * 
        * Card sends data ub 847.e kHz subcarrier
        * 
        * Card sends data ub 847.e kHz subcarrier

-       * 848k = 9.44µS  = 128 fc
-       * 424k = 18.88µS = 256 fc
-       * 212k = 37.76µS = 512 fc
-       * 106k = 75.52µS = 1024 fc
+       * subcar |duration| FC division
+       * -------+--------+------------
+       * 106kHz | 9.44µS | FC/128
+       * 212kHz | 4.72µS | FC/64
+       * 424kHz | 2.36µS | FC/32
+       * 848kHz | 1.18µS | FC/16
+       * -------+--------+------------

        *
        *  Reader data transmission:
        *   - no modulation ONES
        *
        *  Reader data transmission:
        *   - no modulation ONES


@@ -237,7 +240,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
        *  Card data transmission
        *   - TR1
        *   - SOF
        *  Card data transmission
        *   - TR1
        *   - SOF

-       *   - data  (each bytes is:  1startbit,8bits, 1stopbit)
+       *   - data  (each bytes is:  1startbit, 8bits, 1stopbit)

        *   - CRC_B
        *   - EOF
        *
        *   - CRC_B
        *   - EOF
        *


@@ -280,13 +283,14 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
                // Data bits
                b = cmd[i];
                for(j = 0; j < 8; ++j) {
                // Data bits
                b = cmd[i];
                for(j = 0; j < 8; ++j) {

-                       if(b & 1) { 
-                               SEND4STUFFBIT(1); 
-                               //ToSendStuffBit(1);
-                       } else {
-                               SEND4STUFFBIT(0);
-                               //ToSendStuffBit(0);
-                       }
+                       // if(b & 1) { 
+                               // SEND4STUFFBIT(1); 
+                               // //ToSendStuffBit(1);
+                       // } else {
+                               // SEND4STUFFBIT(0);
+                               // //ToSendStuffBit(0);
+                       // }
+                       SEND4STUFFBIT( b & 1 );

                        b >>= 1;
                }
 
                        b >>= 1;
                }
 


@@ -452,7 +456,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
                
        StartCountSspClk();
        
                
        StartCountSspClk();
        

-       volatile uint8_t b;
+       volatile uint8_t b = 0;

 
        // clear receiving shift register and holding register
        // What does this loop do? Is it TR1?
 
        // clear receiving shift register and holding register
        // What does this loop do? Is it TR1?


@@ -466,7 +470,6 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
        // Now run a `software UART' on the stream of incoming samples.
        UartInit(received);
 
        // Now run a `software UART' on the stream of incoming samples.
        UartInit(received);
 

-       b = 0;

        uint8_t mask;
        while( !BUTTON_PRESS() ) {
                WDT_HIT();
        uint8_t mask;
        while( !BUTTON_PRESS() ) {
                WDT_HIT();


@@ -489,15 +492,14 @@ void ClearFpgaShiftingRegisters(void){
        volatile uint8_t b;
 
        // clear receiving shift register and holding register
        volatile uint8_t b;
 
        // clear receiving shift register and holding register

-       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};

 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 

-       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};

 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;

-       
-               
+                       

        // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
        for (uint8_t j = 0; j < 5; j++) {       // allow timeout - better late than never
                while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
        // wait for the FPGA to signal fdt_indicator == 1 (the FPGA is ready to queue new data in its delay line)
        for (uint8_t j = 0; j < 5; j++) {       // allow timeout - better late than never
                while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));


@@ -802,10 +804,9 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                case DEMOD_UNSYNCD:
 
                        CHECK_FOR_SUBCARRIER();
                case DEMOD_UNSYNCD:
 
                        CHECK_FOR_SUBCARRIER();

-                       if (MF_DBGLEVEL >= 3) { Dbprintf("Demod.state = %d", v); }

                
                        // subcarrier detected
                
                        // subcarrier detected

-                       if(v > SUBCARRIER_DETECT_THRESHOLD) {
+                       if (v > SUBCARRIER_DETECT_THRESHOLD) {

                                Demod.state = DEMOD_PHASE_REF_TRAINING;
                                Demod.sumI = ci;
                                Demod.sumQ = cq;
                                Demod.state = DEMOD_PHASE_REF_TRAINING;
                                Demod.sumI = ci;
                                Demod.sumQ = cq;


@@ -814,7 +815,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                        break;
 
                case DEMOD_PHASE_REF_TRAINING:
                        break;
 
                case DEMOD_PHASE_REF_TRAINING:

-                       if(Demod.posCount < 8) {
+                       if (Demod.posCount < 8) {

 
                                CHECK_FOR_SUBCARRIER();
                                
 
                                CHECK_FOR_SUBCARRIER();
                                


@@ -837,7 +838,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                        
                        MAKE_SOFT_DECISION();
                        
                        
                        MAKE_SOFT_DECISION();
                        

-                       if(v < 0) {     // logic '0' detected
+                       if (v < 0) {    // logic '0' detected

                                Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
                                Demod.posCount = 0;     // start of SOF sequence
                        } else {
                                Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
                                Demod.posCount = 0;     // start of SOF sequence
                        } else {


@@ -852,13 +853,13 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                        
                        MAKE_SOFT_DECISION();
                        
                        
                        MAKE_SOFT_DECISION();
                        

-                       if(v > 0) {
+                       if (v > 0) {

                                // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
                                // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges

-                               if(Demod.posCount < 8*2) { 
+                               if (Demod.posCount < 8*2) { 

                                        Demod.state = DEMOD_UNSYNCD;
                                } else {
                                        LED_C_ON(); // Got SOF
                                        Demod.state = DEMOD_UNSYNCD;
                                } else {
                                        LED_C_ON(); // Got SOF

-                                       Demod.startTime = GetCountSspClk();
+                                       //Demod.startTime = GetCountSspClk();

                                        Demod.state = DEMOD_AWAITING_START_BIT;
                                        Demod.posCount = 0;
                                        Demod.len = 0;
                                        Demod.state = DEMOD_AWAITING_START_BIT;
                                        Demod.posCount = 0;
                                        Demod.len = 0;


@@ -904,7 +905,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                                Demod.thisBit += v;
                                Demod.shiftReg >>= 1;
 
                                Demod.thisBit += v;
                                Demod.shiftReg >>= 1;
 

-                               // logic '1'
+                               // OR in a logic '1'

                                if (Demod.thisBit > 0)  Demod.shiftReg |= 0x200;
 
                                ++Demod.bitCount;
                                if (Demod.thisBit > 0)  Demod.shiftReg |= 0x200;
 
                                ++Demod.bitCount;


@@ -923,7 +924,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
                                        } else {
                                                // this one is a bit hard,  either its a correc byte or its unsynced.
                                                Demod.state = DEMOD_UNSYNCD;
                                        } else {
                                                // this one is a bit hard,  either its a correc byte or its unsynced.
                                                Demod.state = DEMOD_UNSYNCD;

-                                               Demod.endTime = GetCountSspClk();
+                                               //Demod.endTime = GetCountSspClk();

                                                LED_C_OFF();
                                                
                                                // This is EOF (start, stop and all data bits == '0'
                                                LED_C_OFF();
                                                
                                                // This is EOF (start, stop and all data bits == '0'


@@ -1018,7 +1019,7 @@ static void GetTagSamplesFor14443bDemod() {
                Dbhexdump(ISO14443B_DMA_BUFFER_SIZE, (uint8_t *)dmaBuf, FALSE); 
        
        if ( Demod.len > 0 )
                Dbhexdump(ISO14443B_DMA_BUFFER_SIZE, (uint8_t *)dmaBuf, FALSE); 
        
        if ( Demod.len > 0 )

-               LogTrace(Demod.output, Demod.len, Demod.startTime, Demod.endTime, NULL, FALSE);
+               LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, FALSE);

 }
 
 
 }
 
 


@@ -1075,8 +1076,7 @@ static void TransmitFor14443b_AsReader(void) {
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitFor14443b().
 //-----------------------------------------------------------------------------
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // 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) {

        /*
        *  Reader data transmission:
        *   - no modulation ONES
        /*
        *  Reader data transmission:
        *   - no modulation ONES


@@ -1112,14 +1112,24 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
                ToSendStuffBit(0);
                // Data bits
                b = cmd[i];             
                ToSendStuffBit(0);
                // Data bits
                b = cmd[i];             

-               if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
-               if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);             
+               // if (  b & 1 )    ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
+               // if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);  
+
+               ToSendStuffBit(  b & 1); 
+               ToSendStuffBit( (b>>1) & 1);            
+               ToSendStuffBit( (b>>2) & 1); 
+               ToSendStuffBit( (b>>3) & 1); 
+               ToSendStuffBit( (b>>4) & 1); 
+               ToSendStuffBit( (b>>5) & 1); 
+               ToSendStuffBit( (b>>6) & 1);            
+               ToSendStuffBit( (b>>7) & 1); 
+               

                // Stop bit
                ToSendStuffBit(1);
                // EGT extra guard time
                // Stop bit
                ToSendStuffBit(1);
                // EGT extra guard time


@@ -1145,19 +1155,19 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
 }
 
 
 }
 
 

-/**
-  Convenience function to encode, transmit and trace iso 14443b comms
-  **/
+/*
+*  Convenience function to encode, transmit and trace iso 14443b comms
+*/

 static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
 static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {

+
+       uint32_t time_start = GetCountSspClk();

        
        CodeIso14443bAsReader(cmd, len);
        
        CodeIso14443bAsReader(cmd, len);

-       
-       uint32_t time_start = GetCountSspClk();

 
        TransmitFor14443b_AsReader();
 
        TransmitFor14443b_AsReader();

-       
+

        if(trigger) LED_A_ON();
        if(trigger) LED_A_ON();

-       
+

        LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, TRUE);
 }
 
        LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, TRUE);
 }
 


@@ -1630,11 +1640,11 @@ void RAMFUNC SnoopIso14443b(void) {
                                if (triggered)
                                        LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, TRUE);
 
                                if (triggered)
                                        LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, 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();

                        } else {
                                time_start = GetCountSspClk() - time_0;
                        }
                        } else {
                                time_start = GetCountSspClk() - time_0;
                        }