Merge pull request #129 from VERTCraig/master

[proxmark3-svn] / armsrc / BigBuf.c

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 6e99a793fe72194db6be454eb689d655a02ec2e6..510f7befe720a3628432086273ff537a25a85d0e 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -96,9 +96,6 @@ uint16_t BigBuf_max_traceLen(void)
 }
 
 void clear_trace() {
-       uint8_t *trace = BigBuf_get_addr();
-       uint16_t max_traceLen = BigBuf_max_traceLen();
-       memset(trace, 0x44, max_traceLen);
        traceLen = 0;
 }
 
@@ -176,15 +173,16 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
        }
        traceLen += num_paritybytes;
 
-       if(traceLen +4 < max_traceLen)
-       {       //If it hadn't been cleared, for whatever reason..
-               memset(trace+traceLen,0x44, 4);
-       }
-
        return TRUE;
 }
-int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader)
+
+
+int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int readerToTag)
 {
+       /**
+         Todo, rewrite the logger to use the generic functionality instead. It should be noted, however,
+         that this logger takes number of bits as argument, not number of bytes.
+         **/
 
        if (!tracing) return FALSE;
 
@@ -196,7 +194,7 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        //Hitag traces appear to use this traceformat:
        // 32 bits timestamp (little endian,Highest Bit used as readerToTag flag)
        // 32 bits parity
-       // 8 bits size (number of bits in the trace entry)
+       // 8 bits size (number of bits in the trace entry, not number of bytes)
        // y Bytes data
 
        rsamples += iSamples;
@@ -205,7 +203,7 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
        trace[traceLen++] = ((rsamples >> 16) & 0xff);
        trace[traceLen++] = ((rsamples >> 24) & 0xff);
 
-       if (!bReader) {
+       if (!readerToTag) {
                trace[traceLen - 1] |= 0x80;
        }
 
@@ -220,3 +218,16 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
 
        return TRUE;
 }
+// Emulator memory
+uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length){
+       uint8_t* mem = BigBuf_get_EM_addr();
+       if(offset+length < CARD_MEMORY_SIZE)
+       {
+               memcpy(mem+offset, data, length);
+               return 0;
+       }else
+       {
+               Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset+length), CARD_MEMORY_SIZE);
+               return 1;
+       }
+}