X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..0d2c590974319db6fc54400ce153d86b68a09852:/client/hid-flasher/usb_cmd.h diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h index 739e2447..b9f2fb77 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 @@ -85,7 +75,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 @@ -168,6 +158,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