Changeset 53210 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Nov 4, 2014 6:07:07 PM (10 years ago)

Author:

vboxsync

Message:

PDM/VUSB: Provide port/device speed to HCs (and emulated devices).

Location:

trunk/src/VBox/Devices/USB

Files:

• DevOHCI.cpp (modified) (1 diff)
• VUSBDevice.cpp (modified) (2 diffs)

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

@@ -966 +966 @@
     uPort--;
     Assert(!pThis->RootHub.aPorts[uPort].pDev);
+    /* Only LS/FS devices can end up here. */
+    Assert(pDev->pfnGetSpeed(pDev) == VUSB_SPEED_LOW || pDev->pfnGetSpeed(pDev) == VUSB_SPEED_FULL);
 
     /*

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

@@ -1578 +1578 @@
 
 /**
+ * @interface_method_impl{VUSBIDEVICE,pfnGetState}
+ */
+DECLCALLBACK(VUSBSPEED) vusbIDeviceGetSpeed(PVUSBIDEVICE pInterface)
+{
+    PVUSBDEV pDev = (PVUSBDEV)pInterface;
+    VUSBSPEED enmSpeed = pDev->pUsbIns->enmSpeed;
+
+    LogFlowFunc(("pInterface=%p, returns %u\n", pInterface, enmSpeed));
+    return enmSpeed;
+}
+
+
+/**
  * The maximum number of interfaces the device can have in all of it's configuration.
  *
@@ -1718 +1731 @@
     pDev->IDevice.pfnGetState = vusbIDeviceGetState;
     pDev->IDevice.pfnIsEmulated = vusbIDeviceIsEmulated;
+    pDev->IDevice.pfnGetSpeed = vusbIDeviceGetSpeed;
     pDev->pUsbIns = pUsbIns;
     pDev->pNext = NULL;