LF demod/cmd code cleanup + new lf search

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 3e5570f9ce6e575ecd1b19f2f696b30d42b94b94..910ea74d519147afb76267ef32e3afb0a5c2b57f 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -11,6 +11,7 @@
 #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 int sniffState = SNF_INIT;\r
 static uint8_t sniffUIDType;\r
 static uint8_t sniffUID[8];\r


@@ -37,7 +38,7 @@ bool MfSniffEnd(void){
        return FALSE;\r
 }\r
 \r
        return FALSE;\r
 }\r
 \r

-bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, uint16_t bitCnt, bool reader) {\r
+bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {\r

 \r
        if (reader && (len == 1) && (bitCnt == 7)) {            // reset on 7-Bit commands from reader\r
                sniffState = SNF_INIT;\r
 \r
        if (reader && (len == 1) && (bitCnt == 7)) {            // reset on 7-Bit commands from reader\r
                sniffState = SNF_INIT;\r


@@ -114,16 +115,16 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, ui
                        sniffBuf[11] = sniffSAK;\r
                        sniffBuf[12] = 0xFF;\r
                        sniffBuf[13] = 0xFF;\r
                        sniffBuf[11] = sniffSAK;\r
                        sniffBuf[12] = 0xFF;\r
                        sniffBuf[13] = 0xFF;\r

-                       LogTrace(sniffBuf, 14, 0, parity, true);\r
+                       LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);\r

                }       // intentionally no break;\r
                case SNF_CARD_CMD:{             \r
                }       // intentionally no break;\r
                case SNF_CARD_CMD:{             \r

-                       LogTrace(data, len, 0, parity, true);\r
+                       LogTrace(data, len, 0, 0, NULL, TRUE);\r

                        sniffState = SNF_CARD_RESP;\r
                        timerData = GetTickCount();\r
                        break;\r
                }\r
                case SNF_CARD_RESP:{\r
                        sniffState = SNF_CARD_RESP;\r
                        timerData = GetTickCount();\r
                        break;\r
                }\r
                case SNF_CARD_RESP:{\r

-                       LogTrace(data, len, 0, parity, false);\r
+                       LogTrace(data, len, 0, 0, NULL, FALSE);\r

                        sniffState = SNF_CARD_CMD;\r
                        timerData = GetTickCount();\r
                        break;\r
                        sniffState = SNF_CARD_CMD;\r
                        timerData = GetTickCount();\r
                        break;\r