Merge pull request #131 from holiman/master

[proxmark3-svn] / armsrc / BigBuf.h

diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 075352770090334f31710996606a54fffa5e3cfc..0e2f174479b5db5a2110fe057f80bf5dba31d638 100644 (file)
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -14,27 +14,25 @@
 
 
 #define BIGBUF_SIZE                            40000
 
 
 #define BIGBUF_SIZE                            40000

-#define TRACE_OFFSET                   0
-#define TRACE_SIZE                             3000
-#define RECV_CMD_OFFSET                        (TRACE_OFFSET + TRACE_SIZE)
-#define MAX_FRAME_SIZE                 256
-#define MAX_PARITY_SIZE                        ((MAX_FRAME_SIZE + 1)/ 8)
-#define RECV_CMD_PAR_OFFSET            (RECV_CMD_OFFSET + MAX_FRAME_SIZE)
-#define RECV_RESP_OFFSET               (RECV_CMD_PAR_OFFSET + MAX_PARITY_SIZE)
-#define RECV_RESP_PAR_OFFSET   (RECV_RESP_OFFSET + MAX_FRAME_SIZE)
-#define CARD_MEMORY_OFFSET             (RECV_RESP_PAR_OFFSET + MAX_PARITY_SIZE)
+#define MAX_FRAME_SIZE                 256             // maximum allowed ISO14443 frame
+#define MAX_PARITY_SIZE                        ((MAX_FRAME_SIZE + 7) / 8)
+#define MAX_MIFARE_FRAME_SIZE  18              // biggest Mifare frame is answer to a read (one block = 16 Bytes) + 2 Bytes CRC
+#define MAX_MIFARE_PARITY_SIZE 3               // need 18 parity bits for the 18 Byte above. 3 Bytes are enough to store these

 #define CARD_MEMORY_SIZE               4096    
 #define CARD_MEMORY_SIZE               4096    

-#define DMA_BUFFER_OFFSET              CARD_MEMORY_OFFSET
-#define DMA_BUFFER_SIZE                CARD_MEMORY_SIZE
-#define FREE_BUFFER_OFFSET             (CARD_MEMORY_OFFSET + CARD_MEMORY_SIZE)
-#define FREE_BUFFER_SIZE               (BIGBUF_SIZE - FREE_BUFFER_OFFSET - 1)
+#define DMA_BUFFER_SIZE                128

 
 extern uint8_t *BigBuf_get_addr(void);
 
 extern uint8_t *BigBuf_get_addr(void);

-extern uint16_t BigBuf_max_trace_len(void);
-void BigBuf_Clear(void);
+extern uint8_t *BigBuf_get_EM_addr(void);
+extern uint16_t BigBuf_max_traceLen(void);
+extern void BigBuf_Clear(void);

 extern uint8_t *BigBuf_malloc(uint16_t);
 extern void BigBuf_free(void);
 extern uint8_t *BigBuf_malloc(uint16_t);
 extern void BigBuf_free(void);

+extern void BigBuf_free_keep_EM(void);

 
 

-extern uint16_t traceLen;
-
+extern uint16_t BigBuf_get_traceLen(void);
+extern void clear_trace();
+extern void set_tracing(bool enable);
+extern bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
+extern int LogTraceHitag(const uint8_t * btBytes, int iBits, int iSamples, uint32_t dwParity, int bReader);
+extern uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);

 #endif /* __BIGBUF_H */
 #endif /* __BIGBUF_H */