added missing files, part2

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 31e0287ddcf41047caff6426929a6b2f4ee62caa..45878000399eb291e91b2d23ed935924e2e6751b 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -40,7 +40,7 @@ int MfSniffEnd(void){
        return 0;\r
 }\r
 \r
-int RAMFUNC MfSniffLogic(const uint8_t * data, int len, int bitCnt, int reader) {\r
+int RAMFUNC MfSniffLogic(const uint8_t * data, int len, uint32_t parity, int bitCnt, int reader) {\r
 \r
        if ((len == 1) && (bitCnt = 9) && (data[0] > 0x0F)) { \r
                sniffState = SNF_INIT;\r
@@ -121,18 +121,18 @@ int RAMFUNC MfSniffLogic(const uint8_t * data, int len, int bitCnt, int reader)
                        sniffBuf[11] = sniffSAK;\r
                        sniffBuf[12] = 0xFF;\r
                        sniffBuf[13] = 0xFF;\r
-                       LogTrace(sniffBuf, 14, 0, 0, true);\r
+                       LogTrace(sniffBuf, 14, 0, parity, true);\r
                        timerData = GetTickCount();\r
                }\r
                case SNF_CARD_CMD:{\r
-                       LogTrace(data, len, 0, 0, true);\r
+                       LogTrace(data, len, 0, parity, true);\r
 \r
                        sniffState = SNF_CARD_RESP;\r
                        timerData = GetTickCount();\r
                        break;\r
                }\r
                case SNF_CARD_RESP:{\r
-                       LogTrace(data, len, 0, 0, false);\r
+                       LogTrace(data, len, 0, parity, false);\r
 \r
                        sniffState = SNF_CARD_CMD;\r
                        timerData = GetTickCount();\r
@@ -166,7 +166,7 @@ int intMfSniffSend() {
        FpgaDisableSscDma();\r
 \r
        while (pckLen > 0) {\r
-               pckSize = min(32, pckLen);\r
+               pckSize = MIN(32, pckLen);\r
                UsbCommand ack = {CMD_ACK, {1, pckSize, pckNum}};\r
                memcpy(ack.d.asBytes, trace + traceLen - pckLen, pckSize);\r
        \r