initialize global variables.

[proxmark3-svn] / armsrc / iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 76ad9e9a2639507bc2e5ae50740beb16ae03087e..bfbd7bf59ce1aa18defc1037127aaf2a0a16c679 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -321,16 +321,14 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
 //-----------------------------------------------------------------------------
 void SimulateIso14443bTag(void)
 {
-       // the only commands we understand is REQB, AFI=0, Select All, N=8:
-       static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // REQB
-       // ... and REQB, AFI=0, Normal Request, N=0:
+       // the only commands we understand is WUPB, AFI=0, Select All, N=1:
+       static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // WUPB
+       // ... and REQB, AFI=0, Normal Request, N=1:
        static const uint8_t cmd2[] = { 0x05, 0x00, 0x00, 0x71, 0xFF }; // REQB
-       // ... and WUPB, AFI=0, N=8:
-       static const uint8_t cmd3[] = { 0x05, 0x08, 0x08, 0xF9, 0xBD }; // WUPB
        // ... and HLTB
-       static const uint8_t cmd4[] = { 0x50, 0xff, 0xff, 0xff, 0xff }; // HLTB
+       static const uint8_t cmd3[] = { 0x50, 0xff, 0xff, 0xff, 0xff }; // HLTB
        // ... and ATTRIB
-       static const uint8_t cmd5[] = { 0x1D, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; // ATTRIB
+       static const uint8_t cmd4[] = { 0x1D, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; // ATTRIB
 
        // ... and we always respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
        // supports only 106kBit/s in both directions, max frame size = 32Bytes,
@@ -362,13 +360,13 @@ void SimulateIso14443bTag(void)
        // prepare the (only one) tag answer:
        CodeIso14443bAsTag(response1, sizeof(response1));
        uint8_t *resp1Code = BigBuf_malloc(ToSendMax);
-       memcpy(resp1Code, ToSend, ToSendMax); 
+       memcpy(resp1Code, ToSend, ToSendMax);
        uint16_t resp1CodeLen = ToSendMax;
 
        // prepare the (other) tag answer:
        CodeIso14443bAsTag(response2, sizeof(response2));
        uint8_t *resp2Code = BigBuf_malloc(ToSendMax);
-       memcpy(resp2Code, ToSend, ToSendMax); 
+       memcpy(resp2Code, ToSend, ToSendMax);
        uint16_t resp2CodeLen = ToSendMax;
 
        // We need to listen to the high-frequency, peak-detected path.
@@ -391,17 +389,16 @@ void SimulateIso14443bTag(void)
 
                // Good, look at the command now.
                if ( (len == sizeof(cmd1) && memcmp(receivedCmd, cmd1, len) == 0)
-                       || (len == sizeof(cmd2) && memcmp(receivedCmd, cmd2, len) == 0)
-                       || (len == sizeof(cmd3) && memcmp(receivedCmd, cmd3, len) == 0) ) {
-                       resp = response1; 
+                       || (len == sizeof(cmd2) && memcmp(receivedCmd, cmd2, len) == 0) ) {
+                       resp = response1;
                        respLen = sizeof(response1);
-                       respCode = resp1Code; 
+                       respCode = resp1Code;
                        respCodeLen = resp1CodeLen;
-               } else if ( (len == sizeof(cmd4) && receivedCmd[0] == cmd4[0])
-                       || (len == sizeof(cmd5) && receivedCmd[0] == cmd5[0]) ) {
-                       resp = response2; 
+               } else if ( (len == sizeof(cmd3) && receivedCmd[0] == cmd3[0])
+                       || (len == sizeof(cmd4) && receivedCmd[0] == cmd4[0]) ) {
+                       resp = response2;
                        respLen = sizeof(response2);
-                       respCode = resp2Code; 
+                       respCode = resp2Code;
                        respCodeLen = resp2CodeLen;
                } else {
                        Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsRecvd);
@@ -412,6 +409,7 @@ void SimulateIso14443bTag(void)
                                if(b1 != receivedCmd[len-2] || b2 != receivedCmd[len-1]) {
                                        // Not so good, try again.
                                        DbpString("+++CRC fail");
+               
                                } else {
                                        DbpString("CRC passes");
                                }
@@ -459,13 +457,13 @@ void SimulateIso14443bTag(void)
                                (void)b;
                        }
                }
-               
+
                // trace the response:
                if (tracing) {
                        uint8_t parity[MAX_PARITY_SIZE];
                        LogTrace(resp, respLen, 0, 0, parity, FALSE);
                }
-                       
+
        }
 }
 
@@ -543,7 +541,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int 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() { \
@@ -577,7 +575,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                        } \
                } \
        }
-       
+
        switch(Demod.state) {
                case DEMOD_UNSYNCD:
                        CHECK_FOR_SUBCARRIER();
@@ -675,7 +673,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                                        Demod.metric -= Demod.thisBit;
                                }
                                (Demod.metricN)++;
-*/                             
+*/
 
                                Demod.shiftReg >>= 1;
                                if(Demod.thisBit > 0) { // logic '1'
@@ -743,10 +741,10 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first
        BigBuf_free();
-       
+
        // The response (tag -> reader) that we're receiving.
        uint8_t *receivedResponse = 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);
 
@@ -1120,7 +1118,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) &
@@ -1240,7 +1238,7 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
                        uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
                        cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
                }
-       } 
+       }
 
        if(!powerfield) {
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);