Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / armsrc / mifaresniff.h

diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index 3ee64f35b66bab0521dc58bd1da58b1578f12fec..22daffee7b04ec74247b493c99addeb9088e4859 100644 (file)
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -11,16 +11,16 @@
 #ifndef __MIFARESNIFF_H\r
 #define __MIFARESNIFF_H\r
 \r
 #ifndef __MIFARESNIFF_H\r
 #define __MIFARESNIFF_H\r
 \r

-#include "../include/proxmark3.h"\r
+#include "proxmark3.h"\r

 #include "apps.h"\r
 #include "util.h"\r
 #include "string.h"\r
 \r
 #include "apps.h"\r
 #include "util.h"\r
 #include "string.h"\r
 \r

-#include "../common/iso14443crc.h"\r
+#include "iso14443crc.h"\r

 #include "iso14443a.h"\r
 #include "crapto1.h"\r
 #include "mifareutil.h"\r
 #include "iso14443a.h"\r
 #include "crapto1.h"\r
 #include "mifareutil.h"\r

-#include "../include/common.h"\r
+#include "common.h"\r

 \r
 #define SNF_INIT                               0\r
 #define SNF_NO_FIELD           1\r
 \r
 #define SNF_INIT                               0\r
 #define SNF_NO_FIELD           1\r


@@ -39,7 +39,7 @@
 #define SNF_UID_7                              0\r
 \r
 bool MfSniffInit(void);\r
 #define SNF_UID_7                              0\r
 \r
 bool MfSniffInit(void);\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

 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs);\r
 bool intMfSniffSend();\r
 bool MfSniffEnd(void);\r
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs);\r
 bool intMfSniffSend();\r
 bool MfSniffEnd(void);\r