Changeset 52743 in vbox for trunk

Timestamp:

Sep 15, 2014 7:25:29 AM (11 years ago)

Author:

vboxsync

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

96089

Message:

Main/USB: Fix darwin assertion on Macbooks with USB 3.0 (Superspeed) ports and devices, introduce new device speed enum value for USB 3.0 devices

Location:

trunk

Files:

• include/VBox/usb.h (modified) (1 diff)
• src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/darwin/iokit.cpp (modified) (1 diff)

trunk/include/VBox/usb.h

@@ -68 +68 @@
     /** Variable speed - USB 2.5 / wireless. */
     USBDEVICESPEED_VARIABLE,
+    /** Super speed - USB 3.0 (5Gbit/s). */
+    USBDEVICESPEED_SUPER,
     /** The usual 32-bit hack. */
     USBDEVICESPEED_32BIT_HACK = 0x7fffffff

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -231 +231 @@
         *aPortVersion = mUsb->bcdUSB >> 8;
     else
-        *aPortVersion = (mUsb->enmSpeed == USBDEVICESPEED_HIGH) ? 2 : 1;
+    {
+        switch (mUsb->enmSpeed)
+        {
+            case USBDEVICESPEED_SUPER:
+                *aPortVersion = 3;
+                break;
+            case USBDEVICESPEED_HIGH:
+                *aPortVersion = 2;
+                break;
+            case USBDEVICESPEED_FULL:
+            case USBDEVICESPEED_LOW:
+            case USBDEVICESPEED_VARIABLE:
+                *aPortVersion = 1;
+                break;
+            default:
+                AssertMsgFailed(("Invalid USB speed: %d\n", mUsb->enmSpeed));
+                *aPortVersion = 1;
+        }
+    }
 
     return S_OK;

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -973 +973 @@
                 uint8_t bSpeed;
                 AssertBreak(darwinDictGetU8(PropsRef,  CFSTR(kUSBDevicePropertySpeed),  &bSpeed));
-                Assert(bSpeed <= 2);
-                pCur->enmSpeed = bSpeed == 2 ? USBDEVICESPEED_HIGH
+                Assert(bSpeed <= 3);
+                pCur->enmSpeed = bSpeed == 3 ? USBDEVICESPEED_SUPER
+                               : bSpeed == 2 ? USBDEVICESPEED_HIGH
                                : bSpeed == 1 ? USBDEVICESPEED_FULL
                                : bSpeed == 0 ? USBDEVICESPEED_LOW