Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / armsrc / BigBuf.c

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 267921f4f299c7d034a059b7687c0d9c8bb565cb..cf0c26b2b176c1dc8da7be8eab8fa19ab70520ed 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -8,11 +8,7 @@
 //-----------------------------------------------------------------------------
 // BigBuf and functions to allocate/free parts of it.
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // 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.
 
 // 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.


@@ -64,7 +60,7 @@ void BigBuf_Clear_ext(bool verbose)
 {
        memset(BigBuf, 0, BIGBUF_SIZE);
        if (verbose) 
 {
        memset(BigBuf, 0, BIGBUF_SIZE);
        if (verbose) 

-               Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);
+               Dbprintf("Buffer cleared (%i bytes)", BIGBUF_SIZE);

 }
 
 void BigBuf_Clear_keep_EM(void)
 }
 
 void BigBuf_Clear_keep_EM(void)


@@ -143,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.
   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)
 {
 **/
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag)
 {