Changeset 49787 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 5, 2013 11:26:00 AM (11 years ago)

Author:

vboxsync

Message:

OS X host: HID LEDs sync: move built-in keyboard resume code from VBoxUSB.kext to VBoxDrv.kext.

File:

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

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

@@ -39 +39 @@
 # include <iprt/err.h>
 # include <iprt/semaphore.h>
-# include <VBox/usblib.h>
+# include <VBox/sup.h>
 #endif
 
@@ -1270 +1270 @@
     IOReturn      rc = kIOReturnError;
 
-    USBLibResumeBuiltInKeyboard();
+    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
+    int rc1 = SUPR3ResumeBuiltinKeyboard();
+    if (RT_FAILURE(rc1))
+        return rc1;
 
     valueRef = IOHIDValueCreateWithIntegerValue(kCFAllocatorDefault, element, 0, (fEnabled) ? 1 : 0);
@@ -1294 +1297 @@
     CFIndex       integerValue;
 
-    USBLibResumeBuiltInKeyboard();
+    /* Try to resume built-in keyboard. Abort if failed in order to avoid GUI freezes. */
+    int rc1 = SUPR3ResumeBuiltinKeyboard();
+    if (RT_FAILURE(rc1))
+        return rc1;
 
     rc = IOHIDDeviceGetValue(hidDevice, element, &valueRef);
@@ -1915 +1921 @@
     VBoxHidsState_t *pHidState;
 
-    USBLibInit();
-
     pHidState = (VBoxHidsState_t *)malloc(sizeof(VBoxHidsState_t));
     AssertReturn(pHidState, NULL);
@@ -2058 +2062 @@
     free(pHidState);
 
-    USBLibTerm();
-
     return rc2;
 #else /* !VBOX_WITH_KBD_LEDS_SYNC */