git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/include/usb_cmd.h b/include/usb_cmd.h

index 132e1805d31c8fb6fd5c987ec5d01033f6c67dcf..0ab9730ed10ae09c4942c79cc129ca2e81c03840 100644 (file)

--- a/include/usb_cmd.h

+++ b/include/usb_cmd.h

@@ -60,6 +60,8 @@ typedef struct{

#define CMD_BUFF_CLEAR 0x0105

#define CMD_READ_MEM 0x0106

#define CMD_VERSION 0x0107

+#define CMD_STATUS 0x0108

+#define CMD_PING 0x0109

// For low-frequency tags

#define CMD_READ_TI_TYPE 0x0202

@@ -83,8 +85,9 @@ typedef struct{

#define CMD_INDALA_CLONE_TAG_L 0x0213

#define CMD_T55XX_READ_BLOCK 0x0214

#define CMD_T55XX_WRITE_BLOCK 0x0215

-#define CMD_T55XX_READ_TRACE 0x0216

+#define CMD_T55XX_RESET_READ 0x0216

#define CMD_PCF7931_READ 0x0217

+#define CMD_PCF7931_WRITE 0x0222

#define CMD_EM4X_READ_WORD 0x0218

#define CMD_EM4X_WRITE_WORD 0x0219

#define CMD_IO_DEMOD_FSK 0x021A

@@ -95,6 +98,11 @@ typedef struct{

#define CMD_FSK_SIM_TAG 0x021E

#define CMD_ASK_SIM_TAG 0x021F

#define CMD_PSK_SIM_TAG 0x0220

+#define CMD_AWID_DEMOD_FSK 0x0221

+#define CMD_VIKING_CLONE_TAG 0x0223

+#define CMD_T55XX_WAKEUP 0x0224

+#define CMD_COTAG 0x0225

+

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

@@ -117,6 +125,13 @@ typedef struct{

#define CMD_SIMULATE_HITAG 0x0371

#define CMD_READER_HITAG 0x0372

+#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_SIMULATE_TAG_ISO_14443B 0x0381

#define CMD_SNOOP_ISO_14443B 0x0382

#define CMD_SNOOP_ISO_14443a 0x0383

@@ -126,13 +141,19 @@ typedef struct{

#define CMD_READER_LEGIC_RF 0x0388

#define CMD_WRITER_LEGIC_RF 0x0389

#define CMD_EPA_PACE_COLLECT_NONCE 0x038A

+#define CMD_EPA_PACE_REPLAY 0x038B

+#define CMD_ICLASS_READCHECK 0x038F

+#define CMD_ICLASS_CLONE 0x0390

+#define CMD_ICLASS_DUMP 0x0391

#define CMD_SNOOP_ICLASS 0x0392

#define CMD_SIMULATE_TAG_ICLASS 0x0393

#define CMD_READER_ICLASS 0x0394

#define CMD_READER_ICLASS_REPLAY 0x0395

-#define CMD_ICLASS_ISO14443A_WRITE 0x0397

+#define CMD_ICLASS_READBLOCK 0x0396

+#define CMD_ICLASS_WRITEBLOCK 0x0397

#define CMD_ICLASS_EML_MEMSET 0x0398

+#define CMD_ICLASS_AUTHENTICATION 0x0399

// For measurements of the antenna tuning

#define CMD_MEASURE_ANTENNA_TUNING 0x0400

@@ -159,6 +180,7 @@ typedef struct{

#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

@@ -186,14 +208,18 @@ typedef struct{

#define CMD_MIFARE_DESFIRE_INFO 0x072d

#define CMD_MIFARE_DESFIRE 0x072e

+#define CMD_HF_SNIFFER 0x0800

+

#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_NR_AR_ATTACK 0x08

+#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_RANDOM_NONCE 0x20

//Iclass reader flags

@@ -203,7 +229,13 @@ typedef struct{

#define FLAG_ICLASS_READER_CONF 0x08

#define FLAG_ICLASS_READER_AA 0x10

#define FLAG_ICLASS_READER_ONE_TRY 0x20

+#define FLAG_ICLASS_READER_CEDITKEY 0x40

+

+//hw tune args

+#define FLAG_TUNE_LF 1

+#define FLAG_TUNE_HF 2

+#define FLAG_TUNE_ALL 3

// CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions: