X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/665775c844a3f8f1efe055cd25462b3cd7a7441a..79d7bcbb51db25dab899b3b250f48a0ab40e30e9:/armsrc/BigBuf.c

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 6e99a793..703ade65 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -183,8 +183,12 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 
 	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 +200,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 +209,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 +224,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;
+	}
+}