X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..0ecec5395b9426dc1d721065cde2339aef234751:/client/hid-flasher/usb_cmd.h

diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 739e2447..82e4cecb 100644
--- 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,7 +78,7 @@ 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
@@ -108,8 +101,7 @@ typedef struct{
 
 // 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
@@ -125,17 +117,30 @@ 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
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
+
 #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_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
@@ -168,6 +173,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
@@ -203,10 +210,12 @@ typedef struct{
 
 
 //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
 
 
 //Iclass reader flags