Changeset 69065 in vbox

Timestamp:

Oct 12, 2017 6:48:38 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: remove dependencies on more VirtualBox headers.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Remove dependencies on product-generated.h, revision-generated.h and
VBox/param.h. Remove dependency on the subversion revision. Hard-code
the PCI Ids in the driver header and hard code the vendor name (used in one
place only) to Oracle Corporation.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• setmode.c (modified) (1 diff)
• vboxvideo.c (modified) (3 diffs)
• vboxvideo.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/setmode.c

@@ -48 +48 @@
 #endif
 #include "vboxvideo.h"
-#include "version-generated.h"
-#include "product-generated.h"
 #include "xf86.h"
 

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -44 +44 @@
 
 #include "vboxvideo.h"
-#include <VBox/param.h> /* for VBOX_DEVICEID and VBOX_VENDORID */
 #include <VBox/VBoxGuestLib.h>
 #include <VBoxVideoVBE.h>
-#include "version-generated.h"
-#include "product-generated.h"
-#include "revision-generated.h"
 
 /* Basic definitions and functions needed by all drivers. */
@@ -598 +594 @@
 {
     VBOX_DRIVER_NAME,
-    VBOX_VENDOR,
+    "Oracle Corporation",
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -849 +845 @@
         return (FALSE);
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VirtualBox guest additions video driver version " VBOX_VERSION_STRING "r%d\n",
-               VBOX_SVN_REV);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+               "VirtualBox guest additions video driver version %d.%d\n",
+               VBOX_VERSION_MAJOR, VBOX_VERSION_MINOR);
 
     /* The ramdac module is needed for the hardware cursor. */

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -46 +46 @@
 #include <VBoxVideo.h>
 #include "version-generated.h"
+
+#define VBOX_VENDORID 0x80EE
+#define VBOX_DEVICEID 0xBEEF
 
 #ifndef VBVA_SCREEN_F_BLANK
@@ -98 +101 @@
 #include "xf86Cursor.h"
 
-#define VBOX_VERSION            VBOX_VERSION_MAJOR * 10000 + VBOX_VERSION_MINOR * 100 + VBOX_VERSION_BUILD
+#define VBOX_VERSION            VBOX_VERSION_MAJOR * 10000 \
+                              + VBOX_VERSION_MINOR * 100
 #define VBOX_NAME               "VBoxVideo"
 #define VBOX_DRIVER_NAME        "vboxvideo"