X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a1ff338bd5023bac02d51e1de5ca70fbdb90d3bf..ece38ef311b28eefb1d716937139aad9ee00985c:/include/usb_cmd.h?ds=sidebyside

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 1bc5e5ba..75b7c210 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -156,7 +156,6 @@ typedef struct{
 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
-#define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
 #define CMD_SNOOP_ICLASS                                                  0x0392
@@ -166,7 +165,8 @@ typedef struct{
 #define CMD_ICLASS_READBLOCK                                              0x0396
 #define CMD_ICLASS_WRITEBLOCK                                             0x0397
 #define CMD_ICLASS_EML_MEMSET                                             0x0398
-#define CMD_ICLASS_AUTHENTICATION                                         0x0399
+#define CMD_ICLASS_CHECK                                                  0x0399
+#define CMD_ICLASS_READCHECK                                              0x039A                                         
 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
@@ -228,7 +228,7 @@ typedef struct{
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
-//Mifare simulation flags
+// Mifare simulation flags
 #define FLAG_INTERACTIVE                (1<<0)
 #define FLAG_4B_UID_IN_DATA             (1<<1)
 #define FLAG_7B_UID_IN_DATA             (1<<2)
@@ -236,17 +236,23 @@ typedef struct{
 #define FLAG_RANDOM_NONCE               (1<<5)
 
 
-//Iclass reader flags
-#define FLAG_ICLASS_READER_ONLY_ONCE    0x01
+// iCLASS reader flags
 #define FLAG_ICLASS_READER_CC           0x02
 #define FLAG_ICLASS_READER_CSN          0x04
 #define FLAG_ICLASS_READER_CONF         0x08
 #define FLAG_ICLASS_READER_AA           0x10
-#define FLAG_ICLASS_READER_ONE_TRY      0x20
-#define FLAG_ICLASS_READER_CEDITKEY     0x40
+#define FLAG_ICLASS_READER_CREDITKEY    0x40
 
+// iCLASS simulation modes
+#define ICLASS_SIM_MODE_CSN                   0
+#define ICLASS_SIM_MODE_CSN_DEFAULT           1
+#define ICLASS_SIM_MODE_READER_ATTACK         2
+#define ICLASS_SIM_MODE_FULL                  3
+#define ICLASS_SIM_MODE_READER_ATTACK_KEYROLL 4
+#define ICLASS_SIM_MODE_EXIT_AFTER_MAC        5  // note: device internal only
 
-//hw tune args
+
+// hw tune args
 #define FLAG_TUNE_LF   1
 #define FLAG_TUNE_HF   2
 #define FLAG_TUNE_ALL  3