Added the new SRIX4K reading routine, thanks to jonor. Regression tested against...

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 6818bb5e98991b0522b2521e5c6b0b76f60144a8..76b543f6effa971a029f71e14d2084277f9a3ade 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -25,6 +25,7 @@ typedef struct {
 #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
@@ -35,6 +36,7 @@ typedef struct {
 #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
@@ -49,13 +51,17 @@ typedef struct {
 #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_READ_SRIX4K_TAG                                                    0x0304\r
+#define CMD_READER_ISO_15693                                                                                                   0x0310
 #define CMD_SIMTAG_ISO_15693                                                                                                   0x0311\r
 #define CMD_SIMULATE_TAG_HF_LISTEN                                                                             0x0380\r
 #define CMD_SIMULATE_TAG_ISO_14443                                                                             0x0381\r
@@ -64,6 +70,8 @@ typedef struct {
 #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_READER_LEGIC_RF                                            0x388\r
 \r
 // For measurements of the antenna tuning\r
 #define CMD_MEASURE_ANTENNA_TUNING                                                                             0x0400\r
@@ -73,4 +81,14 @@ typedef struct {
 // For direct FPGA control\r
 #define CMD_FPGA_MAJOR_MODE_OFF                                                                                                0x0500\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
+\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
+\r
 #endif\r