Changeset 49302 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 28, 2013 7:56:55 AM (11 years ago)

Author:

vboxsync

Message:

OS X host: LEDs sync: update backlisting, also do not broadcast to devices which are not supported.

File:

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

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

@@ -1398 +1398 @@
 }
 
+/** Get integer property of HID device */
+static uint32_t darwinQueryIntProperty(IOHIDDeviceRef pHidDeviceRef, CFStringRef pProperty)
+{
+    CFTypeRef pNumberRef;
+    uint32_t  value = 0;
+
+    AssertReturn(pHidDeviceRef, 0);
+    AssertReturn(pProperty, 0);
+
+    pNumberRef = IOHIDDeviceGetProperty(pHidDeviceRef, pProperty);
+    if (pNumberRef)
+    {
+        if (CFGetTypeID(pNumberRef) == CFNumberGetTypeID())
+        {
+            if (CFNumberGetValue((CFNumberRef)pNumberRef, kCFNumberSInt32Type, &value))
+                return value;
+        }
+    }
+
+    return 0;
+}
+
 /** Get HID Vendor ID */
 static uint32_t darwinHidVendorId(IOHIDDeviceRef pHidDeviceRef)
 {
-    CFTypeRef pNumberRef;
-    uint32_t  vendorId = 0;
-
-    AssertReturn(pHidDeviceRef, 0);
-
-    pNumberRef = IOHIDDeviceGetProperty(pHidDeviceRef, CFSTR(kIOHIDVendorIDKey));
-    if (pNumberRef)
-    {
-        if (CFGetTypeID(pNumberRef) == CFNumberGetTypeID())
-        {
-            if (CFNumberGetValue((CFNumberRef)pNumberRef, kCFNumberSInt32Type, &vendorId))
-                return vendorId;
-        }
-    }
-
-    return 0;
+    return darwinQueryIntProperty(pHidDeviceRef, CFSTR(kIOHIDVendorIDKey));
+}
+
+/** Get HID Produce ID */
+static uint32_t darwinHidProductId(IOHIDDeviceRef pHidDeviceRef)
+{
+    return darwinQueryIntProperty(pHidDeviceRef, CFSTR(kIOHIDProductIDKey));
 }
 
@@ -1428 +1441 @@
     bool     fSupported = true;
     uint32_t vendorId = darwinHidVendorId(pHidDeviceRef);
-
-    switch (vendorId)
-    {
-        case 0x05D5: /** Genius (detected with GK-04008/C keyboard) */
+    uint32_t productId = darwinHidProductId(pHidDeviceRef);
+
+    if (vendorId == 0x05D5)      /* Genius */
+    {
+        if (productId == 0x8001) /* GK-04008/C keyboard */
             fSupported = false;
-            break;
-    }
-
-    LogRel(("HID device Vendor ID 0x%X %s in the list of supported devices.\n", vendorId, (fSupported ? "is" : "is not")));
+    }
+    else if (vendorId == 0x05AC) /* Apple */
+    {
+        if (productId == 0x0263) /* Apple Internal Keyboard */
+            fSupported = false;
+    }
+
+    LogRel(("HID device [VendorID=0x%X, ProductId=0x%X] %s in the list of supported devices.\n", vendorId, productId, (fSupported ? "is" : "is not")));
 
     return fSupported;
@@ -2015 +2033 @@
             pKbd = (VBoxKbdState_t *)CFArrayGetValueAtIndex(pHidState->pDeviceCollection, i);
 
-            if (pKbd)
+            if (pKbd && darwinHidDeviceSupported(pKbd->pDevice))
             {
                 rc = darwinSetDeviceLedsState(pKbd->pDevice,