frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-14 13:14:43 +01:00 committed by Marge Bot
parent a5cfe020f5
commit 533c45e595
15 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/os-support/bsd/alpha_video.c
View File

@ -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

2
hw/xfree86/os-support/bsd/arm_video.c
View File

@ -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)

3
hw/xfree86/os-support/bsd/bsd_ev56.c
View File

@ -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>

2
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -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

3
hw/xfree86/os-support/bsd/ppc_video.c
View File

@ -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"

4
hw/xfree86/os-support/bsd/sparc64_video.c
View File

@ -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 */

2
hw/xfree86/os-support/hurd/hurd_video.c
View File

@ -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

1
hw/xfree86/os-support/linux/lnx_agp.c
View File

@ -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>

2
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -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;

3
hw/xfree86/os-support/shared/agp_noop.c
View File

@ -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)

1
hw/xfree86/os-support/shared/vidmem.c
View File

@ -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

4
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -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 */

2
hw/xfree86/os-support/stub/stub_video.c
View File

@ -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)

2
hw/xfree86/os-support/xf86OSpriv.h
View File

@ -36,6 +36,4 @@ typedef struct {
Bool initialised;
} VidMemInfo, *VidMemInfoPtr;
void xf86OSInitVidMem(VidMemInfoPtr);
#endif /* _XF86OSPRIV_H */

4
hw/xfree86/os-support/xf86_os_support.h
View File

@ -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 */