Fix typo and gcc-7 warnings (#401)

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index a9db4ec384a7c950e9c57a12d9d21cb9861cf913..34793a29a38cb72833c03d4ef3476ad738378256 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -8,17 +8,21 @@
 // High frequency ISO14443A commands\r
 //-----------------------------------------------------------------------------\r
 \r
 // High frequency ISO14443A commands\r
 //-----------------------------------------------------------------------------\r
 \r

+#ifndef MIFAREHOST_H\r
+#define MIFAREHOST_H\r
+\r

 #include <stdint.h>\r
 #include <stdbool.h>\r
 #include "data.h"\r
 \r
 // mfCSetBlock work flags\r
 #include <stdint.h>\r
 #include <stdbool.h>\r
 #include "data.h"\r
 \r
 // mfCSetBlock work flags\r

-#define CSETBLOCK_UID                                  0x01\r
-#define CSETBLOCK_WUPC                                 0x02\r
-#define CSETBLOCK_HALT                                 0x04\r
+#define CSETBLOCK_UID                          0x01\r
+#define CSETBLOCK_WUPC                         0x02\r
+#define CSETBLOCK_HALT                         0x04\r

 #define CSETBLOCK_INIT_FIELD                   0x08\r
 #define CSETBLOCK_RESET_FIELD                  0x10\r
 #define CSETBLOCK_SINGLE_OPER                  0x1F\r
 #define CSETBLOCK_INIT_FIELD                   0x08\r
 #define CSETBLOCK_RESET_FIELD                  0x10\r
 #define CSETBLOCK_SINGLE_OPER                  0x1F\r

+#define CSETBLOCK_MAGIC_1B                     0x40\r

 \r
 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r
 \r
 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r


@@ -29,7 +33,8 @@ extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint
 extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
 \r
 extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
 \r

-extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe);\r
+extern int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill);\r
+extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID);\r

 extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);\r
 extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r
 extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);\r
 extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r


@@ -42,3 +47,7 @@ extern int isBlockTrailer(int blockN);
 extern int loadTraceCard(uint8_t *tuid);\r
 extern int saveTraceCard(void);\r
 extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);\r
 extern int loadTraceCard(uint8_t *tuid);\r
 extern int saveTraceCard(void);\r
 extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);\r

+\r
+extern int mfCIdentify();\r
+\r
+#endif\r