FIX: increased time-out to match 2.7sec it takes to write 256bytes.

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 19618e957b64e0000b8d78ceec0d05042b1f14e8..3fd2cedd9cdaf256d0c41f9ae2c762fb7bcac2e0 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -13,14 +13,14 @@
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 #ifdef _MSC_VER
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 #ifdef _MSC_VER

-typedef DWORD uint32_t;
-typedef BYTE uint8_t;
-#define PACKED
-// stuff
+   typedef DWORD uint32_t;
+   typedef BYTE uint8_t;
+   #define PACKED
+   // stuff

 #else
 #else

-#include <stdint.h>
-#include <stdbool.h>
-#define PACKED __attribute__((packed))
+  #include <stdint.h>
+  #include <stdbool.h>
+  #define PACKED __attribute__((packed))

 #endif
 
 #define USB_CMD_DATA_SIZE 512
 #endif
 
 #define USB_CMD_DATA_SIZE 512


@@ -138,12 +138,18 @@ typedef struct{
 #define CMD_SNOOP_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385
 #define CMD_SNOOP_ISO_14443a                                              0x0383
 #define CMD_SIMULATE_TAG_ISO_14443a                                       0x0384
 #define CMD_READER_ISO_14443a                                             0x0385

+#define CMD_RAW_WRITER_LEGIC_RF                                           0x0386

 #define CMD_SIMULATE_TAG_LEGIC_RF                                         0x0387
 #define CMD_READER_LEGIC_RF                                               0x0388
 #define CMD_WRITER_LEGIC_RF                                               0x0389
 #define CMD_SIMULATE_TAG_LEGIC_RF                                         0x0387
 #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_EPA_PACE_COLLECT_NONCE                                        0x038A
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 

+#define CMD_LEGIC_INFO                                                                                                   0x03BC
+#define CMD_LEGIC_ESET                                                                                                   0x03BD
+#define CMD_LEGIC_EGET                                                                                                   0x03BE
+

 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
 #define CMD_ICLASS_DUMP                                                   0x0391


@@ -213,6 +219,18 @@ 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
+#define CMD_EMV_CLONE                                                     0x0702
+#define CMD_EMV_SIM                                                       0x0703
+#define CMD_EMV_TEST                                                      0x0704
+#define CMD_EMV_FUZZ_RATS                                                 0x0705
+#define CMD_EMV_GET_RANDOM_NUM                                            0x0706
+#define CMD_EMV_LOAD_VALUE                                                0x0707
+#define CMD_EMV_DUMP_CARD                                                 0x0708
+

 #define CMD_UNKNOWN                                                       0xFFFF
 
 
 #define CMD_UNKNOWN                                                       0xFFFF
 
 


@@ -222,7 +240,7 @@ typedef struct{
 #define FLAG_7B_UID_IN_DATA    0x04
 #define FLAG_10B_UID_IN_DATA   0x08
 #define FLAG_UID_IN_EMUL               0x10
 #define FLAG_7B_UID_IN_DATA    0x04
 #define FLAG_10B_UID_IN_DATA   0x08
 #define FLAG_UID_IN_EMUL               0x10

-#define FLAG_NR_AR_ATTACK              0x12
+#define FLAG_NR_AR_ATTACK              0x20

 
 
 //Iclass reader flags
 
 
 //Iclass reader flags