FIX: some compiler warnings, sscanf is using unsigned int.

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index ff20fde76645136955f89786b79d3891804e4a0a..e312f93ac1c92d9f31bcb4770de02e0ad73150df 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -12,15 +12,16 @@
 
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
+
 #ifdef _MSC_VER
-typedef DWORD uint32_t;
-typedef BYTE uint8_t;
-#define PACKED
-// stuff
+   typedef DWORD uint32_t;
+   typedef BYTE uint8_t;
+   #define PACKED
+   // stuff
 #else
-#include <stdint.h>
-#include <stdbool.h>
-#define PACKED __attribute__((packed))
+  #include <stdint.h>
+  #include <stdbool.h>
+  #define PACKED __attribute__((packed))
 #endif
 
 #define USB_CMD_DATA_SIZE 512
@@ -63,6 +64,9 @@ typedef struct{
 #define CMD_STATUS                                                                                                               0x0108
 #define CMD_PING                                                                                                                 0x0109
 
+#define CMD_DOWNLOAD_EML_BIGBUF                                                                                          0x0110
+#define CMD_DOWNLOADED_EML_BIGBUF                                                                                0x0111
+
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
 #define CMD_WRITE_TI_TYPE                                                 0x0203
@@ -101,13 +105,13 @@ typedef struct{
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0222
 #define CMD_T55XX_WAKEUP                                                     0x0224
+#define CMD_COTAG                                                                                                                0x0225
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags
 #define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693                             0x0300
-#define CMD_READ_SRI512_TAG                                               0x0303
-#define CMD_READ_SRIX4K_TAG                                               0x0304
+#define CMD_READ_SRI_TAG                                                  0x0303
 #define CMD_ISO_14443B_COMMAND                                            0x0305
 #define CMD_READER_ISO_15693                                              0x0310
 #define CMD_SIMTAG_ISO_15693                                              0x0311
@@ -123,17 +127,31 @@ typedef struct{
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
+// For HitagS 
+#define CMD_TEST_HITAGS_TRACES                                                                                   0x0367
+#define CMD_SIMULATE_HITAG_S                                                                                     0x0368
+#define CMD_READ_HITAG_S                                                                                                 0x0373
+#define CMD_WR_HITAG_S                                                                                                   0x0375
+#define CMD_EMU_HITAG_S                                                                                                          0x0376
+
+
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
 #define CMD_SNOOP_ISO_14443B                                              0x0382
 #define CMD_SNOOP_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
+#define CMD_RAW_WRITER_LEGIC_RF                                           0x0386
 #define CMD_SIMULATE_TAG_LEGIC_RF                                         0x0387
 #define CMD_READER_LEGIC_RF                                               0x0388
 #define CMD_WRITER_LEGIC_RF                                               0x0389
+
 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
+#define CMD_LEGIC_INFO                                                                                                   0x03BC
+#define CMD_LEGIC_ESET                                                                                                   0x03BD
+#define CMD_LEGIC_EGET                                                                                                   0x03BE
+
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
@@ -171,6 +189,7 @@ typedef struct{
 
 #define CMD_READER_MIFARE                                                 0x0611
 #define CMD_MIFARE_NESTED                                                 0x0612
+#define CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES                               0x0613
 
 #define CMD_MIFARE_READBL                                                 0x0620
 #define CMD_MIFAREU_READBL                                                0x0720
@@ -188,7 +207,6 @@ typedef struct{
 //0x0725 and 0x0726 no longer used 
 #define CMD_MIFAREUC_SETPWD                                               0x0727
 
-
 // mifare desfire
 #define CMD_MIFARE_DESFIRE_READBL                                         0x0728
 #define CMD_MIFARE_DESFIRE_WRITEBL                                        0x0729
@@ -202,15 +220,27 @@ typedef struct{
 
 #define CMD_HF_SNIFFER                                                    0x0800
 
-#define CMD_UNKNOWN                                                       0xFFFF
+// For EMV Commands
+#define CMD_EMV_READ_RECORD                                               0x0700
+#define CMD_EMV_TRANSACTION                                               0x0701
+#define CMD_EMV_CLONE                                                     0x0702
+#define CMD_EMV_SIM                                                       0x0703
+#define CMD_EMV_TEST                                                      0x0704
+#define CMD_EMV_FUZZ_RATS                                                 0x0705
+#define CMD_EMV_GET_RANDOM_NUM                                            0x0706
+#define CMD_EMV_LOAD_VALUE                                                0x0707
+#define CMD_EMV_DUMP_CARD                                                 0x0708
 
+#define CMD_UNKNOWN                                                       0xFFFF
 
 //Mifare simulation flags
-#define FLAG_INTERACTIVE 0x01
-#define FLAG_4B_UID_IN_DATA 0x02
-#define FLAG_7B_UID_IN_DATA 0x04
-#define FLAG_NR_AR_ATTACK 0x08
-
+#define FLAG_INTERACTIVE               0x01
+#define FLAG_4B_UID_IN_DATA    0x02
+#define FLAG_7B_UID_IN_DATA    0x04
+#define FLAG_10B_UID_IN_DATA   0x08
+#define FLAG_UID_IN_EMUL               0x10
+#define FLAG_NR_AR_ATTACK              0x20
+//#define FLAG_RANDOM_NONCE            0x40
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01
@@ -221,8 +251,6 @@ typedef struct{
 #define FLAG_ICLASS_READER_ONE_TRY      0x20
 #define FLAG_ICLASS_READER_CEDITKEY     0x40
 
-
-
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
 #define DEVICE_INFO_FLAG_BOOTROM_PRESENT               (1<<0)