Changeset 53121 in vbox

Timestamp:

Oct 22, 2014 7:35:21 PM (10 years ago)

Author:

vboxsync

Message:

USB: Added required SS descriptors to emulated MSD.

Location:

trunk

Files:

• include/VBox/vusb.h (modified) (7 diffs)
• src/VBox/Devices/Storage/UsbMsd.cpp (modified) (5 diffs)

trunk/include/VBox/vusb.h

@@ -70 +70 @@
 #define VUSB_DT_INTERFACE_MIN_LEN       9
 #define VUSB_DT_ENDPOINT_MIN_LEN        7
+/** @} */
+
+/** @name USB Device Capability Type Codes (from spec)
+ * @{ */
+#define VUSB_DCT_WIRELESS_USB           0x01
+#define VUSB_DCT_USB_20_EXTENSION       0x02
+#define VUSB_DCT_SUPERSPEED_USB         0x03
+#define VUSB_DCT_CONTAINER_ID           0x04
 /** @} */
 
@@ -203 +211 @@
     uint8_t  iInterface;
 } VUSBDESCINTERFACE;
-/** Pointer to an USB interface descriptor. */
+/** Pointer to a USB interface descriptor. */
 typedef VUSBDESCINTERFACE *PVUSBDESCINTERFACE;
 /** Pointer to a const USB interface descriptor. */
@@ -221 +229 @@
     uint8_t  bInterval;
 } VUSBDESCENDPOINT;
-/** Pointer to an USB endpoint descriptor. */
+/** Pointer to a USB endpoint descriptor. */
 typedef VUSBDESCENDPOINT *PVUSBDESCENDPOINT;
 /** Pointer to a const USB endpoint descriptor. */
@@ -238 +246 @@
     uint16_t wBytesPerInterval;
 } VUSBDESCSSEPCOMPANION;
-/** Pointer to an USB endpoint companion descriptor. */
+/** Pointer to a USB endpoint companion descriptor. */
 typedef VUSBDESCSSEPCOMPANION *PVUSBDESCSSEPCOMPANION;
 /** Pointer to a const USB endpoint companion descriptor. */
@@ -254 +262 @@
     uint8_t  bNumDeviceCaps;
 } VUSBDESCBOS;
-/** Pointer to an USB BOS descriptor. */
+/** Pointer to a USB BOS descriptor. */
 typedef VUSBDESCBOS *PVUSBDESCBOS;
 /** Pointer to a const USB BOS descriptor. */
@@ -261 +269 @@
 
 /**
- * USB Device Capabilty Descriptor within BOS (from USB3 spec)
+ * Generic USB Device Capability Descriptor within BOS (from USB3 spec)
  */
 typedef struct VUSBDESCDEVICECAP
@@ -270 +278 @@
     uint8_t  aCapSpecific[1];
 } VUSBDESCDEVICECAP;
-/** Pointer to an USB device capability descriptor. */
+/** Pointer to a USB device capability descriptor. */
 typedef VUSBDESCDEVICECAP *PVUSBDESCDEVICECAP;
 /** Pointer to a const USB device capability descriptor. */
 typedef const VUSBDESCDEVICECAP *PCVUSBDESCDEVICECAP;
+
+
+/**
+ * SuperSpeed USB Device Capability Descriptor within BOS
+ */
+typedef struct VUSBDESCSSDEVCAP
+{
+    uint8_t  bLength;
+    uint8_t  bDescriptorType;       /* DEVICE CAPABILITY */
+    uint8_t  bDevCapabilityType;    /* SUPERSPEED_USB */
+    uint8_t  bmAttributes;
+    uint16_t wSpeedsSupported;
+    uint8_t  bFunctionalitySupport;
+    uint8_t  bU1DevExitLat;
+    uint16_t wU2DevExitLat;
+} VUSBDESCSSDEVCAP;
+/** Pointer to an SS USB device capability descriptor. */
+typedef VUSBDESCSSDEVCAP *PVUSBDESCSSDEVCAP;
+/** Pointer to a const SS USB device capability descriptor. */
+typedef const VUSBDESCSSDEVCAP *PCVUSBDESCSSDEVCAP;
+
+
+/**
+ * USB 2.0 Extension Descriptor within BOS
+ */
+typedef struct VUSBDESCUSB2EXT
+{
+    uint8_t  bLength;
+    uint8_t  bDescriptorType;       /* DEVICE CAPABILITY */
+    uint8_t  bDevCapabilityType;    /* USB 2.0 EXTENSION */
+    uint8_t  bmAttributes;
+} VUSBDESCUSB2EXT;
+/** Pointer to a USB 2.0 extension capability descriptor. */
+typedef VUSBDESCUSB2EXT *PVUSBDESCUSB2EXT;
+/** Pointer to a const USB 2.0 extension capability descriptor. */
+typedef const VUSBDESCUSB2EXT *PCVUSBDESCUSB2EXT;
 
 

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

@@ -342 +342 @@
 };
 
+static const VUSBDESCSSEPCOMPANION g_aUsbMsdEpCompanionSS =
+{
+    /* .bLength = */            sizeof(VUSBDESCSSEPCOMPANION),
+    /* .bDescriptorType = */    VUSB_DT_SS_ENDPOINT_COMPANION,
+    /* .bMaxBurst = */          15  /* we can burst all the way */,
+    /* .bmAttributes = */       0   /* no streams */,
+    /* .wBytesPerInterval = */  0   /* not a periodic endpoint */
+};
+
 static const VUSBDESCENDPOINTEX g_aUsbMsdEndpointDescsSS[2] =
 {
@@ -354 +363 @@
         },
         /* .pvMore = */     NULL,
-        /* .pvClass = */    NULL,
-        /* .cbClass = */    0
+        /* .pvClass = */    &g_aUsbMsdEpCompanionSS,
+        /* .cbClass = */    sizeof(g_aUsbMsdEpCompanionSS)
     },
     {
@@ -367 +376 @@
         },
         /* .pvMore = */     NULL,
-        /* .pvClass = */    NULL,
-        /* .cbClass = */    0
+        /* .pvClass = */    &g_aUsbMsdEpCompanionSS,
+        /* .cbClass = */    sizeof(g_aUsbMsdEpCompanionSS)
     }
 };
@@ -548 +557 @@
     /* .bNumConfigurations = */     1,
     /* .bReserved = */              0
+};
+
+static const struct {
+    VUSBDESCBOS         bos;
+    VUSBDESCSSDEVCAP    sscap;
+} g_UsbMsdBOS =
+{
+    {
+        /* .bLength = */                sizeof(g_UsbMsdBOS.bos),
+        /* .bDescriptorType = */        VUSB_DT_BOS,
+        /* .wTotalLength = */           sizeof(g_UsbMsdBOS),
+        /* .bNumDeviceCaps = */         1
+    },
+    {
+        /* .bLength = */                sizeof(VUSBDESCSSDEVCAP),
+        /* .bDescriptorType = */        VUSB_DT_DEVICE_CAPABILITY,
+        /* .bDevCapabilityType = */     VUSB_DCT_SUPERSPEED_USB,
+        /* .bmAttributes = */           0   /* No LTM. */,
+        /* .wSpeedsSupported = */       0xe /* Any speed is good. */,
+        /* .bFunctionalitySupport = */  2   /* Want HS at least. */,
+        /* .bU1DevExitLat = */          0,  /* We are blazingly fast. */
+        /* .wU2DevExitLat = */          0
+    }
 };
 
@@ -1824 +1856 @@
                         cbCopy = RT_MIN(cbCopy, sizeof(g_UsbMsdDeviceQualifier));
                         memcpy(&pUrb->abData[sizeof(*pSetup)], &g_UsbMsdDeviceQualifier, cbCopy);
+                        return usbMsdCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
+                    case VUSB_DT_BOS:
+                        Log(("usbMsd: GET_DESCRIPTOR DT_BOS wValue=%#x wIndex=%#x\n", pSetup->wValue, pSetup->wIndex));
+                        /* Returned data is written after the setup message. */
+                        cbCopy = pUrb->cbData - sizeof(*pSetup);
+                        cbCopy = RT_MIN(cbCopy, sizeof(g_UsbMsdBOS));
+                        memcpy(&pUrb->abData[sizeof(*pSetup)], &g_UsbMsdBOS, cbCopy);
                         return usbMsdCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
                     default: