Changeset 48586 in vbox

Timestamp:

Sep 20, 2013 1:13:18 PM (11 years ago)

Author:

vboxsync

Message:

OS X host: temporary disabled keyboard LEDs syncing (under DARWIN_KBD_LEDS_SYNC).

File:

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

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

@@ -22 +22 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GUI
+//#define DARWIN_KBD_LEDS_SYNC
+
 #include "DarwinKeyboard.h"
 #include <iprt/assert.h>
@@ -288 +290 @@
 #endif /* USE_HID_FOR_MODIFIERS */
 
+#ifdef DARWIN_KBD_LEDS_SYNC
 /* HID LEDs synchronization data: LED states. */
 typedef struct VBoxHidLeds_t {
@@ -302 +305 @@
     CFIndex          cDevices;
 } VBoxHidsState_t;
-
+#endif /* DARWIN_KBD_LEDS_SYNC */
 
 /*******************************************************************************
@@ -1148 +1151 @@
 }
 
+#ifdef DARWIN_KBD_LEDS_SYNC
 /** Prepare dictionary that will be used to match HID LED device(s) while discovering. */
 static CFDictionaryRef darwinGetLedDeviceMatchingDictionary()
@@ -1354 +1358 @@
     return rc2;
 }
+#endif /* DARWIN_KBD_LEDS_SYNC */
 
 /** Save the states of leds for all HID devices attached to the system and return it. */
 void * DarwinHidDevicesKeepLedsState(void)
 {
+#ifdef DARWIN_KBD_LEDS_SYNC
     IOReturn         rc;
     VBoxHidsState_t *hidsState;
@@ -1444 +1450 @@
 
     return NULL;
+#else /* DARWIN_KBD_LEDS_SYNC */
+    return NULL;
+#endif
 }
 
@@ -1455 +1464 @@
 int DarwinHidDevicesApplyAndReleaseLedsState(void *pState)
 {
+#ifdef DARWIN_KBD_LEDS_SYNC
     VBoxHidsState_t *hidsState = (VBoxHidsState_t *)pState;
 
@@ -1496 +1506 @@
 
     return rc2;
+#else /* DARWIN_KBD_LEDS_SYNC */
+    (void)pState;
+    return 0;
+#endif
 }
 
@@ -1510 +1524 @@
 void DarwinHidDevicesBroadcastLeds(bool fNumLockOn, bool fCapsLockOn, bool fScrollLockOn)
 {
+/* Temporary disabled */
+#ifdef DARWIN_KBD_LEDS_SYNC
     IOReturn        rc;
     IOHIDManagerRef hidManagerRef;
@@ -1567 +1583 @@
         CFRelease(hidManagerRef);
     }
-}
+#else /* DARWIN_KBD_LEDS_SYNC */
+    (void)fNumLockOn;
+    (void)fCapsLockOn;
+    (void)fScrollLockOn;
+#endif
+}