Changeset 48677 in vbox

Timestamp:

Sep 25, 2013 11:05:27 AM (11 years ago)

Author:

vboxsync

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

89299

Message:

Partly reverted r89244 and r89245.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (3 diffs)
• HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• HostDrivers/Support/darwin/Info.plist (modified) (1 diff)
• HostDrivers/Support/darwin/SUPKeyboardService-darwin.cpp (deleted)

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

@@ -44 +44 @@
 #endif
 #include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hidsystem/IOHIDLib.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <Carbon/Carbon.h>
@@ -1456 +1455 @@
 }
 
-/** Call VBoxKeyboardService to sync keyboard controls and LEDs. */
-static void darwinVBoxKeyboardSync(void)
-{
-    CFDictionaryRef matchingDictionaryRef = IOServiceMatching("org_virtualbox_VBoxKeyboard");
-    if (matchingDictionaryRef)
-    {
-        io_service_t service;
-        service = IOServiceGetMatchingService(kIOMasterPortDefault, matchingDictionaryRef);
-        if (service)
-        {
-            kern_return_t rc;
-            io_connect_t  connection;
-            rc = IOServiceOpen(service, mach_task_self(), 0, &connection);
-            if (rc == 0)
-            {
-                Log2(("VBoxKeyboard IOService opened!\n"));
-
-                rc = IOConnectCallScalarMethod(connection, 0, NULL, 0, NULL, 0);
-                Log2(("VBoxKeyboard IOService IOCTL: 0x%X!\n", rc));
-
-                rc = IOServiceClose(connection);
-                if (rc == 0)
-                {
-                    Log2(("VBoxKeyboard IOService closed!\n"));
-                }
-                else
-                {
-                    Log2(("Unable to close VBoxKeyboard IOService: 0x%X\n", rc));
-                }
-            }
-            else
-            {
-                Log2(("Unable to open VBoxKeyboard IOService: 0x%X\n", rc));
-            }
-
-            IOObjectRelease(service);
-        }
-        else
-        {
-            Log2(("Unable to find VBoxKeyboard IOService\n"));
-        }
-
-    }
-    else
-    {
-        Log2(("Unable to construct VBoxKeyboard IOService matching dictionary\n"));
-    }
-}
-
 /**
  * Apply LEDs state stored in *pState and release resources aquired by *pState.
@@ -1538 +1488 @@
                     rc2 = kIOReturnError;
                 }
-
             }
-
-            darwinVBoxKeyboardSync();
         }
 

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -304 +304 @@
 
  VBoxDrv_SOURCES.darwin   = \
-        darwin/SUPDrv-darwin.cpp \
-        darwin/SUPKeyboardService-darwin.cpp
+        darwin/SUPDrv-darwin.cpp
  VBoxDrv_SOURCES.linux    = \
         linux/SUPDrv-linux.c

trunk/src/VBox/HostDrivers/Support/darwin/Info.plist

@@ -25 +25 @@
             <key>IOUserClientClass</key>        <string>org_virtualbox_SupDrvClient</string>
         </dict>
-        <key>VBoxDrvKeyboard</key>
-        <dict>
-            <key>CFBundleIdentifier</key>       <string>org.virtualbox.kext.VBoxDrv</string>
-            <key>IOClass</key>                  <string>org_virtualbox_VBoxKeyboard</string>
-            <key>IOMatchCategory</key>          <string>org_virtualbox_VBoxKeyboard</string>
-            <key>IOProviderClass</key>          <string>IOResources</string>
-            <key>IOResourceMatch</key>          <string>IOKit</string>
-            <key>IOUserClientClass</key>        <string>org_virtualbox_VBoxKeyboardClient</string>
-        </dict>
     </dict>
     <key>OSBundleLibraries</key>