ADD: simulating can now handle triplesized UID (10b)

[proxmark3-svn] / client / hid-flasher / usb_cmd.h

diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index c77477e821f72990f59ba234ceb5cbe73c1c5a5c..4a249134ba69ce2b6c937009ea019ae71f7365b1 100644 (file)
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -23,24 +23,14 @@ typedef BYTE uint8_t;
 #define PACKED __attribute__((packed))
 #endif
 
-#define USB_CMD_DATA_SIZE 512
-
 typedef struct {
-       uint64_t        cmd;
-       uint64_t        arg[3];
+       uint32_t        cmd;
+       uint32_t        arg[3];
        union {
-    uint8_t  asBytes[USB_CMD_DATA_SIZE];
-    uint32_t asDwords[USB_CMD_DATA_SIZE/4];
+               uint8_t         asBytes[48];
+               uint32_t        asDwords[12];
        } d;
 } PACKED UsbCommand;
-// A struct used to send sample-configs over USB
-typedef struct{
-       uint8_t decimation;
-       uint8_t bits_per_sample;
-       bool averaging;
-       int divisor;
-       int trigger_threshold;
-} sample_config;
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000
@@ -62,6 +52,9 @@ typedef struct{
 #define CMD_VERSION                                                       0x0107
 #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
@@ -85,8 +78,11 @@ typedef struct{
 #define CMD_INDALA_CLONE_TAG_L                                            0x0213
 #define CMD_T55XX_READ_BLOCK                                              0x0214
 #define CMD_T55XX_WRITE_BLOCK                                             0x0215
-#define CMD_T55XX_READ_TRACE                                              0x0216
+#define CMD_T55XX_RESET_READ                                              0x0216
+#define CMD_T55XX_WAKEUP                                                     0x0224
+
 #define CMD_PCF7931_READ                                                  0x0217
+#define CMD_PCF7931_WRITE                                                 0x0223
 #define CMD_EM4X_READ_WORD                                                0x0218
 #define CMD_EM4X_WRITE_WORD                                               0x0219
 #define CMD_IO_DEMOD_FSK                                                  0x021A
@@ -98,13 +94,14 @@ typedef struct{
 #define CMD_ASK_SIM_TAG                                                   0x021F
 #define CMD_PSK_SIM_TAG                                                   0x0220
 #define CMD_AWID_DEMOD_FSK                                                0x0221
+#define CMD_VIKING_CLONE_TAG                                              0x0222
+
 
 /* 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
@@ -120,6 +117,13 @@ typedef struct{
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
+// For HitagS
+#define CMD_SIMULATE_HITAG_S                                              0x0368
+#define CMD_TEST_HITAGS_TRACES                                                                                   0x0367
+#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
@@ -163,6 +167,8 @@ 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
@@ -191,15 +197,19 @@ typedef struct{
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
 #define CMD_MIFARE_COLLECT_NONCES                                                                                0x072f
+                                
+#define CMD_HF_SNIFFER                                                    0x0800
 
 #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              0x12
 
 
 //Iclass reader flags