From: Martin Holst Swende <martin@swende.se>
Date: Sat, 7 Feb 2015 19:55:17 +0000 (+0100)
Subject: Moved LogTraceHitag to BigBuf (no changes to the function ... yet)
X-Git-Tag: v2.0.0-rc1~23^2~3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/aabb719dc4e9af383e20c79647612755957bca00?ds=sidebyside;hp=--cc

Moved LogTraceHitag to BigBuf (no changes to the function ... yet)
---

aabb719dc4e9af383e20c79647612755957bca00
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 1b5e5482..18db66f3 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -183,3 +183,29 @@ 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)
+{
+	static uint16_t traceLen = 0;
+	uint8_t *trace = BigBuf_get_addr();
+
+	// Return when trace is full
+	if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + nbytes(iBits) > BigBuf_max_traceLen()) return FALSE;
+
+	// 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;
+	}
+	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);
+	return TRUE;
+}
diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 5cca1000..be558979 100644
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -33,5 +33,5 @@ uint16_t BigBuf_get_traceLen(void);
 void clear_trace();
 void set_tracing(bool enable);
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
-
+int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
 #endif /* __BIGBUF_H */
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
index 7ca79930..4b173d6f 100644
--- a/armsrc/hitag2.c
+++ b/armsrc/hitag2.c
@@ -21,6 +21,7 @@
 #include "util.h"
 #include "hitag2.h"
 #include "string.h"
+#include "BigBuf.h"
 
 static bool bQuiet;
 
@@ -30,32 +31,6 @@ static bool bPwd;
 static bool bSuccessful;
 
 
-static int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader)
-{
-  static uint16_t traceLen = 0;
-  uint8_t *trace = BigBuf_get_addr();
-
-  // Return when trace is full
-  if (traceLen + sizeof(rsamples) + sizeof(dwParity) + sizeof(iBits) + nbytes(iBits) > BigBuf_max_traceLen()) return FALSE;
-  
-  // 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;
-  }
-  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);
-  return TRUE;
-}
 
 struct hitag2_tag {
 	uint32_t uid;