Changeset 69079 in vbox

Timestamp:

Oct 13, 2017 3:27:12 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: Drop dependency on IPRT header files.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Remove (hopefully) all dependencies on IPRT header files inside of the X.Org
vboxvideo driver and provide the dependencies which are still useful in the
form of a single, local VBoxVideoIPRT.h file. These are mainly definitions
and macros.

Location:

trunk/src/VBox/Additions/x11

Files:

• undefined_xorg (modified) (1 diff)
• vboxvideo/Makefile.kmk (modified) (4 diffs)
• vboxvideo/VBoxVideoIPRT.h (added)
• vboxvideo/getmode.c (modified) (2 diffs)
• vboxvideo/pointer.c (modified) (3 diffs)
• vboxvideo/vboxvideo.c (modified) (2 diffs)
• vboxvideo/vboxvideo.h (modified) (1 diff)
• vboxvideo/vbva.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/undefined_xorg

@@ -4 +4 @@
 # it fixing that would add additional complexity.
 
+__assert_fail
 calloc
 chdir

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

@@ -40 +40 @@
         $(VBOX_GRAPHICS_INCS)
 vboxvideo_override_INCLUDES = \
-    -include $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/HGSMIMemAlloc.h
+        -include $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h \
+        -include $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/HGSMIMemAlloc.h
 
 LIBRARIES += vboxvideo_drv_lib
@@ -48 +49 @@
 #
 vboxvideo_drv_lib_TEMPLATE = VBOXGUESTR3XORGMOD
+# We are relying in the include guard in the two headers below to stop the more
+# generic ones from being included.  Not very nice, I know.
 vboxvideo_drv_lib_CFLAGS += $(vboxvideo_override_INCLUDES)
 vboxvideo_drv_lib_CXXFLAGS += $(vboxvideo_override_INCLUDES)
@@ -60 +63 @@
         $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
         $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/hgsmimemalloc.c
+# $(VBOX_PATH_X11_ROOT)/xorg-server-1.18.0 is for in[blw] and out[blw], xproto
+# for _X_[UN]LIKELY.
 vboxvideo_drv_lib_INCS = \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.18.0 \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
         $(PATH_ROOT)/src/VBox/Runtime/include \
         $(VBOX_GRAPHICS_INCS)
@@ -88 +96 @@
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
         IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
-vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
 vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \

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

@@ -29 +29 @@
 
 #define NEED_XF86_TYPES
-#include <iprt/string.h>
-
 #include "xf86.h"
 
@@ -36 +34 @@
 # include <stdio.h>
 # include <stdlib.h>
+# include <string.h>
 #endif
 

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

@@ -26 +26 @@
  */
 
-#include <VBox/VBoxGuestLib.h>
-
 #ifndef PCIACCESS
 # include "xf86Pci.h"
@@ -35 +33 @@
 #include "xf86.h"
 #define NEED_XF86_TYPES
-#include <iprt/string.h>
 #include "compiler.h"
 #include "cursorstr.h"
@@ -44 +41 @@
 #ifdef XORG_7X
 # include <stdlib.h>
+# include <string.h>
 #endif
 

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

@@ -44 +44 @@
 
 #include "vboxvideo.h"
-#include <VBox/VBoxGuestLib.h>
 #include <VBoxVideoVBE.h>
 
@@ -252 +251 @@
     VBVXASSERT(pPixmap != NULL, ("Failed to get the screen pixmap.\n"));
     TRACE_LOG("pPixmap=%p adjustedWidth=%d height=%d pScrn->depth=%d pScrn->bitsPerPixel=%d cbLine=%d pVBox->base=%p pPixmap->drawable.width=%d pPixmap->drawable.height=%d\n",
-              (void *)pPixmap, adjustedWidth, height, pScrn->depth, pScrn->bitsPerPixel, cbLine, pVBox->base, pPixmap->drawable.width,
-              pPixmap->drawable.height);
+              (void *)pPixmap, adjustedWidth, height, pScrn->depth,
+              pScrn->bitsPerPixel, cbLine, pVBox->base,
+              pPixmap->drawable.width, pPixmap->drawable.height);
     if (   adjustedWidth != pPixmap->drawable.width
         || height != pPixmap->drawable.height)

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

@@ -86 +86 @@
     xf86ErrorF("\nAssertion failed!\n\n"); \
     xf86ErrorF("%s\n", #expr); \
-    xf86ErrorF("at %s (%s:%d)\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, __FILE__, __LINE__); \
+    xf86ErrorF("at %s (%s:%d)\n", __func__, __FILE__, __LINE__); \
     xf86ErrorF out; \
     FatalError("Assertion"); \

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

@@ -26 +26 @@
  */
 
-#include <VBox/VBoxGuestLib.h>
-
-#include <iprt/string.h>
+#if defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
+# include "xf86_ansic.h"
+#endif
 #include "compiler.h"
 
@@ -35 +35 @@
 #ifdef XORG_7X
 # include <stdlib.h>
+# include <string.h>
 #endif