use char instead of uint8_t to avoid warnings/casting

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 4433fe65a952f3133dc571aff747b09f0495b6f7..8539a7de45d16fec788be2422f17d257fae7e822 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -19,6 +19,11 @@
 #define AUTH_FIRST    0\r
 #define AUTH_NESTED   2\r
 \r
+// mifare 4bit card answers\r
+#define CARD_ACK      0x0A  // 1010 - ACK\r
+#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)\r
+#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error\r
+\r
 // reader voltage field detector\r
 #define MF_MINFIELDV      4000\r
 \r
@@ -39,14 +44,20 @@ extern int MF_DBGLEVEL;
 #define NES_MAX_INFO         5\r
 \r
 //mifare emulator states\r
-#define MFEMUL_NOFIELD  0\r
-#define MFEMUL_IDLE     1\r
-#define MFEMUL_SELECT1  2\r
-#define MFEMUL_SELECT2  3\r
-#define MFEMUL_AUTH1    4\r
-#define MFEMUL_AUTH2    5\r
-#define MFEMUL_WORK                    6\r
-#define MFEMUL_HALTED   7\r
+#define MFEMUL_NOFIELD      0\r
+#define MFEMUL_IDLE         1\r
+#define MFEMUL_SELECT1      2\r
+#define MFEMUL_SELECT2      3\r
+#define MFEMUL_AUTH1        4\r
+#define MFEMUL_AUTH2        5\r
+#define MFEMUL_WORK            6\r
+#define MFEMUL_WRITEBL2     7\r
+#define MFEMUL_INTREG_INC   8\r
+#define MFEMUL_INTREG_DEC   9\r
+#define MFEMUL_INTREG_REST 10\r
+#define MFEMUL_HALTED      11\r
+\r
+#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();\r
 \r
 //functions\r
 uint8_t* mifare_get_bigbufptr(void);\r
@@ -61,4 +72,24 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); \r
 \r
+// crypto functions\r
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);\r
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par);\r
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);\r
+\r
+// memory management\r
+uint8_t* mifare_get_bigbufptr(void);\r
+uint8_t* eml_get_bigbufptr_sendbuf(void);\r
+uint8_t* eml_get_bigbufptr_recbuf(void);\r
+\r
+// emulator functions\r
+void emlClearMem(void);\r
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);\r
+uint64_t emlGetKey(int sectorNum, int keyType);\r
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);\r
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);\r
+int emlCheckValBl(int blockNum);\r
+\r
 #endif
\ No newline at end of file