PCF7931: Print found single/consecutive block(s), fixes to block 1 check

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 66e6cf91cea3529422532a746d8ac2185eee993d..c998bf941151e33f1bc1ec0a839d1883de00a6b4 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -33,6 +33,7 @@ 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;
 // A struct used to send sample-configs over USB
 typedef struct{
        uint8_t decimation;


@@ -40,6 +41,7 @@ typedef struct{
        bool averaging;
        int divisor;
        int trigger_threshold;
        bool averaging;
        int divisor;
        int trigger_threshold;

+       int samples_to_skip;

 } sample_config;
 
 // For the bootloader
 } sample_config;
 
 // For the bootloader


@@ -60,8 +62,20 @@ typedef struct{
 #define CMD_BUFF_CLEAR                                                    0x0105
 #define CMD_READ_MEM                                                      0x0106
 #define CMD_VERSION                                                       0x0107
 #define CMD_BUFF_CLEAR                                                    0x0105
 #define CMD_READ_MEM                                                      0x0106
 #define CMD_VERSION                                                       0x0107

-#define CMD_STATUS                                                                                                               0x0108
-#define CMD_PING                                                                                                                 0x0109
+#define CMD_STATUS                                                        0x0108
+#define CMD_PING                                                          0x0109
+
+// controlling the ADC input multiplexer
+#define CMD_SET_ADC_MUX                                                   0x020F
+
+// RDV40,  Smart card operations
+#define CMD_SMART_RAW                                                     0x0140
+#define CMD_SMART_UPGRADE                                                 0x0141
+#define CMD_SMART_UPLOAD                                                  0x0142
+#define CMD_SMART_ATR                                                     0x0143
+// CMD_SMART_SETBAUD is unused for now
+#define CMD_SMART_SETBAUD                                                 0x0144
+#define CMD_SMART_SETCLOCK                                                0x0145

 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202
 
 // For low-frequency tags
 #define CMD_READ_TI_TYPE                                                  0x0202


@@ -77,7 +91,6 @@ typedef struct{
 #define CMD_HID_SIM_TAG                                                   0x020C
 #define CMD_SET_LF_DIVISOR                                                0x020D
 #define CMD_LF_SIMULATE_BIDIR                                             0x020E
 #define CMD_HID_SIM_TAG                                                   0x020C
 #define CMD_SET_LF_DIVISOR                                                0x020D
 #define CMD_LF_SIMULATE_BIDIR                                             0x020E

-#define CMD_SET_ADC_MUX                                                   0x020F

 #define CMD_HID_CLONE_TAG                                                 0x0210
 #define CMD_EM410X_WRITE_TAG                                              0x0211
 #define CMD_INDALA_CLONE_TAG                                              0x0212
 #define CMD_HID_CLONE_TAG                                                 0x0210
 #define CMD_EM410X_WRITE_TAG                                              0x0211
 #define CMD_INDALA_CLONE_TAG                                              0x0212


@@ -88,6 +101,7 @@ typedef struct{
 #define CMD_T55XX_RESET_READ                                              0x0216
 #define CMD_PCF7931_READ                                                  0x0217
 #define CMD_PCF7931_WRITE                                                 0x0222
 #define CMD_T55XX_RESET_READ                                              0x0216
 #define CMD_PCF7931_READ                                                  0x0217
 #define CMD_PCF7931_WRITE                                                 0x0222

+#define CMD_PCF7931_BRUTEFORCE                                            0x0227

 #define CMD_EM4X_READ_WORD                                                0x0218
 #define CMD_EM4X_WRITE_WORD                                               0x0219
 #define CMD_IO_DEMOD_FSK                                                  0x021A
 #define CMD_EM4X_READ_WORD                                                0x0218
 #define CMD_EM4X_WRITE_WORD                                               0x0219
 #define CMD_IO_DEMOD_FSK                                                  0x021A


@@ -101,9 +115,9 @@ typedef struct{
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0223
 #define CMD_T55XX_WAKEUP                                                  0x0224
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0223
 #define CMD_T55XX_WAKEUP                                                  0x0224

-
-
-/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
+#define CMD_COTAG                                                         0x0225
+#define CMD_PARADOX_CLONE_TAG                                             0x0226
+#define CMD_EM4X_PROTECT                                                  0x0228

 
 // For the 13.56 MHz tags
 #define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693                             0x0300
 
 // For the 13.56 MHz tags
 #define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693                             0x0300


@@ -112,24 +126,24 @@ typedef struct{
 #define CMD_ISO_14443B_COMMAND                                            0x0305
 #define CMD_READER_ISO_15693                                              0x0310
 #define CMD_SIMTAG_ISO_15693                                              0x0311
 #define CMD_ISO_14443B_COMMAND                                            0x0305
 #define CMD_READER_ISO_15693                                              0x0310
 #define CMD_SIMTAG_ISO_15693                                              0x0311

-#define CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693                              0x0312
+#define CMD_SNOOP_ISO_15693                                               0x0312

 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
 #define CMD_ISO_15693_DEBUG                                               0x0316
 #define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317
 #define CMD_ISO_15693_COMMAND                                             0x0313
 #define CMD_ISO_15693_COMMAND_DONE                                        0x0314
 #define CMD_ISO_15693_FIND_AFI                                            0x0315
 #define CMD_ISO_15693_DEBUG                                               0x0316
 #define CMD_LF_SNOOP_RAW_ADC_SAMPLES                                      0x0317

+#define CMD_CSETUID_ISO_15693                                             0x0318

 
 // For Hitag2 transponders
 #define CMD_SNOOP_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372
 
 // For Hitag2 transponders
 #define CMD_SNOOP_HITAG                                                   0x0370
 #define CMD_SIMULATE_HITAG                                                0x0371
 #define CMD_READER_HITAG                                                  0x0372

-

 #define CMD_SIMULATE_HITAG_S                                              0x0368
 #define CMD_SIMULATE_HITAG_S                                              0x0368

-#define CMD_TEST_HITAGS_TRACES                                           0x0367
-#define CMD_READ_HITAG_S                                                 0x0373
-#define CMD_WR_HITAG_S                                                   0x0375
-#define CMD_EMU_HITAG_S                                                          0x0376
-
+#define CMD_TEST_HITAGS_TRACES                                            0x0367
+#define CMD_READ_HITAG_S                                                  0x0373
+#define CMD_READ_HITAG_S_BLK                                              0x0374
+#define CMD_WR_HITAG_S                                                    0x0375
+#define CMD_EMU_HITAG_S                                                   0x0376

 
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
 #define CMD_SNOOP_ISO_14443B                                              0x0382
 
 #define CMD_SIMULATE_TAG_ISO_14443B                                       0x0381
 #define CMD_SNOOP_ISO_14443B                                              0x0382


@@ -174,11 +188,13 @@ typedef struct{
 #define CMD_MIFARE_CSETBLOCK                                              0x0605
 #define CMD_MIFARE_CGETBLOCK                                              0x0606
 #define CMD_MIFARE_CIDENT                                                 0x0607
 #define CMD_MIFARE_CSETBLOCK                                              0x0605
 #define CMD_MIFARE_CGETBLOCK                                              0x0606
 #define CMD_MIFARE_CIDENT                                                 0x0607

+#define CMD_MIFARE_CWIPE                                                  0x0608

 
 #define CMD_SIMULATE_MIFARE_CARD                                          0x0610
 
 #define CMD_READER_MIFARE                                                 0x0611
 #define CMD_MIFARE_NESTED                                                 0x0612
 
 #define CMD_SIMULATE_MIFARE_CARD                                          0x0610
 
 #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
 
 #define CMD_MIFARE_READBL                                                 0x0620
 #define CMD_MIFAREU_READBL                                                0x0720


@@ -207,16 +223,17 @@ typedef struct{
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
 #define CMD_HF_SNIFFER                                                    0x0800
 #define CMD_MIFARE_DESFIRE                                                0x072e
 
 #define CMD_HF_SNIFFER                                                    0x0800

+#define CMD_HF_PLOT                                                       0x0801

 
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
 //Mifare simulation flags
 
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
 //Mifare simulation flags

-#define FLAG_INTERACTIVE      0x01
-#define FLAG_4B_UID_IN_DATA   0x02
-#define FLAG_7B_UID_IN_DATA   0x04
-#define FLAG_10B_UID_IN_DATA  0x08
-#define FLAG_NR_AR_ATTACK     0x10
+#define FLAG_INTERACTIVE                (1<<0)
+#define FLAG_4B_UID_IN_DATA             (1<<1)
+#define FLAG_7B_UID_IN_DATA             (1<<2)
+#define FLAG_NR_AR_ATTACK               (1<<4)
+#define FLAG_RANDOM_NONCE               (1<<5)

 
 
 //Iclass reader flags
 
 
 //Iclass reader flags


@@ -234,6 +251,10 @@ typedef struct{
 #define FLAG_TUNE_HF   2
 #define FLAG_TUNE_ALL  3
 
 #define FLAG_TUNE_HF   2
 #define FLAG_TUNE_ALL  3
 

+// Hardware capabilities
+#define HAS_EXTRA_FLASH_MEM    (1 << 0)
+#define HAS_SMARTCARD_SLOT     (1 << 1)
+

 
 // 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 */