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

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

index 9ef929b918e3f1c6fd23f032cfefb1d0d39c3907..0802d2f165cfeb96028b93b3a6f45e1e76ccb039 100644 (file)

--- a/include/usb_cmd.h

+++ b/include/usb_cmd.h

@@ -41,6 +41,7 @@ typedef struct{

bool averaging;

int divisor;

int trigger_threshold;

+ int samples_to_skip;

} sample_config;

// For the bootloader

@@ -116,6 +117,7 @@ typedef struct{

#define CMD_T55XX_WAKEUP 0x0224

#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

@@ -130,6 +132,7 @@ typedef struct{

#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

@@ -153,7 +156,6 @@ typedef struct{

#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

@@ -194,17 +196,17 @@ typedef struct{

#define CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES 0x0613

#define CMD_MIFARE_READBL 0x0620

-#define CMD_MIFAREU_READBL 0x0720

#define CMD_MIFARE_READSC 0x0621

-#define CMD_MIFAREU_READCARD 0x0721

#define CMD_MIFARE_WRITEBL 0x0622

-#define CMD_MIFAREU_WRITEBL 0x0722

-#define CMD_MIFAREU_WRITEBL_COMPAT 0x0723

-

#define CMD_MIFARE_CHKKEYS 0x0623

-

+#define CMD_MIFARE_PERSONALIZE_UID 0x0624

#define CMD_MIFARE_SNIFFER 0x0630

+

//ultralightC

+#define CMD_MIFAREU_READBL 0x0720

+#define CMD_MIFAREU_READCARD 0x0721

+#define CMD_MIFAREU_WRITEBL 0x0722

+#define CMD_MIFAREU_WRITEBL_COMPAT 0x0723

#define CMD_MIFAREUC_AUTH 0x0724

//0x0725 and 0x0726 no longer used

#define CMD_MIFAREUC_SETPWD 0x0727

@@ -225,7 +227,7 @@ typedef struct{

#define CMD_UNKNOWN 0xFFFF

-//Mifare simulation flags

+// Mifare simulation flags

#define FLAG_INTERACTIVE (1<<0)

#define FLAG_4B_UID_IN_DATA (1<<1)

#define FLAG_7B_UID_IN_DATA (1<<2)

@@ -233,7 +235,7 @@ typedef struct{

#define FLAG_RANDOM_NONCE (1<<5)

-//Iclass reader flags

+// iCLASS reader flags

#define FLAG_ICLASS_READER_ONLY_ONCE 0x01

#define FLAG_ICLASS_READER_CC 0x02

#define FLAG_ICLASS_READER_CSN 0x04

@@ -242,8 +244,16 @@ typedef struct{

#define FLAG_ICLASS_READER_ONE_TRY 0x20

#define FLAG_ICLASS_READER_CEDITKEY 0x40

+// iCLASS simulation modes

+#define ICLASS_SIM_MODE_CSN 0

+#define ICLASS_SIM_MODE_CSN_DEFAULT 1

+#define ICLASS_SIM_MODE_READER_ATTACK 2

+#define ICLASS_SIM_MODE_FULL 3

+#define ICLASS_SIM_MODE_READER_ATTACK_KEYROLL 4

+#define ICLASS_SIM_MODE_EXIT_AFTER_MAC 5 // note: device internal only

+

-//hw tune args

+// hw tune args

#define FLAG_TUNE_LF 1

#define FLAG_TUNE_HF 2

#define FLAG_TUNE_ALL 3