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

xfree86: os-support: bsd: consolidate duplicate defines 

Consolidate defines duplicated across several sources into one header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1411>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-15 19:41:13 +01:00 committed by Marge Bot
parent 923da4d569
commit 3ed962b858
5 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,13 +42,7 @@
#include "xf86_os_support.h" #include "xf86_os_support.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#define DEV_MEM "/dev/mem" #include "xf86_bsd_priv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
#else
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
#ifndef __NetBSD__ #ifndef __NetBSD__
extern unsigned long dense_base(void); extern unsigned long dense_base(void);
@ -93,10 +87,6 @@ dense_base(void)
static int devMemFd = -1; static int devMemFd = -1;
#ifdef HAS_APERTURE_DRV
#define DEV_APERTURE "/dev/xf86"
#endif
/* /*
* Check if /dev/mem can be mmap'd. If it can't print a warning when * Check if /dev/mem can be mmap'd. If it can't print a warning when
* "warn" is TRUE. * "warn" is TRUE.

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

@ -70,13 +70,7 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "compiler.h" #include "compiler.h"
#define DEV_MEM "/dev/mem" #include "xf86_bsd_priv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
#else
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
#define BUS_BASE 0L #define BUS_BASE 0L
#define BUS_BASE_BWX 0L #define BUS_BASE_BWX 0L

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

@ -40,13 +40,7 @@
#include <machine/sysarch.h> #include <machine/sysarch.h>
#endif #endif
#define DEV_MEM "/dev/mem" #include "xf86_bsd_priv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
#else
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
#ifndef CONSOLE_X_TV_ON #ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int) #define CONSOLE_X_TV_ON _IOW('t',155,int)
@ -73,10 +67,6 @@
static Bool useDevMem = FALSE; static Bool useDevMem = FALSE;
static int devMemFd = -1; static int devMemFd = -1;
#ifdef HAS_APERTURE_DRV
#define DEV_APERTURE "/dev/xf86"
#endif
/* /*
* Check if /dev/mem can be mmap'd. If it can't print a warning when * Check if /dev/mem can be mmap'd. If it can't print a warning when
* "warn" is TRUE. * "warn" is TRUE.

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

@ -37,6 +37,8 @@
#include "bus/Pci.h" #include "bus/Pci.h"
#include "xf86_bsd_priv.h"
/***************************************************************************/ /***************************************************************************/
/* Video Memory Mapping section */ /* Video Memory Mapping section */
/***************************************************************************/ /***************************************************************************/

22
hw/xfree86/os-support/bsd/xf86_bsd_priv.h Normal file
View File

@ -0,0 +1,22 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_XFREE86_OS_SUPPORT_BSD_PRIV_H
#define _XSERVER_XFREE86_OS_SUPPORT_BSD_PRIV_H
#ifdef __OpenBSD__
#define DEV_MEM "/dev/xf86"
#else
#define DEV_MEM "/dev/mem"
#endif
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
#else
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
#define DEV_APERTURE "/dev/xf86"
#endif /* _XSERVER_XFREE86_OS_SUPPORT_BSD_PRIV_H */