Changeset 21412 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Jul 8, 2009 9:18:57 PM (15 years ago)

Author:

vboxsync

Message:

Add,++: Switch to common addition kernel module.

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

• VBoxUtils_68.c (modified) (8 diffs)
• vboxmouse_15.c (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c

@@ -35 +35 @@
 #endif
 
-#ifdef RT_OS_SOLARIS        /** @todo later Linux should also use R3 lib for this */
+#ifndef RT_OS_LINUX        /** @todo later Linux should also use R3 lib for this */
 int VBoxMouseInit(void)
 {
@@ -82 +82 @@
     return rc;
 }
-#else
-/* the vboxadd module file handle */
-static int g_vboxaddHandle = -1;
+#else  /* RT_OS_LINUX */
+/* the vboxguest module file handle */
+static int g_vboxguestHandle = -1;
 /* the request structure */
 static VMMDevReqMouseStatus *g_vmmreqMouseStatus = NULL;
@@ -97 +97 @@
 
     /* return immediately if already initialized */
-    if (g_vboxaddHandle != -1)
+    if (g_vboxguestHandle != -1)
         return 0;
 
     /* open the driver */
-    g_vboxaddHandle = open(VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
-    if (g_vboxaddHandle < 0)
+    g_vboxguestHandle = open(VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
+    if (g_vboxguestHandle < 0)
     {
         ErrorF("Unable to open the virtual machine device: %s\n",
@@ -124 +124 @@
     req.pointerYPos = 0;
 /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
+    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     {
         ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
@@ -145 +145 @@
 {
     /* If we failed to initialise, say that we don't want absolute co-ordinates. */
-    if (g_vboxaddHandle < 0)
+    if (g_vboxguestHandle < 0)
         return 1;
     /* perform VMM request */
 /** @todo r=bird: Michael, ditto. */
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
+    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
     {
         if (RT_SUCCESS(g_vmmreqMouseStatus->header.rc))
@@ -177 +177 @@
     VMMDevReqMouseStatus req;
     /* If we are not initialised, there is nothing to do */
-    if (g_vboxaddHandle < 0)
+    if (g_vboxguestHandle < 0)
         return 0;
     /* tell VMM that we no longer support absolute mouse handling */
@@ -185 +185 @@
     req.pointerYPos = 0;
 /** @todo r=bird: Michael, ditto. */
-    if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
-    {
-        ErrorF("ioctl to vboxadd module failed, rc = %d (%s)\n",
+    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
+    {
+        ErrorF("ioctl to vboxguest module failed, rc = %d (%s)\n",
                errno, strerror(errno));
     }
@@ -193 +193 @@
     free(g_vmmreqMouseStatus);
     g_vmmreqMouseStatus = NULL;
-    close(g_vboxaddHandle);
-    g_vboxaddHandle = -1;
+    close(g_vboxguestHandle);
+    g_vboxguestHandle = -1;
     return 0;
 }
-#endif  /* !RT_OS_SOLARIS */
-
+#endif  /* RT_OS_LINUX */
+

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

@@ -195 +195 @@
 
     device = xf86CheckStrOption(dev->commonOptions, "Device",
-                                "/dev/vboxadd");
+                                "/dev/vboxguest");
 
     xf86Msg(X_CONFIG, "%s: Device: \"%s\"\n", pInfo->name, device);