ADD: `analyse nuid` - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1...

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 3fd2cedd9cdaf256d0c41f9ae2c762fb7bcac2e0..e312f93ac1c92d9f31bcb4770de02e0ad73150df 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -12,6 +12,7 @@
 
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 
 #ifndef __USB_CMD_H
 #define __USB_CMD_H

+

 #ifdef _MSC_VER
    typedef DWORD uint32_t;
    typedef BYTE uint8_t;
 #ifdef _MSC_VER
    typedef DWORD uint32_t;
    typedef BYTE uint8_t;


@@ -104,6 +105,7 @@ typedef struct{
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0222
 #define CMD_T55XX_WAKEUP                                                     0x0224
 #define CMD_AWID_DEMOD_FSK                                                0x0221
 #define CMD_VIKING_CLONE_TAG                                              0x0222
 #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 */
 
 
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 


@@ -205,7 +207,6 @@ typedef struct{
 //0x0725 and 0x0726 no longer used 
 #define CMD_MIFAREUC_SETPWD                                               0x0727
 
 //0x0725 and 0x0726 no longer used 
 #define CMD_MIFAREUC_SETPWD                                               0x0727
 

-

 // mifare desfire
 #define CMD_MIFARE_DESFIRE_READBL                                         0x0728
 #define CMD_MIFARE_DESFIRE_WRITEBL                                        0x0729
 // mifare desfire
 #define CMD_MIFARE_DESFIRE_READBL                                         0x0728
 #define CMD_MIFARE_DESFIRE_WRITEBL                                        0x0729


@@ -219,7 +220,6 @@ typedef struct{
 
 #define CMD_HF_SNIFFER                                                    0x0800
 
 
 #define CMD_HF_SNIFFER                                                    0x0800
 

-

 // For EMV Commands
 #define CMD_EMV_READ_RECORD                                               0x0700
 #define CMD_EMV_TRANSACTION                                               0x0701
 // For EMV Commands
 #define CMD_EMV_READ_RECORD                                               0x0700
 #define CMD_EMV_TRANSACTION                                               0x0701


@@ -233,7 +233,6 @@ typedef struct{
 
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
 #define CMD_UNKNOWN                                                       0xFFFF
 

-

 //Mifare simulation flags
 #define FLAG_INTERACTIVE               0x01
 #define FLAG_4B_UID_IN_DATA    0x02
 //Mifare simulation flags
 #define FLAG_INTERACTIVE               0x01
 #define FLAG_4B_UID_IN_DATA    0x02


@@ -241,7 +240,7 @@ typedef struct{
 #define FLAG_10B_UID_IN_DATA   0x08
 #define FLAG_UID_IN_EMUL               0x10
 #define FLAG_NR_AR_ATTACK              0x20
 #define FLAG_10B_UID_IN_DATA   0x08
 #define FLAG_UID_IN_EMUL               0x10
 #define FLAG_NR_AR_ATTACK              0x20

-
+//#define FLAG_RANDOM_NONCE            0x40

 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01
 
 //Iclass reader flags
 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01


@@ -252,8 +251,6 @@ typedef struct{
 #define FLAG_ICLASS_READER_ONE_TRY      0x20
 #define FLAG_ICLASS_READER_CEDITKEY     0x40
 
 #define FLAG_ICLASS_READER_ONE_TRY      0x20
 #define FLAG_ICLASS_READER_CEDITKEY     0x40
 

-
-

 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
 #define DEVICE_INFO_FLAG_BOOTROM_PRESENT               (1<<0)
 // CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
 /* Whether a bootloader that understands the common_area is present */
 #define DEVICE_INFO_FLAG_BOOTROM_PRESENT               (1<<0)