Changeset 49787 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Dec 5, 2013 11:26:00 AM (11 years ago)

Author:

vboxsync

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

91106

Message:

OS X host: HID LEDs sync: move built-in keyboard resume code from VBoxUSB.kext to VBoxDrv.kext.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (3 diffs)
• SUPDrvIOC.h (modified) (2 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -139 +139 @@
                                                   RTCPUID idCpu, uint8_t idApic, uint64_t iTick);
 static void                 supdrvGipInitCpu(PSUPGLOBALINFOPAGE pGip, PSUPGIPCPU pCpu, uint64_t u64NanoTS);
+static int                  supdrvIOCtl_ResumeBuiltinKbd(void);
 
 
@@ -1904 +1905 @@
         }
 
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_RESUME_BUILTIN_KBD):
+        {
+            /* validate */
+            REQ_CHECK_SIZES(SUP_IOCTL_RESUME_BUILTIN_KBD);
+
+            pReqHdr->rc = supdrvIOCtl_ResumeBuiltinKbd();
+            return 0;
+        }
 
         default:
@@ -6140 +6149 @@
 }
 
+/**
+ * Resume built-in keyboard on MacBook Air and Pro hosts.
+ * If there is no built-in keyboard device, return success anyway.
+ *
+ * @returns 0 on Mac OS X platform, VERR_NOT_IMPLEMENTED on the other ones.
+ */
+static int supdrvIOCtl_ResumeBuiltinKbd(void)
+{
+#if defined(RT_OS_DARWIN)
+    return supdrvDarwinResumeBuiltinKbd();
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
+}
+

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -194 +194 @@
  *          - Remove RTSpinlockReleaseNoInts.
  */
-#define SUPDRV_IOC_VERSION                              0x001a0006
+#define SUPDRV_IOC_VERSION                              0x001a0007
 
 /** SUP_IOCTL_COOKIE. */
@@ -1438 +1438 @@
 /** @} */
 
+/** @name SUP_IOCTL_RESUME_BUILTIN_KBD
+ * Resume built-in keyboard (make sense on MacBook Air/Pro hosts only).
+ *
+ * @{
+ */
+#define SUP_IOCTL_RESUME_BUILTIN_KBD                    SUP_CTL_CODE_SIZE(35, SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE)
+#define SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE               sizeof(SUPREQHDR)
+#define SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE_IN            sizeof(SUPREQHDR)
+#define SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE_OUT           sizeof(SUPREQHDR)
+/** @} */
+
 
 #pragma pack()                          /* paranoia */

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -749 +749 @@
 #endif /* SUPDRV_WITH_MSR_PROBER */
 
+#if defined(RT_OS_DARWIN)
+int VBOXCALL    supdrvDarwinResumeBuiltinKbd(void);
+#endif
 
 /*******************************************************************************

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -2133 +2133 @@
 }
 
+
+SUPR3DECL(int) SUPR3ResumeBuiltinKeyboard(void)
+{
+#ifdef RT_OS_DARWIN
+    /*
+     * Issue IOCtl to the SUPDRV kernel module.
+     */
+    SUPREQHDR Req;
+    Req.u32Cookie       = g_u32Cookie;
+    Req.u32SessionCookie= g_u32SessionCookie;
+    Req.cbIn            = SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE_IN;
+    Req.cbOut           = SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE_OUT;
+    Req.fFlags          = SUPREQHDR_FLAGS_DEFAULT;
+    Req.rc              = VERR_INTERNAL_ERROR;
+    int rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_RESUME_BUILTIN_KBD, &Req, SUP_IOCTL_RESUME_BUILTIN_KBD_SIZE);
+    if (RT_SUCCESS(rc))
+        rc = Req.rc;
+    return rc;
+#else /* !RT_OS_DARWIN */
+    return VERR_NOT_SUPPORTED;
+#endif
+}
+

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>
 
 #ifdef VBOX_WITH_HOST_VMX
@@ -1143 +1144 @@
 
 
+/**
+ * Resume built-in keyboard on MacBook Air and Pro hosts.
+ * If there is no built-in keyboard device, return success anyway.
+ */
+int VBOXCALL    supdrvDarwinResumeBuiltinKbd(void)
+{
+    /*
+     * AppleUSBTCKeyboard KEXT is responsible for built-in keyboard management.
+     * We resume keyboard by accessing to its IOService. */
+    OSDictionary *pDictionary = IOService::serviceMatching("AppleUSBTCKeyboard");
+    if (pDictionary)
+    {
+        OSIterator     *pIter;
+        IOUSBHIDDriver *pDriver;
+
+        pIter = IOService::getMatchingServices(pDictionary);
+        if (pIter)
+        {
+            while ((pDriver = (IOUSBHIDDriver *)pIter->getNextObject()))
+                pDriver->SuspendPort(false, 0);
+
+            pIter->release();
+        }
+        pDictionary->release();
+    }
+
+    return 0;
+}
+
+
 
 /**