Changeset 38722 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2011 7:07:14 AM (13 years ago)

Author:

vboxsync

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

73985

Message:

Additions/common/VBoxGuest: Linux input devices: a clean up and a fix

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -30 +30 @@
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
-#include "version-generated.h"
-#include "product-generated.h"
+#include <VBox/version.h>
 
 #include <iprt/assert.h>
@@ -444 +443 @@
     g_pInputDevice->INPUT_DEV_ID(vendor)  = VMMDEV_VENDORID;
     g_pInputDevice->INPUT_DEV_ID(product) = VMMDEV_DEVICEID;
-    g_pInputDevice->INPUT_DEV_ID(version) =   (VBOX_VERSION_MAJOR << 11)
-                                            + (VBOX_VERSION_MINOR << 6)
-                                            + VBOX_VERSION_BUILD;  /** @todo */
+    g_pInputDevice->INPUT_DEV_ID(version) = VBOX_SHORT_VERSION;
     g_pInputDevice->open                  = vboxguestOpenInputDevice;
     g_pInputDevice->close                 = vboxguestCloseInputDevice;
@@ -482 +479 @@
     ASMBitSet(g_pInputDevice->absbit, ABS_X);
     ASMBitSet(g_pInputDevice->absbit, ABS_Y);
-    ASMBitSet(g_pInputDevice->keybit, BTN_MOUSE);
     g_pInputDevice->absmin[ABS_X] = g_pInputDevice->absmin[ABS_Y] = RANGE_MIN;
     g_pInputDevice->absmax[ABS_X] = g_pInputDevice->absmax[ABS_Y] = RANGE_MAX;
 #endif
+    ASMBitSet(g_pInputDevice->keybit, BTN_MOUSE);
     /** @todo this string should be in a header file somewhere. */
     g_pInputDevice->name = "VirtualBox mouse integration";