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

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

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv-dtrace.cpp (modified) (2 diffs)
• darwin/SUPDrv-darwin.cpp (modified) (4 diffs)

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

@@ -237 +237 @@
 /** @name DTrace kernel interface used on Darwin and Linux.
  * @{ */
-static void        (* g_pfnDTraceProbeFire)(dtrace_id_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-static dtrace_id_t (* g_pfnDTraceProbeCreate)(dtrace_provider_id_t, const char *, const char *, const char *, int, void *);
-static dtrace_id_t (* g_pfnDTraceProbeLookup)(dtrace_provider_id_t, const char *, const char *, const char *);
-static int         (* g_pfnDTraceProviderRegister)(const char *, const dtrace_pattr_t *, uint32_t, /*cred_t*/ void *,
-                                                   const dtrace_pops_t *, void *, dtrace_provider_id_t *);
-static void        (* g_pfnDTraceProviderInvalidate)(dtrace_provider_id_t);
-static int         (* g_pfnDTraceProviderUnregister)(dtrace_provider_id_t);
+static DECLCALLBACKPTR_EX(void,        RT_NOTHING, g_pfnDTraceProbeFire,(dtrace_id_t, uint64_t, uint64_t, uint64_t, uint64_t,
+                                                                         uint64_t));
+static DECLCALLBACKPTR_EX(dtrace_id_t, RT_NOTHING, g_pfnDTraceProbeCreate,(dtrace_provider_id_t, const char *, const char *,
+                                                                           const char *, int, void *));
+static DECLCALLBACKPTR_EX(dtrace_id_t, RT_NOTHING, g_pfnDTraceProbeLookup,(dtrace_provider_id_t, const char *, const char *,
+                                                                           const char *));
+static DECLCALLBACKPTR_EX(int,         RT_NOTHING, g_pfnDTraceProviderRegister,(const char *, const dtrace_pattr_t *, uint32_t,
+                                                                                /*cred_t*/ void *, const dtrace_pops_t *,
+                                                                                void *, dtrace_provider_id_t *));
+static DECLCALLBACKPTR_EX(void,        RT_NOTHING, g_pfnDTraceProviderInvalidate,(dtrace_provider_id_t));
+static DECLCALLBACKPTR_EX(int,         RT_NOTHING, g_pfnDTraceProviderUnregister,(dtrace_provider_id_t));
 
 #define dtrace_probe            g_pfnDTraceProbeFire
@@ -1111 +1115 @@
     {
         const char *pszName;
-        PFNRT      *ppfn;
+        uintptr_t  *ppfn; /**< @note Clang 11 nothrow weirdness forced this from PFNRT * to uintptr_t *. */
     } s_aDTraceFunctions[] =
     {
-        { "dtrace_probe",        (PFNRT*)&dtrace_probe        },
-        { "dtrace_probe_create", (PFNRT*)&dtrace_probe_create },
-        { "dtrace_probe_lookup", (PFNRT*)&dtrace_probe_lookup },
-        { "dtrace_register",     (PFNRT*)&dtrace_register     },
-        { "dtrace_invalidate",   (PFNRT*)&dtrace_invalidate   },
-        { "dtrace_unregister",   (PFNRT*)&dtrace_unregister   },
+        { "dtrace_probe",        (uintptr_t *)&dtrace_probe        },
+        { "dtrace_probe_create", (uintptr_t *)&dtrace_probe_create },
+        { "dtrace_probe_lookup", (uintptr_t *)&dtrace_probe_lookup },
+        { "dtrace_register",     (uintptr_t *)&dtrace_register     },
+        { "dtrace_invalidate",   (uintptr_t *)&dtrace_invalidate   },
+        { "dtrace_unregister",   (uintptr_t *)&dtrace_unregister   },
     };
     unsigned i;

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
 }