CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blockn...

[proxmark3-svn] / armsrc / iso15693.c

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 5af6efb338b6744f23408f074b240e80ea02c82d..1e9a3b5bf3727b88647372e6f0aafbd048868094 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -58,15 +58,12 @@
 // *) document all the functions
 
 
 // *) document all the functions
 
 

-#include "../include/proxmark3.h"
+#include "proxmark3.h"

 #include "util.h"
 #include "apps.h"
 #include "string.h"
 #include "util.h"
 #include "apps.h"
 #include "string.h"

-#include "../common/iso15693tools.h"
-#include "../common/cmd.h"
-
-
-#define arraylen(x) (sizeof(x)/sizeof((x)[0]))
+#include "iso15693tools.h"
+#include "cmd.h"

 
 ///////////////////////////////////////////////////////////////////////
 // ISO 15693 Part 2 - Air Interface
 
 ///////////////////////////////////////////////////////////////////////
 // ISO 15693 Part 2 - Air Interface


@@ -82,7 +79,7 @@
 #define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)  Iso15693sprintUID(target,uid)
 
 #define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)  Iso15693sprintUID(target,uid)
 

-int DEBUG=0;
+int DEBUG = 0;

 
 
 // ---------------------------
 
 
 // ---------------------------


@@ -100,9 +97,8 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)
        ToSendReset();
 
        // Give it a bit of slack at the beginning
        ToSendReset();
 
        // Give it a bit of slack at the beginning

-       for(i = 0; i < 24; i++) {
+       for(i = 0; i < 24; i++)

                ToSendStuffBit(1);
                ToSendStuffBit(1);

-       }

 
        // SOF for 1of4
        ToSendStuffBit(0);
 
        // SOF for 1of4
        ToSendStuffBit(0);


@@ -167,9 +163,8 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)
        ToSendStuffBit(1);
 
        // And slack at the end, too.
        ToSendStuffBit(1);
 
        // And slack at the end, too.

-       for(i = 0; i < 24; i++) {
+       for(i = 0; i < 24; i++)

                ToSendStuffBit(1);
                ToSendStuffBit(1);

-       }

 }
 
 // encode data using "1 out of 256" sheme
 }
 
 // encode data using "1 out of 256" sheme


@@ -182,9 +177,8 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
        ToSendReset();
 
        // Give it a bit of slack at the beginning
        ToSendReset();
 
        // Give it a bit of slack at the beginning

-       for(i = 0; i < 24; i++) {
+       for(i = 0; i < 24; i++)

                ToSendStuffBit(1);
                ToSendStuffBit(1);

-       }

 
        // SOF for 1of256
        ToSendStuffBit(0);
 
        // SOF for 1of256
        ToSendStuffBit(0);


@@ -197,8 +191,8 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
        ToSendStuffBit(0);
        
        for(i = 0; i < n; i++) {
        ToSendStuffBit(0);
        
        for(i = 0; i < n; i++) {

-               for (j = 0; j<=255; j++) {
-                       if (cmd[i]==j) {
+               for (j = 0; j <= 255; j++) {
+                       if (cmd[i] == j) {

                                ToSendStuffBit(1);
                                ToSendStuffBit(0);
                        } else {
                                ToSendStuffBit(1);
                                ToSendStuffBit(0);
                        } else {


@@ -214,9 +208,8 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
        ToSendStuffBit(1);
 
        // And slack at the end, too.
        ToSendStuffBit(1);
 
        // And slack at the end, too.

-       for(i = 0; i < 24; i++) {
+       for(i = 0; i < 24; i++)

                ToSendStuffBit(1);
                ToSendStuffBit(1);

-       }

 }
 
 
 }
 
 


@@ -224,18 +217,17 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
 static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
 {
     int c;
 static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
 {
     int c;

-
-//    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+       volatile uint32_t r;

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
        if(*wait < 10) { *wait = 10; }
 
 //    for(c = 0; c < *wait;) {
 //        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 //            AT91C_BASE_SSC->SSC_THR = 0x00;          // For exact timing!
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
        if(*wait < 10) { *wait = 10; }
 
 //    for(c = 0; c < *wait;) {
 //        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 //            AT91C_BASE_SSC->SSC_THR = 0x00;          // For exact timing!

-//            c++;
+//            ++c;

 //        }
 //        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 //        }
 //        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-//            volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+//            r = AT91C_BASE_SSC->SSC_RHR;

 //            (void)r;
 //        }
 //        WDT_HIT();
 //            (void)r;
 //        }
 //        WDT_HIT();


@@ -245,13 +237,10 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
     for(;;) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
     for(;;) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];

-            c++;
-            if(c >= len) {
-                break;
-            }
+            if( ++c >= len) break;

         }
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
         }
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-            volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+            r = AT91C_BASE_SSC->SSC_RHR;

             (void)r;
         }
         WDT_HIT();
             (void)r;
         }
         WDT_HIT();


@@ -265,19 +254,17 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w
 static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
 {
     int c = 0;
 static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
 {
     int c = 0;

+       volatile uint32_t r;

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K);
        if(*wait < 10) { *wait = 10; }
 
     for(;;) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K);
        if(*wait < 10) { *wait = 10; }
 
     for(;;) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];

-            c++;
-            if(c >= len) {
-                break;
-            }
+            if( ++c >= len) break;

         }
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
         }
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-            volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+            r = AT91C_BASE_SSC->SSC_RHR;

             (void)r;
         }
         WDT_HIT();
             (void)r;
         }
         WDT_HIT();


@@ -296,21 +283,18 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int
 //             number of decoded bytes
 static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
 {
 //             number of decoded bytes
 static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
 {

-       int c = 0;
-       uint8_t *dest = (uint8_t *)BigBuf;
-       int getNext = 0;
+       uint8_t *dest = BigBuf_get_addr();

 
 

+       int c = 0, getNext = FALSE;

        int8_t prev = 0;
 
        int8_t prev = 0;
 

-// NOW READ RESPONSE

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);

-       //spindelay(60);        // greg - experiment to get rid of some of the 0 byte/failed reads
-       c = 0;
-       getNext = FALSE;
+       SpinDelay(100); // greg - experiment to get rid of some of the 0 byte/failed reads
+

        for(;;) {
        for(;;) {

-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))

                        AT91C_BASE_SSC->SSC_THR = 0x43;
                        AT91C_BASE_SSC->SSC_THR = 0x43;

-               }
+

                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        int8_t b;
                        b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        int8_t b;
                        b = (int8_t)AT91C_BASE_SSC->SSC_RHR;


@@ -319,25 +303,12 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.

+                       // iceman 2016, amplitude sqrt(abs(i) + abs(q))

                        if(getNext) {
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
-
-                               dest[c++] = (uint8_t)r;
-
-                               if(c >= 2000) {
+                               dest[c++] = (uint8_t)ABS(b) + ABS(prev);
+
+                               if(c >= 2000)

                                        break;
                                        break;

-                               }

                        } else {
                                prev = b;
                        }
                        } else {
                                prev = b;
                        }


@@ -351,46 +322,42 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
        //////////////////////////////////////////
 
        int i, j;
        //////////////////////////////////////////
 
        int i, j;

-       int max = 0, maxPos=0;
-
-       int skip = 4;
-
+       int max = 0, maxPos=0, skip = 4;
+       int k = 0; // this will be our return value
+       

        //      if(GraphTraceLen < 1000) return;        // THIS CHECKS FOR A BUFFER TO SMALL
 
        // First, correlate for SOF
        for(i = 0; i < 100; i++) {
                int corr = 0;
        //      if(GraphTraceLen < 1000) return;        // THIS CHECKS FOR A BUFFER TO SMALL
 
        // First, correlate for SOF
        for(i = 0; i < 100; i++) {
                int corr = 0;

-               for(j = 0; j < arraylen(FrameSOF); j += skip) {
-                       corr += FrameSOF[j]*dest[i+(j/skip)];
+               for(j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
+                       corr += FrameSOF[j] * dest[i+(j/skip)];

                }
                if(corr > max) {
                        max = corr;
                        maxPos = i;
                }
        }
                }
                if(corr > max) {
                        max = corr;
                        maxPos = i;
                }
        }

-       //      DbpString("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
-
-       int k = 0; // this will be our return value
+       //      DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));

 
        // greg - If correlation is less than 1 then there's little point in continuing
 
        // greg - If correlation is less than 1 then there's little point in continuing

-       if ((max/(arraylen(FrameSOF)/skip)) >= 1)
+       if ((max/(ARRAYLEN(FrameSOF)/skip)) >= 1)

        {
        {

-
-               i = maxPos + arraylen(FrameSOF)/skip;
+               i = maxPos + ARRAYLEN(FrameSOF) / skip;

        
                uint8_t outBuf[20];
                memset(outBuf, 0, sizeof(outBuf));
                uint8_t mask = 0x01;
                for(;;) {
                        int corr0 = 0, corr1 = 0, corrEOF = 0;
        
                uint8_t outBuf[20];
                memset(outBuf, 0, sizeof(outBuf));
                uint8_t mask = 0x01;
                for(;;) {
                        int corr0 = 0, corr1 = 0, corrEOF = 0;

-                       for(j = 0; j < arraylen(Logic0); j += skip) {
-                               corr0 += Logic0[j]*dest[i+(j/skip)];
+                       for(j = 0; j < ARRAYLEN(Logic0); j += skip) {
+                               corr0 += Logic0[j] * dest[i+(j/skip)];

                        }
                        }

-                       for(j = 0; j < arraylen(Logic1); j += skip) {
-                               corr1 += Logic1[j]*dest[i+(j/skip)];
+                       for(j = 0; j < ARRAYLEN(Logic1); j += skip) {
+                               corr1 += Logic1[j] * dest[i+(j/skip)];

                        }
                        }

-                       for(j = 0; j < arraylen(FrameEOF); j += skip) {
-                               corrEOF += FrameEOF[j]*dest[i+(j/skip)];
+                       for(j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
+                               corrEOF += FrameEOF[j] * dest[i+(j/skip)];

                        }
                        // Even things out by the length of the target waveform.
                        corr0 *= 4;
                        }
                        // Even things out by the length of the target waveform.
                        corr0 *= 4;


@@ -400,17 +367,17 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
        //                      DbpString("EOF at %d", i);
                                break;
                        } else if(corr1 > corr0) {
        //                      DbpString("EOF at %d", i);
                                break;
                        } else if(corr1 > corr0) {

-                               i += arraylen(Logic1)/skip;
+                               i += ARRAYLEN(Logic1)/skip;

                                outBuf[k] |= mask;
                        } else {
                                outBuf[k] |= mask;
                        } else {

-                               i += arraylen(Logic0)/skip;
+                               i += ARRAYLEN(Logic0)/skip;

                        }
                        mask <<= 1;
                        if(mask == 0) {
                                k++;
                                mask = 0x01;
                        }
                        }
                        mask <<= 1;
                        if(mask == 0) {
                                k++;
                                mask = 0x01;
                        }

-                       if((i+(int)arraylen(FrameEOF)) >= 2000) {
+                       if( ( i + (int)ARRAYLEN(FrameEOF)) >= 2000) {

                                DbpString("ran off end!");
                                break;
                        }
                                DbpString("ran off end!");
                                break;
                        }


@@ -418,7 +385,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                if(mask != 0x01) { // this happens, when we miss the EOF
                        // TODO: for some reason this happens quite often
                        if (DEBUG) Dbprintf("error, uneven octet! (extra bits!) mask=%02x", mask);
                if(mask != 0x01) { // this happens, when we miss the EOF
                        // TODO: for some reason this happens quite often
                        if (DEBUG) Dbprintf("error, uneven octet! (extra bits!) mask=%02x", mask);

-                       if (mask<0x08) k--; // discard the last uneven octet;
+                       if (mask < 0x08) k--; // discard the last uneven octet;

                        // 0x08 is an assumption - but works quite often
                }
        //      uint8_t str1 [8];
                        // 0x08 is an assumption - but works quite often
                }
        //      uint8_t str1 [8];


@@ -435,32 +402,26 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                for(i = 0; i < k; i++) {
                        receivedResponse[i] = outBuf[i];
                }
                for(i = 0; i < k; i++) {
                        receivedResponse[i] = outBuf[i];
                }

-       } // "end if correlation > 0"   (max/(arraylen(FrameSOF)/skip))
+       } // "end if correlation > 0"   (max/(ARRAYLEN(FrameSOF)/skip))

        return k; // return the number of bytes demodulated
        return k; // return the number of bytes demodulated

-
-///    DbpString("CRC=%04x", Iso15693Crc(outBuf, k-2));
-

 }
 
 
 // Now the GetISO15693 message from sniffing command
 static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
 {
 }
 
 
 // Now the GetISO15693 message from sniffing command
 static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
 {

-       int c = 0;
-       uint8_t *dest = (uint8_t *)BigBuf;
-       int getNext = 0;
+       uint8_t *dest = BigBuf_get_addr();

 
 

+       int c = 0, getNext = FALSE;

        int8_t prev = 0;
 
        int8_t prev = 0;
 

-    // NOW READ RESPONSE

        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);

-       //spindelay(60);        // greg - experiment to get rid of some of the 0 byte/failed reads
-       c = 0;
-       getNext = FALSE;
+       SpinDelay(100); // greg - experiment to get rid of some of the 0 byte/failed reads
+

        for(;;) {
        for(;;) {

-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))

                        AT91C_BASE_SSC->SSC_THR = 0x43;
                        AT91C_BASE_SSC->SSC_THR = 0x43;

-               }
+

                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        int8_t b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
 
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        int8_t b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
 


@@ -468,29 +429,14 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.

-                       if (getNext) {
-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
-
-                               dest[c++] = (uint8_t)r;
-
-                               if(c >= 20000) {
+                       if(getNext) {
+                               dest[c++] = (uint8_t)ABS(b) + ABS(prev);
+
+                               if(c >= 20000)

                                        break;
                                        break;

-                               }

                        } else {
                                prev = b;
                        }
                        } else {
                                prev = b;
                        }

-

                        getNext = !getNext;
                }
        }
                        getNext = !getNext;
                }
        }


@@ -499,17 +445,12 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
        /////////// DEMODULATE ///////////////////
        //////////////////////////////////////////
 
        /////////// DEMODULATE ///////////////////
        //////////////////////////////////////////
 

-       int i, j;
-       int max = 0, maxPos=0;
-
-       int skip = 4;
-
-//     if(GraphTraceLen < 1000) return;        // THIS CHECKS FOR A BUFFER TO SMALL
+       int i, j, max = 0, maxPos=0, skip = 4;

 
        // First, correlate for SOF
        for(i = 0; i < 19000; i++) {
                int corr = 0;
 
        // First, correlate for SOF
        for(i = 0; i < 19000; i++) {
                int corr = 0;

-               for(j = 0; j < arraylen(FrameSOF); j += skip) {
+               for(j = 0; j < ARRAYLEN(FrameSOF); j += skip) {

                        corr += FrameSOF[j]*dest[i+(j/skip)];
                }
                if(corr > max) {
                        corr += FrameSOF[j]*dest[i+(j/skip)];
                }
                if(corr > max) {


@@ -517,28 +458,28 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
                        maxPos = i;
                }
        }
                        maxPos = i;
                }
        }

-//     DbpString("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
+//     DbpString("SOF at %d, correlation %d", maxPos,max/(ARRAYLEN(FrameSOF)/skip));

 
        int k = 0; // this will be our return value
 
        // greg - If correlation is less than 1 then there's little point in continuing
 
        int k = 0; // this will be our return value
 
        // greg - If correlation is less than 1 then there's little point in continuing

-       if ((max/(arraylen(FrameSOF)/skip)) >= 1)       // THIS SHOULD BE 1
+       if ((max/(ARRAYLEN(FrameSOF)/skip)) >= 1)       // THIS SHOULD BE 1

        {
        
        {
        

-               i = maxPos + arraylen(FrameSOF)/skip;
+               i = maxPos + ARRAYLEN(FrameSOF)/skip;

        
                uint8_t outBuf[20];
                memset(outBuf, 0, sizeof(outBuf));
                uint8_t mask = 0x01;
                for(;;) {
                        int corr0 = 0, corr1 = 0, corrEOF = 0;
        
                uint8_t outBuf[20];
                memset(outBuf, 0, sizeof(outBuf));
                uint8_t mask = 0x01;
                for(;;) {
                        int corr0 = 0, corr1 = 0, corrEOF = 0;

-                       for(j = 0; j < arraylen(Logic0); j += skip) {
+                       for(j = 0; j < ARRAYLEN(Logic0); j += skip) {

                                corr0 += Logic0[j]*dest[i+(j/skip)];
                        }
                                corr0 += Logic0[j]*dest[i+(j/skip)];
                        }

-                       for(j = 0; j < arraylen(Logic1); j += skip) {
+                       for(j = 0; j < ARRAYLEN(Logic1); j += skip) {

                                corr1 += Logic1[j]*dest[i+(j/skip)];
                        }
                                corr1 += Logic1[j]*dest[i+(j/skip)];
                        }

-                       for(j = 0; j < arraylen(FrameEOF); j += skip) {
+                       for(j = 0; j < ARRAYLEN(FrameEOF); j += skip) {

                                corrEOF += FrameEOF[j]*dest[i+(j/skip)];
                        }
                        // Even things out by the length of the target waveform.
                                corrEOF += FrameEOF[j]*dest[i+(j/skip)];
                        }
                        // Even things out by the length of the target waveform.


@@ -549,24 +490,24 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
        //                      DbpString("EOF at %d", i);
                                break;
                        } else if(corr1 > corr0) {
        //                      DbpString("EOF at %d", i);
                                break;
                        } else if(corr1 > corr0) {

-                               i += arraylen(Logic1)/skip;
+                               i += ARRAYLEN(Logic1)/skip;

                                outBuf[k] |= mask;
                        } else {
                                outBuf[k] |= mask;
                        } else {

-                               i += arraylen(Logic0)/skip;
+                               i += ARRAYLEN(Logic0)/skip;

                        }
                        mask <<= 1;
                        if(mask == 0) {
                                k++;
                                mask = 0x01;
                        }
                        }
                        mask <<= 1;
                        if(mask == 0) {
                                k++;
                                mask = 0x01;
                        }

-                       if((i+(int)arraylen(FrameEOF)) >= 2000) {
+                       if((i+(int)ARRAYLEN(FrameEOF)) >= 2000) {

                                DbpString("ran off end!");
                                break;
                        }
                }
                if(mask != 0x01) {
                        DbpString("sniff: error, uneven octet! (discard extra bits!)");
                                DbpString("ran off end!");
                                break;
                        }
                }
                if(mask != 0x01) {
                        DbpString("sniff: error, uneven octet! (discard extra bits!)");

-       ///             DbpString("   mask=%02x", mask);
+       //              DbpString("   mask=%02x", mask);

                }
        //      uint8_t str1 [8];
        //      itoa(k,str1);
                }
        //      uint8_t str1 [8];
        //      itoa(k,str1);


@@ -582,10 +523,8 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
                for(i = 0; i < k; i++) {
                        receivedResponse[i] = outBuf[i];
                }
                for(i = 0; i < k; i++) {
                        receivedResponse[i] = outBuf[i];
                }

-       } // "end if correlation > 0"   (max/(arraylen(FrameSOF)/skip))
+       } // "end if correlation > 0"   (max/(ARRAYLEN(FrameSOF)/skip))

        return k; // return the number of bytes demodulated
        return k; // return the number of bytes demodulated

-
-///    DbpString("CRC=%04x", Iso15693Crc(outBuf, k-2));

 }
 
 
 }
 
 


@@ -597,13 +536,13 @@ static void BuildIdentifyRequest(void);
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {

-       uint8_t *dest = (uint8_t *)BigBuf;
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

 
 

-       int c = 0;
-       int getNext = 0;
+       int c = 0, getNext = FALSE;

        int8_t prev = 0;
        int8_t prev = 0;

+       volatile uint32_t r;

 
 

-       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       uint8_t *dest = BigBuf_get_addr();

        BuildIdentifyRequest();
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        BuildIdentifyRequest();
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);


@@ -620,13 +559,10 @@ void AcquireRawAdcSamplesIso15693(void)
        for(;;) {
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
                        AT91C_BASE_SSC->SSC_THR = ToSend[c];
        for(;;) {
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
                        AT91C_BASE_SSC->SSC_THR = ToSend[c];

-                       c++;
-                       if(c == ToSendMax+3) {
-                               break;
-                       }
+                       if( ++c == ToSendMax+3) break;

                }
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                }
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-                       volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+                       r = AT91C_BASE_SSC->SSC_RHR;

                        (void)r;
                }
                WDT_HIT();
                        (void)r;
                }
                WDT_HIT();


@@ -635,42 +571,27 @@ void AcquireRawAdcSamplesIso15693(void)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
        c = 0;
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
        c = 0;

-       getNext = FALSE;

        for(;;) {
        for(;;) {

-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))

                        AT91C_BASE_SSC->SSC_THR = 0x43;
                        AT91C_BASE_SSC->SSC_THR = 0x43;

-               }
+               

                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {

-                       int8_t b;
-                       b = (int8_t)AT91C_BASE_SSC->SSC_RHR;
+
+                       int8_t b = (int8_t)AT91C_BASE_SSC->SSC_RHR;

 
                        // The samples are correlations against I and Q versions of the
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
 
                        // The samples are correlations against I and Q versions of the
                        // tone that the tag AM-modulates, so every other sample is I,
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
-
-                               dest[c++] = (uint8_t)r;
-
-                               if(c >= 2000) {
-                                       break;
-                               }
+                               
+                               dest[c++] = (uint8_t)(ABS(b) + ABS(prev));
+
+                               if(c >= 2000) break;
+                               

                        } else {
                                prev = b;
                        }
                        } else {
                                prev = b;
                        }

-

                        getNext = !getNext;
                }
        }
                        getNext = !getNext;
                }
        }


@@ -679,10 +600,9 @@ void AcquireRawAdcSamplesIso15693(void)
 
 void RecordRawAdcSamplesIso15693(void)
 {
 
 void RecordRawAdcSamplesIso15693(void)
 {

-       uint8_t *dest =  (uint8_t *)BigBuf;
+       uint8_t *dest = BigBuf_get_addr();

 
 

-       int c = 0;
-       int getNext = 0;
+       int c = 0, getNext = FALSE;

        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -690,17 +610,14 @@ void RecordRawAdcSamplesIso15693(void)
        FpgaSetupSsc();
 
        // Start from off (no field generated)
        FpgaSetupSsc();
 
        // Start from off (no field generated)

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       SpinDelay(200);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelay(200);

 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

-

        SpinDelay(100);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
        SpinDelay(100);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 

-       c = 0;
-       getNext = FALSE;

        for(;;) {
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
                        AT91C_BASE_SSC->SSC_THR = 0x43;
        for(;;) {
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
                        AT91C_BASE_SSC->SSC_THR = 0x43;


@@ -714,24 +631,10 @@ void RecordRawAdcSamplesIso15693(void)
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {

-                               int8_t r;
-
-                               if(b < 0) {
-                                       r = -b;
-                               } else {
-                                       r = b;
-                               }
-                               if(prev < 0) {
-                                       r -= prev;
-                               } else {
-                                       r += prev;
-                               }
-
-                               dest[c++] = (uint8_t)r;
-
-                               if(c >= 7000) {
+                               dest[c++] = (uint8_t) ABS(b) + ABS(prev);
+
+                               if(c >= 7000)

                                        break;
                                        break;

-                               }

                        } else {
                                prev = b;
                        }
                        } else {
                                prev = b;
                        }


@@ -782,8 +685,7 @@ void Iso15693InitReader() {
 // thing that you must send to a tag to get a response.
 static void BuildIdentifyRequest(void)
 {
 // thing that you must send to a tag to get a response.
 static void BuildIdentifyRequest(void)
 {

-       uint8_t cmd[5];
-
+       uint8_t cmd[5] = {0,1,0,0,0};

        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate
        // AFI is at bit 5 (1<<4) when doing an INVENTORY
        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate
        // AFI is at bit 5 (1<<4) when doing an INVENTORY


@@ -803,8 +705,7 @@ static void BuildIdentifyRequest(void)
 // uid is in transmission order (which is reverse of display order)
 static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 {
 // uid is in transmission order (which is reverse of display order)
 static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 {

-       uint8_t cmd[13];
-
+       uint8_t cmd[13] = {0,0,0,0,0,0,0,0,0,0,0,0,0};

        uint16_t crc;
        // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
        // followed by teh block data
        uint16_t crc;
        // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
        // followed by teh block data


@@ -835,8 +736,7 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 // Now the VICC>VCD responses when we are simulating a tag
  static void BuildInventoryResponse( uint8_t *uid)
 {
 // Now the VICC>VCD responses when we are simulating a tag
  static void BuildInventoryResponse( uint8_t *uid)
 {

-       uint8_t cmd[12];
-
+       uint8_t cmd[12] = {0,0,0,0,0,0,0,0,0,0,0,0};

        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate
        // AFI is at bit 5 (1<<4) when doing an INVENTORY
        uint16_t crc;
        // one sub-carrier, inventory, 1 slot, fast rate
        // AFI is at bit 5 (1<<4) when doing an INVENTORY


@@ -868,22 +768,20 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 //     return: lenght of received data
 int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv) {
 
 //     return: lenght of received data
 int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv) {
 

-       int samples = 0;
-       int tsamples = 0;
-       int wait = 0;
-       int elapsed = 0;
+       int samples = 0, tsamples = 0;
+       int wait = 0, elapsed = 0;
+       int answerLen = 0;

        
        

-       LED_A_ON();
-       LED_B_ON();
-       LED_C_OFF();
-       LED_D_OFF();
+       LED_A_ON(); LED_B_ON();

        
        

-       int answerLen=0;
-       uint8_t *answer = (((uint8_t *)BigBuf) + 3660);
-       if (recv!=NULL) memset(BigBuf + 3660, 0, 100);
-
-       if (init) Iso15693InitReader();
+       LED_C_OFF(); LED_D_OFF();

        
        

+       if (init) Iso15693InitReader();
+
+       // answer is 100bytes long?
+       uint8_t *answer = BigBuf_malloc(100);
+       if (recv != NULL) memset(answer, 0, 100);
+

        if (!speed) {
                // low speed (1 out of 256)
                CodeIso15693AsReader256(send, sendlen);
        if (!speed) {
                // low speed (1 out of 256)
                CodeIso15693AsReader256(send, sendlen);


@@ -895,20 +793,16 @@ int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv)
        LED_A_ON();
        LED_B_OFF();
        
        LED_A_ON();
        LED_B_OFF();
        

-       TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);  
+       TransmitTo15693Tag(ToSend, ToSendMax, &tsamples, &wait);        

        // Now wait for a response
        if (recv!=NULL) {
                LED_A_OFF();
                LED_B_ON();
                answerLen = GetIso15693AnswerFromTag(answer, 100, &samples, &elapsed) ; 
        // Now wait for a response
        if (recv!=NULL) {
                LED_A_OFF();
                LED_B_ON();
                answerLen = GetIso15693AnswerFromTag(answer, 100, &samples, &elapsed) ; 

-               *recv=answer;
+               *recv = answer;

        }
 
        }
 

-       LED_A_OFF();
-       LED_B_OFF();
-       LED_C_OFF();
-       LED_D_OFF();
-       
+       LEDsoff();

        return answerLen;
 }
 
        return answerLen;
 }
 


@@ -920,90 +814,82 @@ int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv)
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
 void DbdecodeIso15693Answer(int len, uint8_t *d) {
 // Decodes a message from a tag and displays its metadata and content
 #define DBD15STATLEN 48
 void DbdecodeIso15693Answer(int len, uint8_t *d) {

-       char status[DBD15STATLEN+1]={0};
+       char status[DBD15STATLEN+1] = {0};

        uint16_t crc;
 
        uint16_t crc;
 

-       if (len>3) {
-               if (d[0]&(1<<3)) 
-                       strncat(status,"ProtExt ",DBD15STATLEN);
-               if (d[0]&1) { 
+       if (len > 3) {
+               if (d[0] & ( 1 << 3 )) 
+                       strncat(status, "ProtExt ", DBD15STATLEN);
+               if (d[0] & 1) { 

                        // error
                        // error

-                       strncat(status,"Error ",DBD15STATLEN);
+                       strncat(status, "Error ", DBD15STATLEN);

                        switch (d[1]) {
                                case 0x01: 
                        switch (d[1]) {
                                case 0x01: 

-                                       strncat(status,"01:notSupp",DBD15STATLEN);
+                                       strncat(status, "01:notSupp", DBD15STATLEN);

                                        break;
                                case 0x02: 
                                        break;
                                case 0x02: 

-                                       strncat(status,"02:notRecog",DBD15STATLEN);
+                                       strncat(status, "02:notRecog", DBD15STATLEN);

                                        break;
                                case 0x03: 
                                        break;
                                case 0x03: 

-                                       strncat(status,"03:optNotSupp",DBD15STATLEN);
+                                       strncat(status, "03:optNotSupp", DBD15STATLEN);

                                        break;
                                case 0x0f: 
                                        break;
                                case 0x0f: 

-                                       strncat(status,"0f:noInfo",DBD15STATLEN);
+                                       strncat(status, "0f:noInfo", DBD15STATLEN);

                                        break;
                                case 0x10: 
                                        break;
                                case 0x10: 

-                                       strncat(status,"10:dontExist",DBD15STATLEN);
+                                       strncat(status, "10:dontExist", DBD15STATLEN);

                                        break;
                                case 0x11: 
                                        break;
                                case 0x11: 

-                                       strncat(status,"11:lockAgain",DBD15STATLEN);
+                                       strncat(status, "11:lockAgain", DBD15STATLEN);

                                        break;
                                case 0x12: 
                                        break;
                                case 0x12: 

-                                       strncat(status,"12:locked",DBD15STATLEN);
+                                       strncat(status, "12:locked", DBD15STATLEN);

                                        break;
                                case 0x13: 
                                        break;
                                case 0x13: 

-                                       strncat(status,"13:progErr",DBD15STATLEN);
+                                       strncat(status, "13:progErr", DBD15STATLEN);

                                        break;
                                case 0x14: 
                                        break;
                                case 0x14: 

-                                       strncat(status,"14:lockErr",DBD15STATLEN);
+                                       strncat(status, "14:lockErr", DBD15STATLEN);

                                        break;
                                default:
                                        break;
                                default:

-                                       strncat(status,"unknownErr",DBD15STATLEN);
+                                       strncat(status, "unknownErr", DBD15STATLEN);

                        }
                        }

-                       strncat(status," ",DBD15STATLEN);
+                       strncat(status ," " ,DBD15STATLEN);

                } else {
                } else {

-                       strncat(status,"NoErr ",DBD15STATLEN);
+                       strncat(status ,"NoErr ", DBD15STATLEN);

                }
                        
                }
                        

-               crc=Crc(d,len-2);
+               crc = Crc(d,len-2);

                if ( (( crc & 0xff ) == d[len-2]) && (( crc >> 8 ) == d[len-1]) ) 
                if ( (( crc & 0xff ) == d[len-2]) && (( crc >> 8 ) == d[len-1]) ) 

-                       strncat(status,"CrcOK",DBD15STATLEN);
+                       strncat(status, "CrcOK", DBD15STATLEN);

                else
                else

-                       strncat(status,"CrcFail!",DBD15STATLEN); 
+                       strncat(status, "CrcFail!", DBD15STATLEN); 

 
 

-               Dbprintf("%s",status);
+               Dbprintf("%s", status);

        }
 }
 
        }
 }
 

-
-

 ///////////////////////////////////////////////////////////////////////
 // Functions called via USB/Client
 ///////////////////////////////////////////////////////////////////////
 
 void SetDebugIso15693(uint32_t debug) {
 ///////////////////////////////////////////////////////////////////////
 // Functions called via USB/Client
 ///////////////////////////////////////////////////////////////////////
 
 void SetDebugIso15693(uint32_t debug) {

-       DEBUG=debug;
-       Dbprintf("Iso15693 Debug is now %s",DEBUG?"on":"off");
+       DEBUG = debug;
+       Dbprintf("Iso15693 Debug is now %s", DEBUG ? "on" : "off");

        return;
 }
 
        return;
 }
 

-
-

 //-----------------------------------------------------------------------------
 // Simulate an ISO15693 reader, perform anti-collision and then attempt to read a sector
 // all demodulation performed in arm rather than host. - greg
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Simulate an ISO15693 reader, perform anti-collision and then attempt to read a sector
 // all demodulation performed in arm rather than host. - greg
 //-----------------------------------------------------------------------------

-void ReaderIso15693(uint32_t parameter )
+void ReaderIso15693(uint32_t parameter)

 {
        LED_A_ON();
        LED_B_ON();
        LED_C_OFF();
        LED_D_OFF();
 
 {
        LED_A_ON();
        LED_B_ON();
        LED_C_OFF();
        LED_D_OFF();
 

-       uint8_t *answer1 = (((uint8_t *)BigBuf) + 3660); //
-       uint8_t *answer2 = (((uint8_t *)BigBuf) + 3760);
-       uint8_t *answer3 = (((uint8_t *)BigBuf) + 3860);
-

        int answerLen1 = 0;
        int answerLen2 = 0;
        int answerLen3 = 0;
        int answerLen1 = 0;
        int answerLen2 = 0;
        int answerLen3 = 0;


@@ -1014,20 +900,24 @@ void ReaderIso15693(uint32_t parameter )
        int elapsed = 0;
        uint8_t TagUID[8] = {0x00};
 
        int elapsed = 0;
        uint8_t TagUID[8] = {0x00};
 

-        
-       // Blank arrays
-       memset(BigBuf + 3660, 0x00, 300);
-

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 

+       uint8_t *answer1 = BigBuf_malloc(100);
+       uint8_t *answer2 = BigBuf_malloc(100);
+       uint8_t *answer3 = BigBuf_malloc(100);
+       // Blank arrays
+       memset(answer1, 0x00, 100);
+       memset(answer2, 0x00, 100);
+       memset(answer3, 0x00, 100);
+

        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        // Setup SSC
        FpgaSetupSsc();
 
        // Start from off (no field generated)
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        // Setup SSC
        FpgaSetupSsc();
 
        // Start from off (no field generated)

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       SpinDelay(200);
-       
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelay(200);
+

        // Give the tags time to energize
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(200);
        // Give the tags time to energize
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(200);


@@ -1048,7 +938,7 @@ void ReaderIso15693(uint32_t parameter )
        // Now wait for a response
        answerLen1 = GetIso15693AnswerFromTag(answer1, 100, &samples, &elapsed) ;
 
        // Now wait for a response
        answerLen1 = GetIso15693AnswerFromTag(answer1, 100, &samples, &elapsed) ;
 

-       if (answerLen1 >=12) // we should do a better check than this
+       if (answerLen1 >= 12) // we should do a better check than this

        {
                TagUID[0] = answer1[2];
                TagUID[1] = answer1[3];
        {
                TagUID[0] = answer1[2];
                TagUID[1] = answer1[3];


@@ -1062,38 +952,38 @@ void ReaderIso15693(uint32_t parameter )
        }
 
        Dbprintf("%d octets read from IDENTIFY request:", answerLen1);
        }
 
        Dbprintf("%d octets read from IDENTIFY request:", answerLen1);

-       DbdecodeIso15693Answer(answerLen1,answer1);
-       Dbhexdump(answerLen1,answer1,true);
+       DbdecodeIso15693Answer(answerLen1, answer1);
+       Dbhexdump(answerLen1, answer1, true);

 
        // UID is reverse
 
        // UID is reverse

-       if (answerLen1 >= 12) 
+       if (answerLen1>=12) 

                Dbprintf("UID = %02hX%02hX%02hX%02hX%02hX%02hX%02hX%02hX",
                        TagUID[7],TagUID[6],TagUID[5],TagUID[4],
                        TagUID[3],TagUID[2],TagUID[1],TagUID[0]);
 
 
        Dbprintf("%d octets read from SELECT request:", answerLen2);
                Dbprintf("UID = %02hX%02hX%02hX%02hX%02hX%02hX%02hX%02hX",
                        TagUID[7],TagUID[6],TagUID[5],TagUID[4],
                        TagUID[3],TagUID[2],TagUID[1],TagUID[0]);
 
 
        Dbprintf("%d octets read from SELECT request:", answerLen2);

-       DbdecodeIso15693Answer(answerLen2,answer2);
-       Dbhexdump(answerLen2,answer2,true);
+       DbdecodeIso15693Answer(answerLen2, answer2);
+       Dbhexdump(answerLen2, answer2, true);

 
        Dbprintf("%d octets read from XXX request:", answerLen3);
        DbdecodeIso15693Answer(answerLen3,answer3);
 
        Dbprintf("%d octets read from XXX request:", answerLen3);
        DbdecodeIso15693Answer(answerLen3,answer3);

-       Dbhexdump(answerLen3,answer3,true);
+       Dbhexdump(answerLen3, answer3, true);

 
 

-       // read all pages
+       // read all pages

        if (answerLen1 >= 12 && DEBUG) {
        if (answerLen1 >= 12 && DEBUG) {

-               i=0;                    
-               while (i < 32) {  // sanity check, assume max 32 pages
+               i = 0;                  
+               while ( i < 32 ) {  // sanity check, assume max 32 pages

                        BuildReadBlockRequest(TagUID,i);
                        TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);  
                        answerLen2 = GetIso15693AnswerFromTag(answer2, 100, &samples, &elapsed);
                        BuildReadBlockRequest(TagUID,i);
                        TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);  
                        answerLen2 = GetIso15693AnswerFromTag(answer2, 100, &samples, &elapsed);

-                       if (answerLen2 > 0) {
-                               Dbprintf("READ SINGLE BLOCK %d returned %d octets:",i,answerLen2);
-                               DbdecodeIso15693Answer(answerLen2,answer2);
-                               Dbhexdump(answerLen2,answer2,true);
+                       if (answerLen2>0) {
+                               Dbprintf("READ SINGLE BLOCK %d returned %d octets:", i, answerLen2);
+                               DbdecodeIso15693Answer(answerLen2, answer2);
+                               Dbhexdump(answerLen2, answer2, true);

                                if ( *((uint32_t*) answer2) == 0x07160101 ) break; // exit on NoPageErr 
                        } 
                                if ( *((uint32_t*) answer2) == 0x07160101 ) break; // exit on NoPageErr 
                        } 

-                       i++;
+                       ++i;

                } 
        }
 
                } 
        }
 


@@ -1112,25 +1002,23 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
        LED_C_OFF();
        LED_D_OFF();
 
        LED_C_OFF();
        LED_D_OFF();
 

-       uint8_t *buf = (((uint8_t *)BigBuf) + 3660); //
-       

        int answerLen1 = 0;
        int samples = 0;
        int tsamples = 0;
        int wait = 0;
        int elapsed = 0;
        int answerLen1 = 0;
        int samples = 0;
        int tsamples = 0;
        int wait = 0;
        int elapsed = 0;

-       
-       memset(buf, 0x00, 100);
-       
+

        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 

-       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+       uint8_t *buf = BigBuf_malloc(100);
+       memset(buf, 0x00, 100);

 
 

+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);

        FpgaSetupSsc();
 
        // Start from off (no field generated)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        FpgaSetupSsc();
 
        // Start from off (no field generated)
     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

-    SpinDelay(200);
+       SpinDelay(200);

 
        LED_A_OFF();
        LED_B_OFF();
 
        LED_A_OFF();
        LED_B_OFF();


@@ -1147,7 +1035,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
                
                BuildInventoryResponse(uid);
        
                
                BuildInventoryResponse(uid);
        

-               TransmitTo15693Reader(ToSend, ToSendMax, &tsamples, &wait);
+               TransmitTo15693Reader(ToSend,ToSendMax, &tsamples, &wait);

        }
 
        Dbprintf("%d octets read from reader command: %x %x %x %x %x %x %x %x %x", answerLen1,
        }
 
        Dbprintf("%d octets read from reader command: %x %x %x %x %x %x %x %x %x", answerLen1,


@@ -1170,63 +1058,63 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 void BruteforceIso15693Afi(uint32_t speed) 
 {      
        uint8_t data[20];
 void BruteforceIso15693Afi(uint32_t speed) 
 {      
        uint8_t data[20];

-       uint8_t *recv=data;
-       int datalen=0, recvlen=0;
-               
+       uint8_t *recv = data;
+       int datalen = 0, recvlen = 0;
+
+       memset(data, 0, sizeof(data));
+       

        Iso15693InitReader();
        
        // first without AFI
        // Tags should respond wihtout AFI and with AFI=0 even when AFI is active
        
        Iso15693InitReader();
        
        // first without AFI
        // Tags should respond wihtout AFI and with AFI=0 even when AFI is active
        

-       data[0]=ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-               ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-       data[1]=ISO15_CMD_INVENTORY;
-       data[2]=0; // mask length
-       datalen=AddCrc(data,3);
-       recvlen=SendDataTag(data,datalen,0,speed,&recv);
+       data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
+                 ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+       data[1] = ISO15_CMD_INVENTORY;
+       data[2] = 0; // mask length
+       datalen = AddCrc(data, 3);
+       recvlen = SendDataTag(data, datalen, 0, speed, &recv);

        WDT_HIT();
        WDT_HIT();

-       if (recvlen>=12) {
-               Dbprintf("NoAFI UID=%s",sprintUID(NULL,&recv[2]));
+       if (recvlen >= 12) {
+               Dbprintf("NoAFI UID=%s", sprintUID(NULL, &recv[2]));

        }
        
        // now with AFI
        
        }
        
        // now with AFI
        

-       data[0]=ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-               ISO15_REQ_INVENTORY | ISO15_REQINV_AFI | ISO15_REQINV_SLOT1;
-       data[1]=ISO15_CMD_INVENTORY;
-       data[2]=0; // AFI
-       data[3]=0; // mask length
+       data[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
+                 ISO15_REQ_INVENTORY | ISO15_REQINV_AFI | ISO15_REQINV_SLOT1;
+       data[1] = ISO15_CMD_INVENTORY;
+       data[2] = 0; // AFI
+       data[3] = 0; // mask length

        
        

-       for (int i=0;i<256;i++) {
-               data[2]=i & 0xFF;
-               datalen=AddCrc(data,4);
-               recvlen=SendDataTag(data,datalen,0,speed,&recv);
+       for (int i = 0; i < 256; i++) {
+               data[2] = i & 0xFF; // iceman 2016,  is & 0xFF needed?
+               datalen = AddCrc(data, 4);
+               recvlen = SendDataTag(data, datalen, 0, speed, &recv);

                WDT_HIT();
                WDT_HIT();

-               if (recvlen>=12) {
-                       Dbprintf("AFI=%i UID=%s",i,sprintUID(NULL,&recv[2]));
+               if (recvlen >= 12) {
+                       Dbprintf("AFI=%i UID=%s", i, sprintUID(NULL, &recv[2]));

                }
        }       
        Dbprintf("AFI Bruteforcing done.");
                }
        }       
        Dbprintf("AFI Bruteforcing done.");

-       

 }
 
 // Allows to directly send commands to the tag via the client
 void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]) {
 
 }
 
 // Allows to directly send commands to the tag via the client
 void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]) {
 

-       int recvlen=0;
-       uint8_t *recvbuf=(uint8_t *)BigBuf;
-//     UsbCommand n;
+       int recvlen = 0;
+       uint8_t *recvbuf = BigBuf_get_addr();

        
        if (DEBUG) {
                Dbprintf("SEND");
                Dbhexdump(datalen,data,true);
        }
        
        
        if (DEBUG) {
                Dbprintf("SEND");
                Dbhexdump(datalen,data,true);
        }
        

-       recvlen=SendDataTag(data,datalen,1,speed,(recv?&recvbuf:NULL));
+       recvlen = SendDataTag(data, datalen, 1, speed, (recv ? &recvbuf : NULL));

 
        if (recv) { 
                LED_B_ON();
 
        if (recv) { 
                LED_B_ON();

-    cmd_send(CMD_ACK,recvlen>48?48:recvlen,0,0,recvbuf,48);
+               cmd_send(CMD_ACK,recvlen>48?48:recvlen,0,0,recvbuf,48);

                LED_B_OFF();    
                
                if (DEBUG) {
                LED_B_OFF();    
                
                if (DEBUG) {


@@ -1235,156 +1123,4 @@ void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8
                        Dbhexdump(recvlen,recvbuf,true);
                }
        }
                        Dbhexdump(recvlen,recvbuf,true);
                }
        }

-
-}
-
-
-
-
-// --------------------------------------------------------------------
-// -- Misc & deprecated functions
-// --------------------------------------------------------------------
-
-/*
-
-// do not use; has a fix UID
-static void __attribute__((unused)) BuildSysInfoRequest(uint8_t *uid)
-{
-       uint8_t cmd[12];
-
-       uint16_t crc;
-       // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
-       // followed by teh block data
-       // one sub-carrier, inventory, 1 slot, fast rate
-       cmd[0] =  (1 << 5) | (1 << 1); // no SELECT bit
-       // System Information command code
-       cmd[1] = 0x2B;
-       // UID may be optionally specified here
-       // 64-bit UID
-       cmd[2] = 0x32;
-       cmd[3]= 0x4b;
-       cmd[4] = 0x03;
-       cmd[5] = 0x01;
-       cmd[6] = 0x00;
-       cmd[7] = 0x10;
-       cmd[8] = 0x05;
-       cmd[9]= 0xe0; // always e0 (not exactly unique)
-       //Now the CRC
-       crc = Crc(cmd, 10); // the crc needs to be calculated over 2 bytes
-       cmd[10] = crc & 0xff;
-       cmd[11] = crc >> 8;
-
-       CodeIso15693AsReader(cmd, sizeof(cmd));
-}
-
-
-// do not use; has a fix UID
-static void __attribute__((unused)) BuildReadMultiBlockRequest(uint8_t *uid)
-{
-       uint8_t cmd[14];
-
-       uint16_t crc;
-       // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
-       // followed by teh block data
-       // one sub-carrier, inventory, 1 slot, fast rate
-       cmd[0] =  (1 << 5) | (1 << 1); // no SELECT bit
-       // READ Multi BLOCK command code
-       cmd[1] = 0x23;
-       // UID may be optionally specified here
-       // 64-bit UID
-       cmd[2] = 0x32;
-       cmd[3]= 0x4b;
-       cmd[4] = 0x03;
-       cmd[5] = 0x01;
-       cmd[6] = 0x00;
-       cmd[7] = 0x10;
-       cmd[8] = 0x05;
-       cmd[9]= 0xe0; // always e0 (not exactly unique)
-       // First Block number to read
-       cmd[10] = 0x00;
-       // Number of Blocks to read
-       cmd[11] = 0x2f; // read quite a few
-       //Now the CRC
-       crc = Crc(cmd, 12); // the crc needs to be calculated over 2 bytes
-       cmd[12] = crc & 0xff;
-       cmd[13] = crc >> 8;
-
-       CodeIso15693AsReader(cmd, sizeof(cmd));
-}
-
-// do not use; has a fix UID
-static void __attribute__((unused)) BuildArbitraryRequest(uint8_t *uid,uint8_t CmdCode)
-{
-       uint8_t cmd[14];
-
-       uint16_t crc;
-       // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
-       // followed by teh block data
-       // one sub-carrier, inventory, 1 slot, fast rate
-       cmd[0] =   (1 << 5) | (1 << 1); // no SELECT bit
-       // READ BLOCK command code
-       cmd[1] = CmdCode;
-       // UID may be optionally specified here
-       // 64-bit UID
-       cmd[2] = 0x32;
-       cmd[3]= 0x4b;
-       cmd[4] = 0x03;
-       cmd[5] = 0x01;
-       cmd[6] = 0x00;
-       cmd[7] = 0x10;
-       cmd[8] = 0x05;
-       cmd[9]= 0xe0; // always e0 (not exactly unique)
-       // Parameter
-       cmd[10] = 0x00;
-       cmd[11] = 0x0a;
-
-//     cmd[12] = 0x00;
-//     cmd[13] = 0x00; //Now the CRC
-       crc = Crc(cmd, 12); // the crc needs to be calculated over 2 bytes
-       cmd[12] = crc & 0xff;
-       cmd[13] = crc >> 8;
-
-       CodeIso15693AsReader(cmd, sizeof(cmd));
-}
-
-// do not use; has a fix UID
-static void __attribute__((unused)) BuildArbitraryCustomRequest(uint8_t uid[], uint8_t CmdCode)
-{
-       uint8_t cmd[14];
-
-       uint16_t crc;
-       // If we set the Option_Flag in this request, the VICC will respond with the secuirty status of the block
-       // followed by teh block data
-       // one sub-carrier, inventory, 1 slot, fast rate
-       cmd[0] =   (1 << 5) | (1 << 1); // no SELECT bit
-       // READ BLOCK command code
-       cmd[1] = CmdCode;
-       // UID may be optionally specified here
-       // 64-bit UID
-       cmd[2] = 0x32;
-       cmd[3]= 0x4b;
-       cmd[4] = 0x03;
-       cmd[5] = 0x01;
-       cmd[6] = 0x00;
-       cmd[7] = 0x10;
-       cmd[8] = 0x05;
-       cmd[9]= 0xe0; // always e0 (not exactly unique)
-       // Parameter
-       cmd[10] = 0x05; // for custom codes this must be manufcturer code
-       cmd[11] = 0x00;
-
-//     cmd[12] = 0x00;
-//     cmd[13] = 0x00; //Now the CRC
-       crc = Crc(cmd, 12); // the crc needs to be calculated over 2 bytes
-       cmd[12] = crc & 0xff;
-       cmd[13] = crc >> 8;
-
-       CodeIso15693AsReader(cmd, sizeof(cmd));
-}
-
-
-
-
-*/
-
-
+}
\ No newline at end of file