Changeset 1260 in vbox

Timestamp:

Mar 6, 2007 11:31:33 AM (18 years ago)

Author:

vboxsync

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

19205

Message:

display VBOX_VERSION_STRING in Xorg.log.0 for better bug reports from end-users

Location:

trunk/src/VBox/Additions/linux

Files:

• xgraphics/vboxvideo.c (modified) (3 diffs)
• xgraphics/vboxvideo.h (modified) (1 diff)
• xmouse/mouse.c (modified) (2 diffs)
• xmouse/xorg70/mouse.c (modified) (2 diffs)
• xmouse/xorg71/mouse.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/xgraphics/vboxvideo.c

@@ -65 +65 @@
 #endif
 #include "vboxvideo.h"
+#include "version-generated.h"
 
 /* All drivers initialising the SW cursor need this */
@@ -241 +242 @@
     XF86_VERSION_CURRENT,
 #endif /* XORG_7X */
-    VBOX_MAJOR_VERSION, VBOX_MINOR_VERSION, VBOX_PATCHLEVEL,
-    ABI_CLASS_VIDEODRV,                 /* This is a video driver */
+    1,                          /* Module major version. Xorg-specific */
+    0,                          /* Module minor version. Xorg-specific */
+#ifdef XORG_7X
+    1,                          /* Module patchlevel. Xorg-specific */
+#else
+    0,                          /* Module patchlevel. Xorg-specific */
+#endif
+    ABI_CLASS_VIDEODRV,         /* This is a video driver */
     ABI_VIDEODRV_VERSION,
     MOD_CLASS_VIDEODRV,
@@ -415 +422 @@
         return (FALSE);
 
+    xf86Msg(X_INFO,
+            "VirtualBox guest additions video driver version "
+            VBOX_VERSION_STRING "\n");
+
     /* Get our private data from the ScrnInfoRec structure. */
     pVBox = VBOXGetRec(pScrn);

trunk/src/VBox/Additions/linux/xgraphics/vboxvideo.h

@@ -131 +131 @@
 #define VBOX_NAME               "VBoxVideo"
 #define VBOX_DRIVER_NAME        "vboxvideo"
-#define VBOX_MAJOR_VERSION      1
-#define VBOX_MINOR_VERSION      0
-#ifdef XORG_7X
-#define VBOX_PATCHLEVEL         1
-#else
-#define VBOX_PATCHLEVEL         0
-#endif
 
 /*XXX*/

trunk/src/VBox/Additions/linux/xmouse/mouse.c

@@ -65 +65 @@
 #ifdef VBOX
 #include "VBoxUtils.h"
+#include "version-generated.h"
 #endif
 
@@ -608 +609 @@
     MouseProtocolID protocolID;
     MouseProtocolPtr pProto;
+
+#ifdef VBOX
+    xf86Msg(X_INFO,
+            "VirtualBox guest additions mouse driver version "
+            VBOX_VERSION_STRING "\n");
+#endif
 
     if (!InitProtocols())

trunk/src/VBox/Additions/linux/xmouse/xorg70/mouse.c

@@ -104 +104 @@
 #ifdef VBOX
 #include "VBoxUtils.h"
+#include "version-generated.h"
 #endif
 
@@ -999 +1000 @@
     Bool detected;
     int i;
+
+#ifdef VBOX
+    xf86Msg(X_INFO,
+            "VirtualBox guest additions mouse driver version "
+            VBOX_VERSION_STRING "\n");
+#endif
 
     if (!InitProtocols())

trunk/src/VBox/Additions/linux/xmouse/xorg71/mouse.c

@@ -106 +106 @@
 #ifdef VBOX
 #include "VBoxUtils.h"
+#include "version-generated.h"
 /* Xorg 7.1 does not include xf86_ansic.h anymore. Don't reinclude this
  * file as it renamed ANSI C functions to xf86*. */
@@ -1005 +1006 @@
     Bool detected;
     int i;
+
+#ifdef VBOX
+    xf86Msg(X_INFO,
+            "VirtualBox guest additions mouse driver version "
+            VBOX_VERSION_STRING "\n");
+#endif
 
     if (!InitProtocols())