Fixed so correct sizes are used across different architectures in the binlib

[proxmark3-svn] / include / usb_cmd.h

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 62c0acd78d07e485b50544fe72b65c5d4f6488f0..eec849b8916310860fb074bc6c63c2023332a5e2 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -23,15 +23,6 @@ typedef BYTE uint8_t;
 #define PACKED __attribute__((packed))
 #endif
 
 #define PACKED __attribute__((packed))
 #endif
 

-typedef struct {
-  uint32_t     cmd;
-  uint32_t     arg[3];
-  union {
-    uint8_t            asBytes[48];
-    uint32_t   asDwords[12];
-  } d;
-} PACKED HidCommand;
-

 #define USB_CMD_DATA_SIZE 512
 
 typedef struct {
 #define USB_CMD_DATA_SIZE 512
 
 typedef struct {


@@ -82,7 +73,12 @@ typedef struct {
 #define CMD_INDALA_CLONE_TAG                                              0x0212
 // for 224 bits UID
 #define CMD_INDALA_CLONE_TAG_L                                            0x0213
 #define CMD_INDALA_CLONE_TAG                                              0x0212
 // for 224 bits UID
 #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_PCF7931_READ                                                  0x0217
+#define CMD_EM4X_READ_WORD                                                0x0218
+#define CMD_EM4X_WRITE_WORD                                               0x0219

 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags