Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 111f7ec7693272610e4cc7426ecbe8ec581be0cc..c3951320d63a95dd103a9633010a6a38be85bfea 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -33,6 +33,14 @@ typedef struct {
     uint32_t asDwords[USB_CMD_DATA_SIZE/4];
   } d;
 } PACKED UsbCommand;
     uint32_t asDwords[USB_CMD_DATA_SIZE/4];
   } 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
 
 // For the bootloader
 #define CMD_DEVICE_INFO                                                   0x0000


@@ -81,7 +89,12 @@ typedef struct {
 #define CMD_EM4X_WRITE_WORD                                               0x0219
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B
 #define CMD_EM4X_WRITE_WORD                                               0x0219
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_IO_CLONE_TAG                                                  0x021B

-#define CMD_EM410X_DEMOD                                                                                                 0x021c
+#define CMD_EM410X_DEMOD                                                  0x021c
+// Sampling configuration for LF reader/snooper
+#define CMD_SET_LF_SAMPLING_CONFIG                                        0x021d
+#define CMD_FSK_SIM_TAG                                                   0x021E
+#define CMD_ASK_SIM_TAG                                                   0x021F
+#define CMD_PSK_SIM_TAG                                                   0x0220

 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 


@@ -122,6 +135,7 @@ typedef struct {
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                                                                 0x0395
 #define CMD_ICLASS_ISO14443A_WRITE                                                                               0x0397
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY                                                                                 0x0395
 #define CMD_ICLASS_ISO14443A_WRITE                                                                               0x0397

+#define CMD_ICLASS_EML_MEMSET                                             0x0398

 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400


@@ -188,6 +202,8 @@ typedef struct {
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01

+#define FLAG_ICLASS_READER_GET_CC       0x02
+

 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
 
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */