Changeset 69075 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Oct 13, 2017 2:17:38 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: Several small clean-ups.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

This change:

• Removes a forgotten unneeded dependency.
• Corrects the usage of quote and angular brackets with X.Org and X11

header files.

• Removes an out-dated comment.
• Removes the BOOL_STR macro which was only used in one place.
• Removes the unneeded initialisation of the guest library, which is no

longer used in the driver at all.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• edid.c (modified) (1 diff)
• pointer.c (modified) (1 diff)
• vboxvideo.c (modified) (5 diffs)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -41 +41 @@
 vboxvideo_override_INCLUDES = \
     -include $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/HGSMIMemAlloc.h
-
-vboxvideo.c_DEPS = $(VBOX_SVN_REV_HEADER)
 
 LIBRARIES += vboxvideo_drv_lib

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

@@ -37 +37 @@
  */
 
-#include <misc.h>
-#include <xf86DDC.h>
-#include <xf86Crtc.h>
+#include "misc.h"
+#include "xf86DDC.h"
+#include "xf86Crtc.h"
 #include "vboxvideo.h"
 

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

@@ -29 +29 @@
 
 #ifndef PCIACCESS
-# include <xf86Pci.h>
+# include "xf86Pci.h"
 # include <Pci.h>
 #endif

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

@@ -74 +74 @@
 /* For setting the root window property. */
 #include "property.h"
-#include "X11/Xatom.h"
+#include <X11/Xatom.h>
 
 #ifdef XORG_7X
@@ -491 +491 @@
 { RT_NOREF(output, mode, adjusted_mode); }
 
-/* A virtual monitor is always connected. */
 static xf86OutputStatus
 vbox_output_detect (xf86OutputPtr output)
@@ -752 +751 @@
     }
 
-    TRACE_LOG("returning %s\n", BOOL_STR(pScrn != NULL));
+    TRACE_LOG("returning %s\n", pScrn == NULL ? "false" : "true");
     return (pScrn != NULL);
 }
@@ -1085 +1084 @@
     TRACE_ENTRY();
 
-    /* Initialise our guest library if possible: ignore failure. */
-    VbglR3Init();
     if (!VBOXMapVidMem(pScrn))
         return (FALSE);
@@ -1341 +1338 @@
     ret = pScreen->CloseScreen(pScreen);
 #endif
-    VbglR3Term();
     return ret;
 }

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

@@ -93 +93 @@
     vbvxAbortServer(); \
 }
-
-#define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
 
 #include <VBoxVideoVBE.h>