Changeset 66989 in vbox for trunk/src/VBox

Timestamp:

May 19, 2017 2:42:59 PM (8 years ago)

Author:

vboxsync

Message:

VUSB: Collect opaque class-specific data between config and interface descriptors. See bugref:8769

Location:

trunk/src/VBox/Devices

Files:

• Input/UsbKbd.cpp (modified) (1 diff)
• Input/UsbMouse.cpp (modified) (3 diffs)
• Storage/UsbMsd.cpp (modified) (3 diffs)
• USB/USBProxyDevice.cpp (modified) (4 diffs)
• USB/VUSBDevice.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Input/UsbKbd.cpp

@@ -346 +346 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbHidInterfaces[0],
     NULL                            /* pvOriginal */

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -858 +858 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbHidMInterfaces[0],
     NULL                            /* pvOriginal */
@@ -875 +877 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbHidTInterfaces[0],
     NULL                            /* pvOriginal */
@@ -892 +896 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbHidMTInterfaces[0],
     NULL                            /* pvOriginal */

trunk/src/VBox/Devices/Storage/UsbMsd.cpp

@@ -482 +482 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbMsdInterfacesFS[0],
     NULL                            /* pvOriginal */
@@ -499 +501 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbMsdInterfacesHS[0],
     NULL                            /* pvOriginal */
@@ -516 +520 @@
     },
     NULL,                           /* pvMore */
+    NULL,                           /* pvClass */
+    0,                              /* cbClass */
     &g_aUsbMsdInterfacesSS[0],
     NULL                            /* pvOriginal */

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -319 +319 @@
 }
 
-/* Given the pointer to an interface or endpoint descriptor, find any following
+/* Given the pointer to a configuration/interface/endpoint descriptor, find any following
  * non-standard (vendor or class) descriptors.
  */
@@ -327 +327 @@
     uint8_t type;
 
-    Assert(*(this_desc + 1) == VUSB_DT_INTERFACE || *(this_desc + 1) == VUSB_DT_ENDPOINT);
+    Assert(*(this_desc + 1) == VUSB_DT_INTERFACE || *(this_desc + 1) == VUSB_DT_ENDPOINT || *(this_desc + 1) == VUSB_DT_CONFIG);
     buf = this_desc;
 
-    /* Skip the current interface/endpoint descriptor. */
+    /* Skip the current configuration/interface/endpoint descriptor. */
     buf += *(uint8_t *)buf;
 
@@ -468 +468 @@
     size_t cbIface;
     uint32_t i, x;
+    uint8_t *tmp, *end;
 
     descs = GetStdDescSync(pProxyDev, VUSB_DT_CONFIG, idx, 0, VUSB_DT_CONFIG_MIN_LEN);
@@ -514 +515 @@
     out->Core.bmAttributes = cfg->bmAttributes;
     out->Core.MaxPower = cfg->MaxPower;
+
+    tmp = (uint8_t *)out->pvOriginal;
+    end = tmp + tot_len;
+
+    /* Point to additional configuration descriptor bytes, if any. */
+    AssertCompile(sizeof(out->Core) == VUSB_DT_CONFIG_MIN_LEN);
+    if (out->Core.bLength - VUSB_DT_CONFIG_MIN_LEN > 0)
+        out->pvMore = tmp + VUSB_DT_CONFIG_MIN_LEN;
+    else
+        out->pvMore = NULL;
+
+    /* Typically there might be an interface association descriptor here. */
+    out->pvClass = collect_stray_bits(tmp, end, &out->cbClass);
 
     for(i=0; i < 4; i++)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -714 +714 @@
     VUSBDESCCONFIG CfgDesc;
     memcpy(&CfgDesc, pCfgDesc, VUSB_DT_CONFIG_MIN_LEN);
-    uint32_t cbTotal = pCfgDesc->Core.bLength;
+    uint32_t cbTotal = 0;
+    cbTotal += pCfgDesc->Core.bLength;
+    cbTotal += pCfgDesc->cbClass;
     for (unsigned i = 0; i < pCfgDesc->Core.bNumInterfaces; i++)
     {
@@ -738 +740 @@
     COPY_DATA(pbBuf, cbLeft, &CfgDesc, VUSB_DT_CONFIG_MIN_LEN);
     COPY_DATA(pbBuf, cbLeft, pCfgDesc->pvMore, pCfgDesc->Core.bLength - VUSB_DT_CONFIG_MIN_LEN);
+    COPY_DATA(pbBuf, cbLeft, pCfgDesc->pvClass, pCfgDesc->cbClass);
 
     /*