correctly calculate device_info_size, as all struct members are known now

[usb-driver] / usb-driver.h

diff --git a/usb-driver.h b/usb-driver.h
index 51e4b6ed4d70efff74b2fdd58e1b0e9bea4f9206..f911a8f22faeeef924cebb683b1873c973a8c525 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 {
@@ -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,10 @@ struct wdu_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;
+
+};