X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/02d352fea75385d80b49a7ab8703692ae307f073..b7f40ee2ad734d6081abf14347748a841c69d4b8:/armsrc/BigBuf.c?ds=sidebyside

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 2fb50a47..cf0c26b2 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -8,18 +8,21 @@
 //-----------------------------------------------------------------------------
 // BigBuf and functions to allocate/free parts of it.
 //-----------------------------------------------------------------------------
-
-#include <stdint.h>
-#include "proxmark3.h"
-#include "apps.h"
-#include "string.h"
+#include "BigBuf.h"
 
 // BigBuf is the large multi-purpose buffer, typically used to hold A/D samples or traces.
 // Also used to hold various smaller buffers and the Mifare Emulator Memory.
-
 // declare it as uint32_t to achieve alignment to 4 Byte boundary
 static uint32_t BigBuf[BIGBUF_SIZE/sizeof(uint32_t)];
 
+/* BigBuf memory layout:
+Pointer to highest available memory: BigBuf_hi
+
+    high BIGBUF_SIZE
+    reserved = BigBuf_malloc()  subtracts amount from BigBuf_hi,   
+	low  0x00
+*/
+
 // High memory mark
 static uint16_t BigBuf_hi = BIGBUF_SIZE;
 
@@ -36,25 +39,34 @@ uint8_t *BigBuf_get_addr(void)
 	return (uint8_t *)BigBuf;
 }
 
-
 // get the address of the emulator memory. Allocate part of Bigbuf for it, if not yet done
 uint8_t *BigBuf_get_EM_addr(void)
 {
-	if (emulator_memory == NULL) {		// not yet allocated
+	// not yet allocated
+	if (emulator_memory == NULL)
 		emulator_memory = BigBuf_malloc(CARD_MEMORY_SIZE);
-	}
 	
 	return emulator_memory;
 }
 
-
 // clear ALL of BigBuf
 void BigBuf_Clear(void)
 {
-	memset(BigBuf,0,BIGBUF_SIZE);
-	Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);
+	BigBuf_Clear_ext(true);
 }
 
+// clear ALL of BigBuf
+void BigBuf_Clear_ext(bool verbose)
+{
+	memset(BigBuf, 0, BIGBUF_SIZE);
+	if (verbose) 
+		Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);
+}
+
+void BigBuf_Clear_keep_EM(void)
+{
+	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
@@ -69,25 +81,35 @@ uint8_t *BigBuf_malloc(uint16_t chunksize)
 	}
 }
 
-
 // free ALL allocated chunks. The whole BigBuf is available for traces or samples again.
 void BigBuf_free(void)
 {
 	BigBuf_hi = BIGBUF_SIZE;
 	emulator_memory = NULL;
+	
+	// shouldn't this empty BigBuf also?
 }
 
-
 // free allocated chunks EXCEPT the emulator memory
 void BigBuf_free_keep_EM(void)
 {
-	if (emulator_memory != NULL) {
+	if (emulator_memory != NULL)
 		BigBuf_hi = emulator_memory - (uint8_t *)BigBuf;
-	} else {
+	else
 		BigBuf_hi = BIGBUF_SIZE;
-	}
+	
+	// shouldn't this empty BigBuf also?
 }
 
+void BigBuf_print_status(void)
+{
+	Dbprintf("Memory");
+	Dbprintf("  BIGBUF_SIZE.............%d", BIGBUF_SIZE);
+	Dbprintf("  Available memory........%d", BigBuf_hi);
+	Dbprintf("Tracing");
+	Dbprintf("  tracing ................%d", tracing);
+	Dbprintf("  traceLen ...............%d", traceLen);
+}
 
 // return the maximum trace length (i.e. the unallocated size of BigBuf)
 uint16_t BigBuf_max_traceLen(void)
@@ -96,9 +118,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;
 }
 
@@ -120,7 +139,6 @@ uint16_t BigBuf_get_traceLen(void)
   The traces produced by calling this function can be fetched on the client-side
   by 'hf list raw', alternatively 'hf list <proto>' for protocol-specific
   annotation of commands/responses.
-
 **/
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
 {
@@ -132,9 +150,7 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 	uint16_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) {
+	if (traceLen + sizeof(iLen) + sizeof(timestamp_start) + sizeof(duration) + num_paritybytes + iLen >= BigBuf_max_traceLen()) {
 		tracing = FALSE;	// don't trace any more
 		return FALSE;
 	}
@@ -171,9 +187,9 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 	traceLen += iLen;
 
 	// parity bytes
-	if (iLen != 0) {
+	if (num_paritybytes != 0) {
 		if (parity != NULL) {
-		memcpy(trace + traceLen, parity, num_paritybytes);
+			memcpy(trace + traceLen, parity, num_paritybytes);
 		} else {
 			memset(trace + traceLen, 0x00, num_paritybytes);
 		}
@@ -230,12 +246,10 @@ int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwP
 // 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)
-	{
+	if(offset+length < CARD_MEMORY_SIZE) {
 		memcpy(mem+offset, data, length);
 		return 0;
-	}else
-	{
+	} else {
 		Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset+length), CARD_MEMORY_SIZE);
 		return 1;
 	}