Merge pull request #471 from marshmellow42/master

[proxmark3-svn] / armsrc / mifaresniff.h

diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index 1065fa618910a86fd5e355da07280c8cef063ef0..8a8e31a9e70503ab775e567b5877f93301ea9feb 100644 (file)
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -11,37 +11,30 @@
 #ifndef __MIFARESNIFF_H\r
 #define __MIFARESNIFF_H\r
 \r
-#include "proxmark3.h"\r
-#include "apps.h"\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
 #include "util.h"\r
-#include "string.h"\r
-\r
-#include "iso14443crc.h"\r
-#include "iso14443a.h"\r
-#include "crapto1.h"\r
-#include "mifareutil.h"\r
-#include "common.h"\r
 \r
 #define SNF_INIT                               0\r
-#define SNF_NO_FIELD           1\r
-#define SNF_WUPREQ                     2\r
+#define SNF_NO_FIELD                   1\r
+#define SNF_WUPREQ                             2\r
 #define SNF_ATQA                               3\r
-#define SNF_ANTICOL1           4\r
+#define SNF_ANTICOL1                   4\r
 #define SNF_UID1                               5\r
-#define SNF_ANTICOL2           6\r
+#define SNF_ANTICOL2                   6\r
 #define SNF_UID2                               7\r
 #define SNF_SAK                                        8\r
-#define SNF_CARD_IDLE          9\r
-#define SNF_CARD_CMD           10\r
-#define SNF_CARD_RESP          11\r
+#define SNF_CARD_IDLE                  9\r
+#define SNF_CARD_CMD                   10\r
+#define SNF_CARD_RESP                  11\r
 \r
 #define SNF_UID_4                              0\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
 \r
-#endif
\ No newline at end of file
+#endif\r