Changeset 7788 in vbox

Timestamp:

Apr 8, 2008 8:48:17 AM (17 years ago)

Author:

vboxsync

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

29345

Message:

Properly determine USB port version on Windows hosts.

Location:

trunk

Files:

• include/VBox/usblib-win.h (modified) (1 diff)
• src/VBox/Main/HostUSBDeviceImpl.cpp (modified) (1 diff)

trunk/include/VBox/usblib-win.h

@@ -114 +114 @@
 
     uint8_t         fAttached;
+    uint8_t         fHiSpeed;
 } USBSUP_GETDEV, *PUSBSUP_GETDEV;
 

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -302 +302 @@
     AutoReaderLock alock (this);
 
-    /** @todo implement this correctly or things just won't work right, see the vista defect. */
-    *aPortVersion = mUsb->bcdUSB >> 8;
+    /* Port version is 2 (EHCI) if and only if the device runs at high speed;
+     * if speed is unknown, fall back to the old and innacurate method.
+     */
+    if (mUsb->enmSpeed == USBDEVICESPEED_UNKNOWN)
+        *aPortVersion = mUsb->bcdUSB >> 8;
+    else
+        *aPortVersion = (mUsb->enmSpeed == USBDEVICESPEED_HIGH) ? 2 : 1;
 
     return S_OK;