revert most of last 64bit cleanup, as windrvr doesn't do it this way

[usb-driver] / usb-driver.h

diff --git a/usb-driver.h b/usb-driver.h
index f911a8f22faeeef924cebb683b1873c973a8c525..e67194ea0860f9b6710662f1b06a65f47e8b73c1 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -219,8 +219,8 @@ typedef struct
        {
                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;
@@ -353,10 +353,15 @@ struct usb_device_info {
        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,
+       WDU_DIR_IN_OUT = 3
+} WDU_DIR;
+
+typedef enum {
+       PIPE_TYPE_CONTROL     = 0,
+       PIPE_TYPE_ISOCHRONOUS = 1,
+       PIPE_TYPE_BULK        = 2,
+       PIPE_TYPE_INTERRUPT   = 3
+} USB_PIPE_TYPE;