remove ugly defines for 64bit support and solve the problem in a

[usb-driver] / usb-driver.h

diff --git a/usb-driver.h b/usb-driver.h
index 9a0329b576273a6c3d228cea903c0218bdaabf13..cca83a56198e772bb69cc67d89d1b2b84f050d45 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -12,6 +12,11 @@
 #define INT_ENABLE             0x98e
 #define EVENT_PULL             0x988
 #define USB_SET_INTERFACE      0x981
 #define INT_ENABLE             0x98e
 #define EVENT_PULL             0x988
 #define USB_SET_INTERFACE      0x981

+#define CARD_REGISTER_OLD      0x97d
+#define INT_ENABLE_OLD         0x91e
+#define USB_GET_DEVICE_DATA_OLD        0x980
+#define EVENT_REGISTER_OLD     0x986
+#define TRANSFER_OLD           0x903

 
 #define MAGIC 0xa410b413UL
 
 
 #define MAGIC 0xa410b413UL
 


@@ -219,8 +224,8 @@ typedef struct
        {
                unsigned char Byte;     // Use for 8 bit transfer.
                unsigned short Word;     // Use for 16 bit transfer.
        {
                unsigned char Byte;     // Use for 8 bit transfer.
                unsigned short Word;     // Use for 16 bit transfer.

-               unsigned int Dword;   // Use for 32 bit transfer.
-               unsigned long long Qword;  // Use for 64 bit transfer.
+               uint32_t Dword;   // Use for 32 bit transfer.
+               uint64_t Qword;  // Use for 64 bit transfer.

                void* pBuffer; // Use for string transfer.
        } Data;
 } WD_TRANSFER, WD_TRANSFER_V61;
                void* pBuffer; // Use for string transfer.
        } Data;
 } WD_TRANSFER, WD_TRANSFER_V61;


@@ -353,14 +358,6 @@ struct usb_device_info {
        WDU_INTERFACE *pActiveInterface[WD_USB_MAX_INTERFACES];
 };
 
        WDU_INTERFACE *pActiveInterface[WD_USB_MAX_INTERFACES];
 };
 

-struct usb_device_info_get {
-       WDU_DEVICE_DESCRIPTOR Descriptor;
-       WDU_PIPE_INFO Pipe0;
-       unsigned char dummy[128];
-       WDU_CONFIGURATION cfg;
-
-};
-

 typedef enum {
        WDU_DIR_IN     = 1,
        WDU_DIR_OUT    = 2,
 typedef enum {
        WDU_DIR_IN     = 1,
        WDU_DIR_OUT    = 2,