Changeset 48590 in vbox

Timestamp:

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

Author:

vboxsync

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

89150

Message:

OS X host: VBOX_KBD_LEDS_SYNC -> VBOX_WITH_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 VBOX_KBD_LEDS_SYNC
+//#define VBOX_WITH_KBD_LEDS_SYNC
 
 #include "DarwinKeyboard.h"
@@ -290 +290 @@
 #endif /* USE_HID_FOR_MODIFIERS */
 
-#ifdef VBOX_KBD_LEDS_SYNC
+#ifdef VBOX_WITH_KBD_LEDS_SYNC
 /* HID LEDs synchronization data: LED states. */
 typedef struct VBoxHidLeds_t {
@@ -305 +305 @@
     CFIndex          cDevices;
 } VBoxHidsState_t;
-#endif /* VBOX_KBD_LEDS_SYNC */
+#endif /* VBOX_WITH_KBD_LEDS_SYNC */
 
 /*******************************************************************************
@@ -1151 +1151 @@
 }
 
-#ifdef VBOX_KBD_LEDS_SYNC
+#ifdef VBOX_WITH_KBD_LEDS_SYNC
 /** Prepare dictionary that will be used to match HID LED device(s) while discovering. */
 static CFDictionaryRef darwinGetLedDeviceMatchingDictionary()
@@ -1358 +1358 @@
     return rc2;
 }
-#endif /* VBOX_KBD_LEDS_SYNC */
+#endif /* VBOX_WITH_KBD_LEDS_SYNC */
 
 /** Save the states of leds for all HID devices attached to the system and return it. */
 void * DarwinHidDevicesKeepLedsState(void)
 {
-#ifdef VBOX_KBD_LEDS_SYNC
+#ifdef VBOX_WITH_KBD_LEDS_SYNC
     IOReturn         rc;
     VBoxHidsState_t *hidsState;
@@ -1450 +1450 @@
 
     return NULL;
-#else /* VBOX_KBD_LEDS_SYNC */
+#else /* VBOX_WITH_KBD_LEDS_SYNC */
     return NULL;
 #endif
@@ -1464 +1464 @@
 int DarwinHidDevicesApplyAndReleaseLedsState(void *pState)
 {
-#ifdef VBOX_KBD_LEDS_SYNC
+#ifdef VBOX_WITH_KBD_LEDS_SYNC
     VBoxHidsState_t *hidsState = (VBoxHidsState_t *)pState;
 
@@ -1506 +1506 @@
 
     return rc2;
-#else /* VBOX_KBD_LEDS_SYNC */
+#else /* VBOX_WITH_KBD_LEDS_SYNC */
     (void)pState;
     return 0;
@@ -1525 +1525 @@
 {
 /* Temporary disabled */
-#ifdef VBOX_KBD_LEDS_SYNC
+#ifdef VBOX_WITH_KBD_LEDS_SYNC
     IOReturn        rc;
     IOHIDManagerRef hidManagerRef;
@@ -1583 +1583 @@
         CFRelease(hidManagerRef);
     }
-#else /* VBOX_KBD_LEDS_SYNC */
+#else /* VBOX_WITH_KBD_LEDS_SYNC */
     (void)fNumLockOn;
     (void)fCapsLockOn;