Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index d61a255899aea2105cfcadb8d81ae534a66410b1..345793eca48f8cd5cdd80e634a1f536a6af85a14 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -133,7 +133,7 @@ typedef struct{
 #define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
-#define CMD_READER_ICLASS_REPLAY                                                                                 0x0395
+#define CMD_READER_ICLASS_REPLAY                                          0x0395
 #define CMD_ICLASS_ISO14443A_WRITE                                                                               0x0397
 #define CMD_ICLASS_EML_MEMSET                                             0x0398
 
@@ -164,11 +164,9 @@ typedef struct{
 #define CMD_MIFARE_NESTED                                                 0x0612
 
 #define CMD_MIFARE_READBL                                                 0x0620
-#define CMD_MIFAREU_READBL                                                                       0x0720
-
+#define CMD_MIFAREU_READBL                                                0x0720
 #define CMD_MIFARE_READSC                                                 0x0621
-#define CMD_MIFAREU_READCARD                                                                 0x0721
-
+#define CMD_MIFAREU_READCARD                                              0x0721
 #define CMD_MIFARE_WRITEBL                                                0x0622
 #define CMD_MIFAREU_WRITEBL                                                                      0x0722
 #define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0723
@@ -176,13 +174,11 @@ typedef struct{
 #define CMD_MIFARE_CHKKEYS                                                0x0623
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
-
 //ultralightC
-#define CMD_MIFAREUC_AUTH1                                                                       0x0724
-#define CMD_MIFAREUC_AUTH2                                                                       0x0725
-#define CMD_MIFAREUC_READCARD                                                                0x0726
-#define CMD_MIFAREUC_SETPWD                                                                          0x0727
-#define CMD_MIFAREU_SETUID                                                                           0x0728
+#define CMD_MIFAREUC_AUTH                                                 0x0724
+//0x0725 and 0x0726 no longer used 
+#define CMD_MIFAREUC_SETPWD                                               0x0727
+
 
 // mifare desfire
 #define CMD_MIFARE_DESFIRE_READBL                                         0x0728
@@ -211,6 +207,7 @@ typedef struct{
 #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