X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aabb719dc4e9af383e20c79647612755957bca00..6255c8b107cdce88f4863a6133aea293d917f993:/armsrc/BigBuf.c?ds=sidebyside

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 18db66f3..703ade65 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -183,29 +183,57 @@ 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)
 {
-	static uint16_t traceLen = 0;
-	uint8_t *trace = BigBuf_get_addr();
+	/**
+	  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;
 
+	uint8_t *trace = BigBuf_get_addr();
+	uint16_t iLen = nbytes(iBits);
 	// Return when trace is full
-	if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + nbytes(iBits) > BigBuf_max_traceLen()) return FALSE;
+	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)
+	// 32 bits parity
+	// 8 bits size (number of bits in the trace entry, not number of bytes)
+	// y Bytes data
 
-	// Trace the random, i'm curious
 	rsamples += iSamples;
 	trace[traceLen++] = ((rsamples >> 0) & 0xff);
 	trace[traceLen++] = ((rsamples >> 8) & 0xff);
 	trace[traceLen++] = ((rsamples >> 16) & 0xff);
 	trace[traceLen++] = ((rsamples >> 24) & 0xff);
-	if (!bReader) {
-	trace[traceLen - 1] |= 0x80;
+
+	if (!readerToTag) {
+		trace[traceLen - 1] |= 0x80;
 	}
+
 	trace[traceLen++] = ((dwParity >> 0) & 0xff);
 	trace[traceLen++] = ((dwParity >> 8) & 0xff);
 	trace[traceLen++] = ((dwParity >> 16) & 0xff);
 	trace[traceLen++] = ((dwParity >> 24) & 0xff);
 	trace[traceLen++] = iBits;
-	memcpy(trace + traceLen, btBytes, nbytes(iBits));
-	traceLen += nbytes(iBits);
+
+	memcpy(trace + traceLen, btBytes, iLen);
+	traceLen += iLen;
+
 	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;
+	}
+}