Changeset 59330 in vbox for trunk/src/VBox/Main/src-server/darwin/iokit.cpp

Timestamp:

Jan 13, 2016 10:21:15 PM (9 years ago)

Author:

vboxsync

Message:

Main/IOKit: Fixes for El Capitan, use the new IOUSBHostDevice class to get access to all required data like checking whether a USB MSD is mounted on the host and marking it as unavailable

File:

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

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

@@ -50 +50 @@
 #include <iprt/thread.h>
 #include <iprt/uuid.h>
+#include <iprt/system.h>
 #ifdef STANDALONE_TESTCASE
 # include <iprt/initterm.h>
@@ -76 +77 @@
 #define VBOXUSBDEVICE_CLASS_NAME "org_virtualbox_VBoxUSBDevice"
 
+/** Define the constant for the IOUSBHostDevice class name added in El Capitan. */
+#ifndef kIOUSBHostDeviceClassName
+# define kIOUSBHostDeviceClassName "IOUSBHostDevice"
+#endif
+
+/** The major darwin version indicating OS X El Captian, used to take care of the USB changes. */
+#define VBOX_OSX_EL_CAPTIAN_VER 15
 
 /*********************************************************************************************************************************
@@ -82 +90 @@
 /** The IO Master Port. */
 static mach_port_t g_MasterPort = NULL;
+/** Major darwin version as returned by uname -r. 
+ * Used to  changes to */
+uint32_t g_uMajorDarwin = 0;
 
 
@@ -95 +106 @@
         kern_return_t krc = IOMasterPort(MACH_PORT_NULL, &g_MasterPort);
         AssertReturn(krc == KERN_SUCCESS, false);
+
+        /* Get the darwin version we are running on. */
+        char aszVersion[16] = { 0 };
+        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, &aszVersion[0], sizeof(aszVersion));
+        if (RT_SUCCESS(rc))
+        {
+            /* Make sure it is zero terminated (paranoia). */
+            aszVersion[15] = '\0';
+            rc = RTStrToUInt32Ex(&aszVersion[0], NULL, 10, &g_uMajorDarwin);
+            if (   rc != VINF_SUCCESS
+                && rc != VWRN_TRAILING_CHARS)
+                LogRel(("IOKit: Failed to convert the major part of the version string \"%s\" into an integer\n", &aszVersion[0]));
+        }
+        else
+            LogRel(("IOKit: Failed to query the OS release version with %Rrc\n", rc));
     }
     return true;
@@ -517 +543 @@
 } DARWINUSBNOTIFY, *PDARWINUSBNOTIFY;
 
+/**
+ * Returns the correct class name to identify USB devices. El Capitan
+ * introduced a reworked USb stack with changed names.
+ * The old names are still available but the objects don't reveal all the
+ * information required.
+ */
+DECLINLINE(const char *)darwinGetUsbDeviceClassName(void)
+{
+    return   g_uMajorDarwin >= VBOX_OSX_EL_CAPTIAN_VER
+           ? kIOUSBHostDeviceClassName
+           : kIOUSBDeviceClassName;
+}
 
 /**
@@ -619 +657 @@
             kern_return_t rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
                                                                 kIOPublishNotification,
-                                                                IOServiceMatching(kIOUSBDeviceClassName),
+                                                                IOServiceMatching(darwinGetUsbDeviceClassName()),
                                                                 darwinUSBAttachNotification1,
                                                                 pNotify,
@@ -628 +666 @@
                 rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
                                                       kIOMatchedNotification,
-                                                      IOServiceMatching(kIOUSBDeviceClassName),
+                                                      IOServiceMatching(darwinGetUsbDeviceClassName()),
                                                       darwinUSBAttachNotification2,
                                                       pNotify,
@@ -637 +675 @@
                     rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
                                                           kIOTerminatedNotification,
-                                                          IOServiceMatching(kIOUSBDeviceClassName),
+                                                          IOServiceMatching(darwinGetUsbDeviceClassName()),
                                                           darwinUSBDetachNotification,
                                                           pNotify,
@@ -820 +858 @@
                         fUserClientOnly = false;
 
-                        if (!strcmp(szName, "IOUSBMassStorageClass"))
+                        if (   !strcmp(szName, "IOUSBMassStorageClass")
+                            || !strcmp(szName, "IOUSBMassStorageInterfaceNub"))
                         {
                             /* Only permit capturing MSDs that aren't mounted, at least
@@ -906 +945 @@
      * Create a matching dictionary for searching for USB Devices in the IOKit.
      */
-    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(kIOUSBDeviceClassName);
+    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(darwinGetUsbDeviceClassName());
     AssertReturn(RefMatchingDict, NULL);
 
@@ -981 +1020 @@
                 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));
-                Assert(bSpeed <= 3);
-                pCur->enmSpeed = bSpeed == 3 ? USBDEVICESPEED_SUPER
+                AssertBreak(darwinDictGetU8(PropsRef,
+                                              g_uMajorDarwin >= VBOX_OSX_EL_CAPTIAN_VER
+                                            ? CFSTR("USBSpeed")
+                                            : CFSTR(kUSBDevicePropertySpeed),
+                                            &bSpeed));
+                Assert(bSpeed <= 4);
+                pCur->enmSpeed = bSpeed == 3 || bSpeed == 4 ? USBDEVICESPEED_SUPER
                                : bSpeed == 2 ? USBDEVICESPEED_HIGH
                                : bSpeed == 1 ? USBDEVICESPEED_FULL
@@ -1134 +1177 @@
      */
 
-    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(kIOUSBDeviceClassName);
+    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(darwinGetUsbDeviceClassName());
     AssertReturn(RefMatchingDict, NULL);