CHG: moved some #define into include\common.h (which is call by apps.h), so we...

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 910ea74d519147afb76267ef32e3afb0a5c2b57f..fe57f42969ca3be8fa50d1fe9877077c8506e170 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -11,14 +11,13 @@
 #include "mifaresniff.h"\r
 #include "apps.h"\r
 \r
 #include "mifaresniff.h"\r
 #include "apps.h"\r
 \r

-\r

 static int sniffState = SNF_INIT;\r
 static uint8_t sniffUIDType;\r
 static uint8_t sniffUID[8];\r
 static uint8_t sniffATQA[2];\r
 static uint8_t sniffSAK;\r
 static uint8_t sniffBuf[16];\r
 static int sniffState = SNF_INIT;\r
 static uint8_t sniffUIDType;\r
 static uint8_t sniffUID[8];\r
 static uint8_t sniffATQA[2];\r
 static uint8_t sniffSAK;\r
 static uint8_t sniffBuf[16];\r

-static uint32_t timerData = 0;\r
+static uint32_t timerData;\r

 \r
 \r
 bool MfSniffInit(void){\r
 \r
 \r
 bool MfSniffInit(void){\r


@@ -140,7 +139,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 }\r
 \r
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {\r
 }\r
 \r
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {\r

-       if (traceLen && (GetTickCount() > timerData + maxTimeoutMs)) {\r
+       if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {\r

                return intMfSniffSend();\r
        }\r
        return FALSE;\r
                return intMfSniffSend();\r
        }\r
        return FALSE;\r


@@ -150,14 +149,15 @@ bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
 bool intMfSniffSend() {\r
 \r
        int pckSize = 0;\r
 bool intMfSniffSend() {\r
 \r
        int pckSize = 0;\r

-       int pckLen = traceLen;\r
+       int pckLen = BigBuf_get_traceLen();\r

        int pckNum = 0;\r
        int pckNum = 0;\r

-\r
+       uint8_t *trace = BigBuf_get_addr();\r
+       \r

        FpgaDisableSscDma();\r
        while (pckLen > 0) {\r
                pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);\r
                LED_B_ON();\r
        FpgaDisableSscDma();\r
        while (pckLen > 0) {\r
                pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);\r
                LED_B_ON();\r

-               cmd_send(CMD_ACK, 1, pckSize, pckNum, trace + traceLen - pckLen, pckSize);\r
+               cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen() - pckLen, pckSize);\r

                LED_B_OFF();\r
 \r
                pckLen -= pckSize;\r
                LED_B_OFF();\r
 \r
                pckLen -= pckSize;\r


@@ -168,7 +168,6 @@ bool intMfSniffSend() {
        cmd_send(CMD_ACK,2,0,0,0,0);\r
        LED_B_OFF();\r
 \r
        cmd_send(CMD_ACK,2,0,0,0,0);\r
        LED_B_OFF();\r
 \r

-       iso14a_clear_trace();\r
-       \r
+       clear_trace();\r

        return TRUE;\r
 }\r
        return TRUE;\r
 }\r