@Marshmellow42 's fixes for bigbuf.

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index c3951320d63a95dd103a9633010a6a38be85bfea..2a6e94842e904fb106d5ea11b3c3a8948398e065 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -165,10 +165,8 @@ typedef struct{
 
 #define CMD_MIFARE_READBL                                                 0x0620
 #define CMD_MIFAREU_READBL                                                                       0x0720
-
 #define CMD_MIFARE_READSC                                                 0x0621
 #define CMD_MIFAREU_READCARD                                                                 0x0721
-
 #define CMD_MIFARE_WRITEBL                                                0x0622
 #define CMD_MIFAREU_WRITEBL                                                                      0x0722
 #define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0723
@@ -177,9 +175,10 @@ typedef struct{
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC
-#define CMD_MIFAREUC_AUTH1                                                                       0x0724
-#define CMD_MIFAREUC_AUTH2                                                                       0x0725
-#define CMD_MIFAREUC_READCARD                                                                0x0726
+#define CMD_MIFAREUC_AUTH                                                                        0x0724
+//0x0725 and 0x0726 no longer used 
+#define CMD_MIFAREUC_SETPWD                                                                          0x0727
+
 
 // mifare desfire
 #define CMD_MIFARE_DESFIRE_READBL                                         0x0728
@@ -190,6 +189,8 @@ typedef struct{
 #define CMD_MIFARE_DESFIRE_INFO                                           0x072d
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
+#define CMD_MIFARE_COLLECT_NONCES                                                                                0x072f
+
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
@@ -202,7 +203,12 @@ typedef struct{
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01
-#define FLAG_ICLASS_READER_GET_CC       0x02
+#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
+
 
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions: