Changeset 56941 in vbox for trunk

Timestamp:

Jul 15, 2015 1:14:24 PM (9 years ago)

Author:

vboxsync

Message:

VBoxSVC/iokit.cpp: OS X 10.11 USB tweaks.

File:

• trunk/src/VBox/Main/src-server/darwin/iokit.cpp (modified) (2 diffs)

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

@@ -951 +951 @@
                 pCur->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;    /* just a default, we'll try harder in a bit. */
 
-                AssertBreak(darwinDictGetU8(PropsRef,  CFSTR(kUSBDeviceClass),           &pCur->bDeviceClass));
-                /* skip hubs */
+                /* Skip hubs. On 10.11 beta 3, the root hub simulations does not have a USBDeviceClass property, so
+                   simply ignore failures to retrieve it. */
+                if (!darwinDictGetU8(PropsRef,         CFSTR(kUSBDeviceClass),          &pCur->bDeviceClass))
+                {
+#ifdef VBOX_STRICT
+                    char szTmp[80];
+                    Assert(   darwinDictGetString(PropsRef, CFSTR("IOClassNameOverride"), szTmp, sizeof(szTmp))
+                           && strcmp(szTmp, "IOUSBRootHubDevice") == 0);
+#endif
+                    break;
+                }
                 if (pCur->bDeviceClass == 0x09 /* hub, find a define! */)
                     break;
@@ -970 +979 @@
                 AssertBreak(pCur->pszAddress);
                 pCur->bBus = u32LocationId >> 24;
-                AssertBreak(darwinDictGetU8(PropsRef,  CFSTR("PortNum"),                &pCur->bPort));
+                darwinDictGetU8(PropsRef, CFSTR("PortNum"), &pCur->bPort); /* Not present in 10.11 beta 3, so ignore failure. (Is set to zero.) */
                 uint8_t bSpeed;
                 AssertBreak(darwinDictGetU8(PropsRef,  CFSTR(kUSBDevicePropertySpeed),  &bSpeed));