fix 'hf iclass sim':

[proxmark3-svn] / armsrc / BigBuf.c

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 4b1264b6684abc375af7c0ca51967a82fc6730ab..ce97e41f0dc4c15de703896c9424c49841cd9078 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -21,8 +21,8 @@
 /* BigBuf memory layout:
 Pointer to highest available memory: BigBuf_hi
 
 /* BigBuf memory layout:
 Pointer to highest available memory: BigBuf_hi
 

-    high BIGBUF_SIZE
-    reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,   
+       high BIGBUF_SIZE
+       reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,

        low  0x00
 */
 
        low  0x00
 */
 


@@ -36,8 +36,9 @@ static uint16_t BigBuf_hi = BIGBUF_SIZE;
 static uint8_t *emulator_memory = NULL;
 
 // trace related variables
 static uint8_t *emulator_memory = NULL;
 
 // trace related variables

-static uint16_t traceLen = 0;
-int tracing = 1; //Last global one.. todo static?
+static uint32_t traceLen = 0;
+static bool tracing = true;
+

 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void)
 
 // get the address of BigBuf
 uint8_t *BigBuf_get_addr(void)


@@ -53,7 +54,7 @@ uint8_t *BigBuf_get_EM_addr(void)
        if (emulator_memory == NULL) {
                emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
        }
        if (emulator_memory == NULL) {
                emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
        }

-       
+

        return emulator_memory;
 }
 
        return emulator_memory;
 }
 


@@ -63,31 +64,36 @@ void BigBuf_Clear(void)
 {
        BigBuf_Clear_ext(true);
 }
 {
        BigBuf_Clear_ext(true);
 }

+
+

 // clear ALL of BigBuf
 void BigBuf_Clear_ext(bool verbose)
 {
 // clear ALL of BigBuf
 void BigBuf_Clear_ext(bool verbose)
 {

-       memset(BigBuf,0,BIGBUF_SIZE);
-       if (verbose) 
-               Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);
+       memset(BigBuf, 0, BIGBUF_SIZE);
+       if (verbose)
+               Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);

 }
 }

+
+

 void BigBuf_Clear_EM(void){
        memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
 }
 
 void BigBuf_Clear_EM(void){
        memset(BigBuf_get_EM_addr(), 0, CARD_MEMORY_SIZE);
 }
 

+

 void BigBuf_Clear_keep_EM(void)
 {
 void BigBuf_Clear_keep_EM(void)
 {

-       memset(BigBuf,0,BigBuf_hi);
+       memset(BigBuf, 0, BigBuf_hi);

 }
 
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize)
 {
 }
 
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize)
 {

-       if (BigBuf_hi - chunksize < 0) { 
-               return NULL;                                                    // no memory left
+       if (BigBuf_hi - chunksize < 0) {
+               return NULL;                            // no memory left

        } else {
        } else {

-               chunksize = (chunksize + 3) & 0xfffc;   // round to next multiple of 4
-               BigBuf_hi -= chunksize;                                 // aligned to 4 Byte boundary 
+               chunksize = (chunksize + 3) & 0xfffc;   // round to next multiple of 4
+               BigBuf_hi -= chunksize;                 // aligned to 4 Byte boundary

                return (uint8_t *)BigBuf + BigBuf_hi;
        }
 }
                return (uint8_t *)BigBuf + BigBuf_hi;
        }
 }


@@ -128,18 +134,22 @@ uint16_t BigBuf_max_traceLen(void)
        return BigBuf_hi;
 }
 
        return BigBuf_hi;
 }
 

+

 void clear_trace() {
        traceLen = 0;
 }
 
 void clear_trace() {
        traceLen = 0;
 }
 

+

 void set_tracing(bool enable) {
        tracing = enable;
 }
 
 void set_tracing(bool enable) {
        tracing = enable;
 }
 

+

 bool get_tracing(void) {
        return tracing;
 }
 
 bool get_tracing(void) {
        return tracing;
 }
 

+

 /**
  * Get the number of bytes traced
  * @return
 /**
  * Get the number of bytes traced
  * @return


@@ -149,6 +159,7 @@ uint16_t BigBuf_get_traceLen(void)
        return traceLen;
 }
 
        return traceLen;
 }
 

+

 /**
   This is a function to store traces. All protocols can use this generic tracer-function.
   The traces produced by calling this function can be fetched on the client-side
 /**
   This is a function to store traces. All protocols can use this generic tracer-function.
   The traces produced by calling this function can be fetched on the client-side


@@ -162,14 +173,14 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 
        uint8_t *trace = BigBuf_get_addr();
 
 
        uint8_t *trace = BigBuf_get_addr();
 

-       uint16_t num_paritybytes = (iLen-1)/8 + 1;      // number of valid paritybytes in *parity
-       uint16_t duration = timestamp_end - timestamp_start;
+       uint32_t num_paritybytes = (iLen-1)/8 + 1;  // number of valid paritybytes in *parity
+       uint32_t duration = timestamp_end - timestamp_start;

 
        // Return when trace is full
        uint16_t max_traceLen = BigBuf_max_traceLen();
 
        if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= max_traceLen) {
 
        // Return when trace is full
        uint16_t max_traceLen = BigBuf_max_traceLen();
 
        if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= max_traceLen) {

-               tracing = false;        // don't trace any more
+               tracing = false;    // don't trace any more

                return false;
        }
        // Traceformat:
                return false;
        }
        // Traceformat:


@@ -200,19 +211,23 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 
        // data bytes
        if (btBytes != NULL && iLen != 0) {
 
        // data bytes
        if (btBytes != NULL && iLen != 0) {

-               memcpy(trace + traceLen, btBytes, iLen);
+               for (int i = 0; i < iLen; i++) {
+                       trace[traceLen++] = *btBytes++;
+               }

        }
        }

-       traceLen += iLen;

 
        // parity bytes
        if (num_paritybytes != 0) {
                if (parity != NULL) {
 
        // parity bytes
        if (num_paritybytes != 0) {
                if (parity != NULL) {

-                       memcpy(trace + traceLen, parity, num_paritybytes);
+                       for (int i = 0; i < num_paritybytes; i++) {
+                               trace[traceLen++] = *parity++;
+                       }

                } else {
                } else {

-                       memset(trace + traceLen, 0x00, num_paritybytes);
+                       for (int i = 0; i < num_paritybytes; i++) {
+                               trace[traceLen++] = 0x00;
+                       }

                }
        }
                }
        }

-       traceLen += num_paritybytes;

 
        return true;
 }
 
        return true;
 }


@@ -233,7 +248,7 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        // Return when trace is full
        if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) {
                return false;
        // Return when trace is full
        if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + iLen > BigBuf_max_traceLen()) {
                return false;

-       }       
+       }

 
        //Hitag traces appear to use this traceformat:
        // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
 
        //Hitag traces appear to use this traceformat:
        // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)


@@ -259,8 +274,9 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        trace[traceLen++] = ((dwParity >> 24) & 0xff);
        trace[traceLen++] = iBits;
 
        trace[traceLen++] = ((dwParity >> 24) & 0xff);
        trace[traceLen++] = iBits;
 

-       memcpy(trace + traceLen, btBytes, iLen);
-       traceLen += iLen;
+       for (int i = 0; i < iLen; i++) {
+               trace[traceLen++] = *btBytes++;
+       }

 
        return true;
 }
 
        return true;
 }