Merge pull request #63 from micolous/log-nonce

[proxmark3-svn] / armsrc / mifaresniff.h

diff --git a/armsrc/mifaresniff.h b/armsrc/mifaresniff.h
index aa2a860f7bcf174b69769f1db4c3d4cc40d651ef..664ca568d3891681feb6a92fc76b41c210254e29 100644 (file)
--- a/armsrc/mifaresniff.h
+++ b/armsrc/mifaresniff.h
@@ -11,37 +11,39 @@
 #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 "../common/iso14443crc.h"\r
+#include "iso14443crc.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_INIT                       0\r
 #define SNF_NO_FIELD           1\r
 #define SNF_WUPREQ                     2\r
-#define SNF_ATQA                               3\r
+#define SNF_ATQA                       3\r
 #define SNF_ANTICOL1           4\r
-#define SNF_UID1                               5\r
+#define SNF_UID1                       5\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_UID2                       7\r
+#define SNF_ANTICOL3           8\r
+#define SNF_UID3                       9\r
+#define SNF_SAK                                10\r
+#define SNF_CARD_IDLE          11\r
+#define SNF_CARD_CMD           12\r
+#define SNF_CARD_RESP          13\r
 \r
-#define SNF_UID_4                              0\r
-#define SNF_UID_7                              0\r
+#define SNF_UID_4                      0\r
+#define SNF_UID_7                      0\r
+#define SNF_UID_10                     0\r
 \r
-bool MfSniffInit(void);\r
+void MfSniffInit(void);\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
+void MfSniffEnd(void);\r
 \r
 #endif
\ No newline at end of file