From: iceman1001 <iceman@iuse.se>
Date: Thu, 14 Apr 2016 09:34:36 +0000 (+0200)
Subject: MOV: moved the  #DEFINES into protocols.h
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c981c53ff3509b2f3a46d980fd8297006fbb2461?hp=68410a4892c9679abc0e2cf3c9c1efb95651fa4f

MOV: moved the  #DEFINES into protocols.h
---

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 25657a82..775a2036 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -20,11 +20,6 @@
 #define AUTH_FIRST    0	
 #define AUTH_NESTED   2
 
-// mifare 4bit card answers
-#define CARD_ACK      0x0A  // 1010 - ACK
-#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
-#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
-
 // reader voltage field detector
 #define MF_MINFIELDV      4000
 
@@ -42,14 +37,15 @@ extern int MF_DBGLEVEL;
 #define MFEMUL_IDLE         1
 #define MFEMUL_SELECT1      2
 #define MFEMUL_SELECT2      3
-#define MFEMUL_AUTH1        4
-#define MFEMUL_AUTH2        5
-#define MFEMUL_WORK	        6
-#define MFEMUL_WRITEBL2     7
-#define MFEMUL_INTREG_INC   8
-#define MFEMUL_INTREG_DEC   9
-#define MFEMUL_INTREG_REST 10
-#define MFEMUL_HALTED      11
+#define MFEMUL_SELECT3      4
+#define MFEMUL_AUTH1        5
+#define MFEMUL_AUTH2        6
+#define MFEMUL_WORK	        7
+#define MFEMUL_WRITEBL2     8
+#define MFEMUL_INTREG_INC   9
+#define MFEMUL_INTREG_DEC   10
+#define MFEMUL_INTREG_REST  11
+#define MFEMUL_HALTED       12
 
 #define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();