xfree86: os-support: move xf86OSInitVidMem() to xf86_os_support.h

This function isn't exported at all, so it better fits into xf86_os_support.h,
whose purpose is being the primary entry point into os-support layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>

15 files changed, 19 insertions, 18 deletions

diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 670193c0d..279391e42 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -39,8 +39,8 @@
 #include <sys/sysctl.h>
 #endif
 
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 647ebf46c..15b12a86f 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -65,9 +65,9 @@
 #include <X11/X.h>
 
 #include "xf86.h"
+#include "xf86_os_support."
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 #include "compiler.h"
 
 #if defined(__NetBSD__) && !defined(MAP_FILE)
diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c
index 95883491b..6a190ab4e 100644
--- a/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -4,14 +4,15 @@
 #endif
 
 #include <X11/X.h>
+
 #include "input.h"
 #include "scrnintstr.h"
 #include "compiler.h"
 
 #include "xf86.h"
+#include "xf86_os_support.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 #include <machine/bwx.h>
 
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 625514e70..403aa08cc 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -32,9 +32,9 @@
 #include <X11/X.h>
 
 #include "xf86.h"
+#include "xf86_os_support.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index bd929b208..7a64f4b83 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -32,9 +32,8 @@
 
 #include "xf86.h"
 #include "xf86Priv.h"
-
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 #include "bus/Pci.h"
 
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
index 3f8cccd19..c456eaf6a 100644
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -28,11 +28,11 @@
 #endif
 
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
-
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 63f3aef71..f39142293 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -37,8 +37,8 @@
 
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 /**************************************************************************
  * Video Memory Mapping section
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 28814c889..c1bc6fac7 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -18,7 +18,6 @@
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 #if defined(__linux__)
 #include <asm/ioctl.h>
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 8ff0f0bc5..a74b994ab 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -36,9 +36,9 @@
 #include "scrnintstr.h"
 
 #include "xf86.h"
+#include "xf86_os_support.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 static Bool ExtendedEnabled = FALSE;
 
diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c
index 5f2a57854..284e0605f 100644
--- a/hw/xfree86/os-support/shared/agp_noop.c
+++ b/hw/xfree86/os-support/shared/agp_noop.c
@@ -35,11 +35,12 @@
 #endif
 
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
+#include "xf86_os_support.h"
 
 Bool
 xf86GARTCloseScreen(int screenNum)
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
index 1eb4986f8..26ae587f5 100644
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ b/hw/xfree86/os-support/shared/vidmem.c
@@ -37,7 +37,6 @@
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 /*
  * This file contains the common part of the video memory mapping functions
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 01a2bd89b..ac66bdf51 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -56,12 +56,12 @@
 #include <sys/psw.h>
 #endif /* defined(__i386__) || defined(__i386) || defined(__x86) */
 
+#include <sys/mman.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-#include <sys/mman.h>
 
 /***************************************************************************/
 /* Video Memory Mapping section 					   */
diff --git a/hw/xfree86/os-support/stub/stub_video.c b/hw/xfree86/os-support/stub/stub_video.c
index 9771fcf6e..d52285d29 100644
--- a/hw/xfree86/os-support/stub/stub_video.c
+++ b/hw/xfree86/os-support/stub/stub_video.c
@@ -2,8 +2,8 @@
 #include <xorg-config.h>
 #endif
 
+#include "xf86_os_support.h"
 #include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
 
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h
index ce1ec33a1..1210bafe1 100644
--- a/hw/xfree86/os-support/xf86OSpriv.h
+++ b/hw/xfree86/os-support/xf86OSpriv.h
@@ -36,6 +36,4 @@ typedef struct {
     Bool initialised;
 } VidMemInfo, *VidMemInfoPtr;
 
-void xf86OSInitVidMem(VidMemInfoPtr);
-
 #endif                          /* _XF86OSPRIV_H */
diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h
index ae0f651c3..ccb163005 100644
--- a/hw/xfree86/os-support/xf86_os_support.h
+++ b/hw/xfree86/os-support/xf86_os_support.h
@@ -10,6 +10,8 @@
 
 #include <X11/Xdefs.h>
 
+#include "xf86OSpriv.h"
+
 typedef void (*PMClose) (void);
 
 void xf86OpenConsole(void);
@@ -29,4 +31,6 @@ void xf86OSInputThreadInit(void);
 Bool xf86DeallocateGARTMemory(int screenNum, int key);
 int xf86RemoveSIGIOHandler(int fd);
 
+void xf86OSInitVidMem(VidMemInfoPtr);
+
 #endif /* _XSERVER_XF86_OS_SUPPORT */