1. emulator works. tested on ARC1302, NXP pegoda, touchtag, my firm's readers.

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 59e3cc5b52d35b05c4bd367ce640aea3e297bbf3..8539a7de45d16fec788be2422f17d257fae7e822 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -44,15 +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_WRITEBL2 7\r
-#define MFEMUL_HALTED   8\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
@@ -83,5 +88,8 @@ void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
 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