Changeset 43960 in vbox

Timestamp:

Nov 26, 2012 12:01:53 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82305

Message:

VUSB: interface association descriptor for emulated devices.

Location:

trunk

Files:

• include/VBox/vusb.h (modified) (3 diffs)
• src/VBox/Devices/Input/UsbKbd.cpp (modified) (1 diff)
• src/VBox/Devices/Input/UsbMouse.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/UsbMsd.cpp (modified) (2 diffs)
• src/VBox/Devices/USB/VUSBDevice.cpp (modified) (2 diffs)

trunk/include/VBox/vusb.h

@@ -55 +55 @@
 #define VUSB_DT_OTHER_SPEED_CFG         0x07
 #define VUSB_DT_INTERFACE_POWER         0x08
+#define VUSB_DT_INTERFACE_ASSOCIATION   0x0B
 /** @} */
 
@@ -163 +164 @@
 
 /**
+ * USB interface association descriptor (from USB ECN Interface Association Descriptors)
+ */
+typedef struct VUSBDESCIAD
+{
+    uint8_t bLength;
+    uint8_t bDescriptorType;
+    uint8_t bFirstInterface;
+    uint8_t bInterfaceCount;
+    uint8_t bFunctionClass;
+    uint8_t bFunctionSubClass;
+    uint8_t bFunctionProtocol;
+    uint8_t iFunction;
+} VUSBDESCIAD;
+/** Pointer to a USB interface association descriptor. */
+typedef VUSBDESCIAD *PVUSBDESCIAD;
+/** Pointer to a readonly USB interface association descriptor. */
+typedef const VUSBDESCIAD *PCVUSBDESCIAD;
+
+
+/**
  * USB interface descriptor (from spec)
  */
@@ -257 +278 @@
      * Core.bNumEndpoints in size. */
     const struct VUSBDESCENDPOINTEX *paEndpoints;
+    /** Interface association descriptor, which prepends a group of interfaces,
+     * starting with this interface. */
+    PCVUSBDESCIAD pIAD;
+    /** Size of interface association descriptor. */
+    uint16_t cbIAD;
 } VUSBDESCINTERFACEEX;
 /** Pointer to an prased USB interface descriptor. */

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

@@ -299 +299 @@
     /* .pvClass = */    &g_UsbHidIfHidDesc,
     /* .cbClass = */    sizeof(g_UsbHidIfHidDesc),
-    &g_aUsbHidEndpointDescs[0]
+    &g_aUsbHidEndpointDescs[0],
+    /* .pIAD = */ NULL,
+    /* .cbIAD = */ 0
 };
 

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

@@ -379 +379 @@
     /* .pvClass = */    &g_UsbHidMIfHidDesc,
     /* .cbClass = */    sizeof(g_UsbHidMIfHidDesc),
-    &g_aUsbHidMEndpointDescs[0]
+    &g_aUsbHidMEndpointDescs[0],
+    /* .pIAD = */ NULL,
+    /* .cbIAD = */ 0
 };
 
@@ -398 +400 @@
     /* .pvClass = */    &g_UsbHidTIfHidDesc,
     /* .cbClass = */    sizeof(g_UsbHidTIfHidDesc),
-    &g_aUsbHidTEndpointDescs[0]
+    &g_aUsbHidTEndpointDescs[0],
+    /* .pIAD = */ NULL,
+    /* .cbIAD = */ 0
 };
 

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

@@ -350 +350 @@
     /* .pvClass = */    NULL,
     /* .cbClass = */    0,
-    &g_aUsbMsdEndpointDescsFS[0]
+    &g_aUsbMsdEndpointDescsFS[0],
+    /* .pIAD = */ NULL,
+    /* .cbIAD = */ 0
 };
 
@@ -369 +371 @@
     /* .pvClass = */    NULL,
     /* .cbClass = */    0,
-    &g_aUsbMsdEndpointDescsHS[0]
+    &g_aUsbMsdEndpointDescsHS[0],
+    /* .pIAD = */ NULL,
+    /* .cbIAD = */ 0
 };
 

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

@@ -716 +716 @@
         for (uint32_t j = 0; j < pIf->cSettings; j++)
         {
+            cbTotal += pIf->paSettings[j].cbIAD;
             cbTotal += pIf->paSettings[j].Core.bLength;
             cbTotal += pIf->paSettings[j].cbClass;
@@ -743 +744 @@
             PCVUSBDESCINTERFACEEX pIfDesc = &pIf->paSettings[j];
 
+            COPY_DATA(pbBuf, cbLeft, pIfDesc->pIAD, pIfDesc->cbIAD);
             COPY_DATA(pbBuf, cbLeft, pIfDesc, VUSB_DT_INTERFACE_MIN_LEN);
             COPY_DATA(pbBuf, cbLeft, pIfDesc->pvMore, pIfDesc->Core.bLength - VUSB_DT_INTERFACE_MIN_LEN);