X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f23e056d950c72582ddb1d3d68ad5d012541afff..ba8a80b30c4da36ef10854b53b06d9ff9acaca44:/include/usb_cmd.h?ds=sidebyside

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 78b48425..b5c438c6 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -20,57 +20,58 @@ typedef struct {
 } UsbCommand;
 
 // For the bootloader
-#define CMD_DEVICE_INFO								0x0000
-#define CMD_SETUP_WRITE								0x0001
-#define CMD_FINISH_WRITE							0x0003
-#define CMD_HARDWARE_RESET							0x0004
-#define CMD_START_FLASH								0x0005
-#define CMD_ACK										0x00ff
+#define CMD_DEVICE_INFO																0x0000
+#define CMD_SETUP_WRITE																0x0001
+#define CMD_FINISH_WRITE															0x0003
+#define CMD_HARDWARE_RESET														0x0004
+#define CMD_START_FLASH																0x0005
+#define CMD_ACK																				0x00ff
 
 // For general mucking around
-#define CMD_DEBUG_PRINT_STRING						0x0100
-#define CMD_DEBUG_PRINT_INTEGERS					0x0101
-#define CMD_DEBUG_PRINT_BYTES						0x0102
-#define CMD_LCD_RESET								0x0103
-#define CMD_LCD										0x0104
-#define CMD_BUFF_CLEAR							0x0105
+#define CMD_DEBUG_PRINT_STRING												0x0100
+#define CMD_DEBUG_PRINT_INTEGERS											0x0101
+#define CMD_DEBUG_PRINT_BYTES													0x0102
+#define CMD_LCD_RESET																	0x0103
+#define CMD_LCD																				0x0104
+#define CMD_BUFF_CLEAR																0x0105
+#define CMD_READ_MEM																	0x0106
+#define CMD_VERSION																	0x0107
 
 // For low-frequency tags
-#define CMD_ACQUIRE_RAW_BITS_TI_TYPE				0x0200
-#define CMD_DOWNLOAD_RAW_BITS_TI_TYPE				0x0201
-#define CMD_DOWNLOADED_RAW_BITS_TI_TYPE				0x0202
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_125K			0x0203
-#define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K			0x0204
-#define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K			0x0205
-#define CMD_DOWNLOADED_SIM_SAMPLES_125K				0x0206
-#define CMD_SIMULATE_TAG_125K						0x0207
-#define CMD_HID_DEMOD_FSK							0x0208	// ## New command: demodulate HID tag ID
-#define CMD_HID_SIM_TAG								0x0209	// ## New command: simulate HID tag by ID
-#define CMD_SET_LF_DIVISOR							0x020A
-#define CMD_SWEEP_LF								0x020B
+#define CMD_READ_TI_TYPE															0x0202
+#define CMD_WRITE_TI_TYPE															0x0203
+#define CMD_DOWNLOADED_RAW_BITS_TI_TYPE								0x0204
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_125K							0x0205
+#define CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K			0x0206
+#define CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K							0x0207
+#define CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K						0x0208
+#define CMD_DOWNLOADED_SIM_SAMPLES_125K								0x0209
+#define CMD_SIMULATE_TAG_125K													0x020A
+#define CMD_HID_DEMOD_FSK															0x020B
+#define CMD_HID_SIM_TAG																0x020C
+#define CMD_SET_LF_DIVISOR														0x020D
 
 // For the 13.56 MHz tags
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693		0x0300
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443		0x0301
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM	0x0302
-#define CMD_READ_SRI512_TAG							0x0303
-#define CMD_READER_ISO_15693						0x0310	// ## New command to act like a 15693 reader - greg
-#define CMD_SIMTAG_ISO_15693						0x0311	// ## New command to act like a 15693 reader - greg
-
-#define CMD_SIMULATE_TAG_HF_LISTEN					0x0380
-#define CMD_SIMULATE_TAG_ISO_14443					0x0381
-#define CMD_SNOOP_ISO_14443							0x0382
-#define CMD_SNOOP_ISO_14443a						0x0383	// ## New snoop command
-#define CMD_SIMULATE_TAG_ISO_14443a					0x0384	// ## New command: Simulate tag 14443a
-#define CMD_READER_ISO_14443a						0x0385	// ## New command to act like a 14443a reader
-#define CMD_SIMULATE_MIFARE_CARD					0x0386
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693					0x0300
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443					0x0301
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM			0x0302
+#define CMD_READ_SRI512_TAG														0x0303
+#define CMD_READER_ISO_15693													0x0310
+#define CMD_SIMTAG_ISO_15693													0x0311
+#define CMD_SIMULATE_TAG_HF_LISTEN										0x0380
+#define CMD_SIMULATE_TAG_ISO_14443										0x0381
+#define CMD_SNOOP_ISO_14443														0x0382
+#define CMD_SNOOP_ISO_14443a													0x0383
+#define CMD_SIMULATE_TAG_ISO_14443a										0x0384
+#define CMD_READER_ISO_14443a													0x0385
+#define CMD_SIMULATE_MIFARE_CARD											0x0386
 
 // For measurements of the antenna tuning
-#define CMD_MEASURE_ANTENNA_TUNING					0x0400
-#define CMD_MEASURED_ANTENNA_TUNING					0x0401
+#define CMD_MEASURE_ANTENNA_TUNING										0x0400
+#define CMD_MEASURED_ANTENNA_TUNING										0x0401
+#define CMD_LISTEN_READER_FIELD												0x0402
 
 // For direct FPGA control
-#define CMD_FPGA_MAJOR_MODE_OFF						0x0500	// ## FPGA Control
-#define CMD_TEST									0x0501
+#define CMD_FPGA_MAJOR_MODE_OFF												0x0500
 
 #endif