Changeset 85172 in vbox for trunk/src/VBox/HostDrivers/Support/darwin

Timestamp:

Jul 10, 2020 12:10:01 PM (5 years ago)

Author:

vboxsync

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

139136

Message:

SUPDrv: Build fixes for Xcode 11 / SDK 10.13. bugref:9790

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -67 +67 @@
 #include <IOKit/pwr_mgt/RootDomain.h>
 #include <IOKit/IODeviceTreeSupport.h>
-#include <IOKit/usb/IOUSBHIDDriver.h>
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+# include <IOKit/usb/IOUSBHIDDriver.h>
+#endif
 #include <IOKit/bluetooth/IOBluetoothHIDDriver.h>
 #include <IOKit/bluetooth/IOBluetoothHIDDriverTypes.h>
@@ -1293 +1295 @@
     RT_NOREF(pvUser); //PSUPDRVDEVEXT pDevExt = (PSUPDRVDEVEXT)pvUser;
 # ifdef DEBUG_bird
-    printf("supdrvDarwinLdrOpenVerifyCertificatCallback: pCert=%p hCertPaths=%p\n", pCert, hCertPaths);
+    printf("supdrvDarwinLdrOpenVerifyCertificatCallback: pCert=%p hCertPaths=%p\n", (void *)pCert, (void *)hCertPaths);
 # endif
 
@@ -1899 +1901 @@
 static void supdrvDarwinResumeBuiltinKbd(void)
 {
+    /** @todo macbook pro 16 w/ 10.15.5 as the "Apple Internal Keyboard /
+     *        Trackpad" hooked up to "HID Relay" / "AppleUserUSBHostHIDDevice"
+     *        and "AppleUserUSBHostHIDDevice" among other things, but not
+     *        "AppleUSBTCKeyboard". This change is probably older than 10.15,
+     *        given that IOUSBHIDDriver not is present in the 10.11 SDK. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
     /*
      * AppleUSBTCKeyboard KEXT is responsible for built-in keyboard management.
-     * We resume keyboard by accessing to its IOService. */
+     * We resume keyboard by accessing to its IOService.
+     */
     OSDictionary *pDictionary = IOService::serviceMatching("AppleUSBTCKeyboard");
     if (pDictionary)
@@ -1919 +1928 @@
         pDictionary->release();
     }
+#endif
 }