\r
#ifndef __USB_CMD_H\r
#define __USB_CMD_H\r
+#ifdef _MSC_VER\r
+typedef DWORD uint32_t;\r
+typedef BYTE uint8_t;\r
+#define PACKED\r
+// stuff\r
+#else\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
+#define PACKED __attribute__((packed))\r
+#endif\r
\r
typedef struct {\r
- DWORD cmd;\r
- DWORD ext1;\r
- DWORD ext2;\r
- DWORD ext3;\r
+ uint32_t cmd;\r
+ uint32_t arg[3];\r
union {\r
- BYTE asBytes[48];\r
- DWORD asDwords[12];\r
+ uint8_t asBytes[48];\r
+ uint32_t asDwords[12];\r
} d;\r
-} UsbCommand;\r
+} PACKED UsbCommand;\r
\r
// For the bootloader\r
-#define CMD_DEVICE_INFO 0x0000\r
-#define CMD_SETUP_WRITE 0x0001\r
-#define CMD_FINISH_WRITE 0x0003\r
-#define CMD_HARDWARE_RESET 0x0004\r
-#define CMD_START_FLASH 0x0005\r
-#define CMD_NACK 0x00fe\r
-#define CMD_ACK 0x00ff\r
+#define CMD_DEVICE_INFO 0x0000\r
+#define CMD_SETUP_WRITE 0x0001\r
+#define CMD_FINISH_WRITE 0x0003\r
+#define CMD_HARDWARE_RESET 0x0004\r
+#define CMD_START_FLASH 0x0005\r
+#define CMD_NACK 0x00fe\r
+#define CMD_ACK 0x00ff\r
\r
// For general mucking around\r
-#define CMD_DEBUG_PRINT_STRING 0x0100\r
-#define CMD_DEBUG_PRINT_INTEGERS 0x0101\r
-#define CMD_DEBUG_PRINT_BYTES 0x0102\r
-#define CMD_LCD_RESET 0x0103\r
-#define CMD_LCD 0x0104\r
-#define CMD_BUFF_CLEAR 0x0105\r
-#define CMD_READ_MEM 0x0106\r
-#define CMD_VERSION 0x0107\r
+#define CMD_DEBUG_PRINT_STRING 0x0100\r
+#define CMD_DEBUG_PRINT_INTEGERS 0x0101\r
+#define CMD_DEBUG_PRINT_BYTES 0x0102\r
+#define CMD_LCD_RESET 0x0103\r
+#define CMD_LCD 0x0104\r
+#define CMD_BUFF_CLEAR 0x0105\r
+#define CMD_READ_MEM 0x0106\r
+#define CMD_VERSION 0x0107\r
\r
// For low-frequency tags\r
-#define CMD_READ_TI_TYPE 0x0202\r
-#define CMD_WRITE_TI_TYPE 0x0203\r
-#define CMD_DOWNLOADED_RAW_BITS_TI_TYPE 0x0204\r
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_125K 0x0205\r
-#define CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K 0x0206\r
-#define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K 0x0207\r
-#define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K 0x0208\r
-#define CMD_DOWNLOADED_SIM_SAMPLES_125K 0x0209\r
-#define CMD_SIMULATE_TAG_125K 0x020A\r
-#define CMD_HID_DEMOD_FSK 0x020B\r
-#define CMD_HID_SIM_TAG 0x020C\r
-#define CMD_SET_LF_DIVISOR 0x020D\r
-#define CMD_LF_SIMULATE_BIDIR 0x020E\r
-#define CMD_SET_ADC_MUX 0x020F\r
+#define CMD_READ_TI_TYPE 0x0202\r
+#define CMD_WRITE_TI_TYPE 0x0203\r
+#define CMD_DOWNLOADED_RAW_BITS_TI_TYPE 0x0204\r
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_125K 0x0205\r
+#define CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K 0x0206\r
+#define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K 0x0207\r
+#define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K 0x0208\r
+#define CMD_DOWNLOADED_SIM_SAMPLES_125K 0x0209\r
+#define CMD_SIMULATE_TAG_125K 0x020A\r
+#define CMD_HID_DEMOD_FSK 0x020B\r
+#define CMD_HID_SIM_TAG 0x020C\r
+#define CMD_SET_LF_DIVISOR 0x020D\r
+#define CMD_LF_SIMULATE_BIDIR 0x020E\r
+#define CMD_SET_ADC_MUX 0x020F\r
/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */\r
\r
// For the 13.56 MHz tags\r
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 0x0300\r
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443 0x0301\r
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM 0x0302\r
-#define CMD_READ_SRI512_TAG 0x0303\r
-#define CMD_READER_ISO_15693 0x0310\r
-#define CMD_SIMTAG_ISO_15693 0x0311\r
-#define CMD_SIMULATE_TAG_HF_LISTEN 0x0380\r
-#define CMD_SIMULATE_TAG_ISO_14443 0x0381\r
-#define CMD_SNOOP_ISO_14443 0x0382\r
-#define CMD_SNOOP_ISO_14443a 0x0383\r
-#define CMD_SIMULATE_TAG_ISO_14443a 0x0384\r
-#define CMD_READER_ISO_14443a 0x0385\r
-#define CMD_SIMULATE_MIFARE_CARD 0x0386\r
-#define CMD_SIMULATE_TAG_LEGIC_RF 0x387\r
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 0x0300\r
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443 0x0301\r
+#define CMD_READ_SRI512_TAG 0x0303\r
+#define CMD_READ_SRIX4K_TAG 0x0304\r
+#define CMD_READER_ISO_15693 0x0310\r
+#define CMD_SIMTAG_ISO_15693 0x0311\r
+#define CMD_SIMULATE_TAG_HF_LISTEN 0x0380\r
+#define CMD_SIMULATE_TAG_ISO_14443 0x0381\r
+#define CMD_SNOOP_ISO_14443 0x0382\r
+#define CMD_SNOOP_ISO_14443a 0x0383\r
+#define CMD_SIMULATE_TAG_ISO_14443a 0x0384\r
+#define CMD_READER_ISO_14443a 0x0385\r
+#define CMD_SIMULATE_MIFARE_CARD 0x0386\r
+#define CMD_SIMULATE_TAG_LEGIC_RF 0x0387\r
+#define CMD_READER_LEGIC_RF 0x0388\r
+#define CMD_READER_MIFARE 0x0389\r
\r
// For measurements of the antenna tuning\r
-#define CMD_MEASURE_ANTENNA_TUNING 0x0400\r
-#define CMD_MEASURED_ANTENNA_TUNING 0x0401\r
-#define CMD_LISTEN_READER_FIELD 0x0402\r
+#define CMD_MEASURE_ANTENNA_TUNING 0x0400\r
+#define CMD_MEASURE_ANTENNA_TUNING_HF 0x0401\r
+#define CMD_MEASURED_ANTENNA_TUNING 0x0410\r
+#define CMD_LISTEN_READER_FIELD 0x0420\r
\r
// For direct FPGA control\r
-#define CMD_FPGA_MAJOR_MODE_OFF 0x0500\r
+#define CMD_FPGA_MAJOR_MODE_OFF 0x0500\r
+\r
+#define CMD_UNKNOWN 0xFFFF\r
+\r
+// CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:\r
+/* Whether a bootloader that understands the common_area is present */ \r
+#define DEVICE_INFO_FLAG_BOOTROM_PRESENT (1<<0)\r
+\r
+/* Whether a osimage that understands the common_area is present */\r
+#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT (1<<1)\r
+\r
+/* Set if the bootloader is currently executing */\r
+#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM (1<<2)\r
+\r
+/* Set if the OS is currently executing */\r
+#define DEVICE_INFO_FLAG_CURRENT_MODE_OS (1<<3)\r
+\r
+/* Set if this device understands the extend start flash command */\r
+#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH (1<<4)\r
\r
-// CMD_DEVICE_INFO response packet has flags in ext1, flag definitions:\r
-#define DEVICE_INFO_FLAG_BOOTROM_PRESENT (1<<0) /* Whether a bootloader that understands the common_area is present */ \r
-#define DEVICE_INFO_FLAG_OSIMAGE_PRESENT (1<<1) /* Whether a osimage that understands the common_area is present */\r
-#define DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM (1<<2) /* Set if the bootloader is currently executing */\r
-#define DEVICE_INFO_FLAG_CURRENT_MODE_OS (1<<3) /* Set if the OS is currently executing */\r
-#define DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH (1<<4) /* Set if this device understands the extend start flash command */\r
+/* CMD_START_FLASH may have three arguments: start of area to flash, \r
+ end of area to flash, optional magic.\r
+ The bootrom will not allow to overwrite itself unless this magic\r
+ is given as third parameter */\r
\r
-// CMD_START_FLASH may have three arguments: start of area to flash, end of area to flash, optional magic defined below\r
-#define START_FLASH_MAGIC 0x54494f44 /* The bootrom will not allow to overwrite itself unless this magic is given as third parameter */\r
+#define START_FLASH_MAGIC 0x54494f44 // 'DOIT'\r
\r
#endif\r
projects / proxmark3-svn / blobdiff