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

Timestamp:

Dec 4, 2013 5:20:25 PM (11 years ago)

Author:

vboxsync

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

91095

Message:

Mac OS X host: HID LEDs sync: resume built-in kbd before set its LEDs (extended VBoxUSB.kext and USBLib); introduce GUI/HidLedsSync extradata option in order to enable LEDs sync (not set/disabled by default); all Apple kbd devices removed from blacklist; SCROLL LED sync enabled again.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/darwin

Files:

• USBLib-darwin.cpp (modified) (2 diffs)
• VBoxUSB.cpp (modified) (5 diffs)
• VBoxUSBInterface.h (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -190 +190 @@
 }
 
+USBLIB_DECL(void) USBLibResumeBuiltInKeyboard(void)
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    kern_return_t kr = IOConnectMethodStructureIStructureO(g_Connection,
+                                                           VBOXUSBMETHOD_RESUME_BUILTIN_KBD,
+                                                           0,
+                                                           NULL,
+                                                           NULL,
+                                                           NULL);
+#else  /* 10.5 and later */
+    kern_return_t kr = IOConnectCallStructMethod(g_Connection,
+                                                 VBOXUSBMETHOD_RESUME_BUILTIN_KBD,
+                                                 NULL, 0,
+                                                 NULL, NULL);
+#endif /* 10.5 and later */
+    AssertMsg(kr == kIOReturnSuccess, ("kr=%#x\n", kr));
+    NOREF(kr);
+}

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -60 +60 @@
 #include <IOKit/usb/IOUSBInterface.h>
 #include <IOKit/usb/IOUSBUserClient.h>
+#include <IOKit/usb/IOUSBHIDDriver.h>
 
 /* private: */
@@ -140 +141 @@
     IOReturn addFilter(PUSBFILTER pFilter, PVBOXUSBADDFILTEROUT pOut, IOByteCount cbFilter, IOByteCount *pcbOut);
     IOReturn removeFilter(uintptr_t *puId, int *prc, IOByteCount cbIn, IOByteCount *pcbOut);
+    IOReturn resumeBuiltInKbd(void *unused1, void *unused2, IOByteCount unused3, IOByteCount *unused4, void *unused5, void *unused6);
     /** @} */
 
@@ -788 +790 @@
             sizeof(int)                                             /* count1 - size of the output (rc) */
         },
+        /* [VBOXUSBMETHOD_RESUME_BUILTIN_KBD] = */
+        {
+            (IOService *)0,                                         /* object */
+            (IOMethod)&org_virtualbox_VBoxUSBClient::resumeBuiltInKbd, /* func */
+            kIOUCScalarIScalarO,                                    /* flags - scalar input (count0) and scalar output (count1) */
+            0,                                                      /* count0 - # of input parameters */
+            0                                                       /* count1 - # of output parameters */
+        },
     };
 
@@ -893 +903 @@
 }
 
+IOReturn
+org_virtualbox_VBoxUSBClient::resumeBuiltInKbd(void *unused1, void *unused2, IOByteCount unused3, IOByteCount *unused4, void *unused5, void *unused6)
+{
+    (void)unused1;
+    (void)unused2;
+    (void)unused3;
+    (void)unused4;
+    (void)unused5;
+    (void)unused6;
+
+    OSDictionary *pDictionary;
+
+    VBOXUSB_LOCK();
+
+    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();
+    }
+
+    VBOXUSB_UNLOCK();
+
+    return kIOReturnSuccess;
+}
 
 /**

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
     /** org_virtualbox_VBoxUSBClient::removeFilter */
     VBOXUSBMETHOD_REMOVE_FILTER,
+    /** org_virtualbox_VBoxUSBClient::resumeBuiltInKbd */
+    VBOXUSBMETHOD_RESUME_BUILTIN_KBD,
     /** End/max. */
     VBOXUSBMETHOD_END