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 51e4b6ed4d70efff74b2fdd58e1b0e9bea4f9206..e67194ea0860f9b6710662f1b06a65f47e8b73c1 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -15,6 +15,8 @@
 
 #define MAGIC 0xa410b413UL
 
+#define WDU_GET_MAX_PACKET_SIZE(x)                ((unsigned short) (((x) & 0x7ff) * (1 + (((x) & 0x1800) >> 11))))
+
 /* http://www.jungo.com/support/documentation/windriver/811/wdusb_man_mhtml/node78.html#SECTION001734000000000000000 */
 
 struct header_struct {
@@ -217,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;
@@ -343,7 +345,7 @@ typedef struct
        WDU_INTERFACE *pInterfaces;
 } WDU_CONFIGURATION;
 
-struct wdu_device_info {
+struct usb_device_info {
        WDU_DEVICE_DESCRIPTOR Descriptor;
        WDU_PIPE_INFO Pipe0;
        WDU_CONFIGURATION *pConfigs;
@@ -351,3 +353,15 @@ struct wdu_device_info {
        WDU_INTERFACE *pActiveInterface[WD_USB_MAX_INTERFACES];
 };
 
+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;