Changeset 48788 in vbox

Timestamp:

Oct 1, 2013 8:09:35 AM (11 years ago)

Author:

vboxsync

Message:

OS X host: leds sync: some KBD devices might freeze after LEDs manipulations, filter out all the devices which were not verified to work reliably with our sync code.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -40 +40 @@
 # include <IOKit/IOCFPlugIn.h>
 # include <IOKit/hid/IOHIDUsageTables.h>
-# include <IOKit/usb/USB.h>
 # include <CoreFoundation/CoreFoundation.h>
 #endif
+# include <IOKit/usb/USB.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <ApplicationServices/ApplicationServices.h>
@@ -1464 +1464 @@
 }
 
+/** Some keyboard devices might freeze after LEDs manipulation. We filter out such devices here.
+ * In the list below, devices which verified to be stable against LEDs manipulation.
+ * If you want to add new device, add it here. Currently, we only filter devices by Vendor ID.
+ * In future it might make sense to take Product ID into account as well. */
+static bool darwinHidDeviceSupported(IOHIDDeviceRef pHidDeviceRef)
+{
+    bool      fSupported = false;
+    CFTypeRef pNumberRef;
+    uint32_t  vendorId = 0;
+
+    pNumberRef = IOHIDDeviceGetProperty(pHidDeviceRef, CFSTR(kIOHIDVendorIDKey));
+    if (pNumberRef)
+    {
+        if (CFGetTypeID(pNumberRef) == CFNumberGetTypeID())
+        {
+            if (CFNumberGetValue((CFNumberRef)pNumberRef, kCFNumberSInt32Type, &vendorId))
+            {
+                switch (vendorId)
+                {
+                    case kIOUSBVendorIDAppleComputer:   /** Apple devices always in the list */
+                    case 0x03F0:                        /** Hewlett-Packard (verified with model KU-0316) */
+                        fSupported = true;
+                        break;
+                }
+
+                Log2(("HID device Vendor ID 0x%X %s in the list of supported devices.\n", vendorId, (fSupported ? "is" : "is not")));
+            }
+        }
+    }
+
+    return fSupported;
+}
+
 #endif // !VBOX_WITH_KBD_LEDS_SYNC
 
@@ -1508 +1541 @@
                                     for (CFIndex i = 0; i < hidsState->cDevices; i++)
                                     {
-                                        if (IOHIDDeviceConformsTo(hidsState->hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard))
+                                        if (IOHIDDeviceConformsTo(hidsState->hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)
+                                         && darwinHidDeviceSupported(hidsState->hidDevicesCollection[i]))
                                         {
                                             rc = darwinGetDeviceLedsState(hidsState->hidDevicesCollection[i],
@@ -1604 +1638 @@
                 }
 
-                IOHIDDeviceRegisterInputValueCallback(hidsState->hidDevicesCollection[i], NULL, NULL);
-                IOHIDDeviceUnscheduleFromRunLoop(hidsState->hidDevicesCollection[i], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+                /* Only supported devices have subscription to input callbacks. */
+                if (darwinHidDeviceSupported(hidsState->hidDevicesCollection[i]))
+                {
+                    IOHIDDeviceRegisterInputValueCallback(hidsState->hidDevicesCollection[i], NULL, NULL);
+                    IOHIDDeviceUnscheduleFromRunLoop(hidsState->hidDevicesCollection[i], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+                }
             }
         }
@@ -1677 +1715 @@
                             for (CFIndex i = 0; i < cDevices; i++)
                             {
-                                if (IOHIDDeviceConformsTo(hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard))
+                                if (IOHIDDeviceConformsTo(hidDevicesCollection[i], kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)
+                                 && darwinHidDeviceSupported(hidDevicesCollection[i]))
                                 {
                                     rc = darwinSetDeviceLedsState(hidDevicesCollection[i], elementMatchingDict,