diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 3d1d92467..4d61eeac2 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -42,13 +42,7 @@ #include "xf86_os_support.h" #include "xf86_OSlib.h" -#define DEV_MEM "/dev/mem" - -#if defined(__NetBSD__) && !defined(MAP_FILE) -#define MAP_FLAGS MAP_SHARED -#else -#define MAP_FLAGS (MAP_FILE | MAP_SHARED) -#endif +#include "xf86_bsd_priv.h" #ifndef __NetBSD__ extern unsigned long dense_base(void); @@ -93,10 +87,6 @@ dense_base(void) 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 * "warn" is TRUE. diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index b3da3b2ba..ac34c9ad6 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -70,13 +70,7 @@ #include "xf86_OSlib.h" #include "compiler.h" -#define DEV_MEM "/dev/mem" - -#if defined(__NetBSD__) && !defined(MAP_FILE) -#define MAP_FLAGS MAP_SHARED -#else -#define MAP_FLAGS (MAP_FILE | MAP_SHARED) -#endif +#include "xf86_bsd_priv.h" #define BUS_BASE 0L #define BUS_BASE_BWX 0L diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index ef64a61ed..6374b5f80 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -40,13 +40,7 @@ #include #endif -#define DEV_MEM "/dev/mem" - -#if defined(__NetBSD__) && !defined(MAP_FILE) -#define MAP_FLAGS MAP_SHARED -#else -#define MAP_FLAGS (MAP_FILE | MAP_SHARED) -#endif +#include "xf86_bsd_priv.h" #ifndef CONSOLE_X_TV_ON #define CONSOLE_X_TV_ON _IOW('t',155,int) @@ -73,10 +67,6 @@ static Bool useDevMem = FALSE; 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 * "warn" is TRUE. diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 7a64f4b83..493f886ee 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -37,6 +37,8 @@ #include "bus/Pci.h" +#include "xf86_bsd_priv.h" + /***************************************************************************/ /* Video Memory Mapping section */ /***************************************************************************/ diff --git a/hw/xfree86/os-support/bsd/xf86_bsd_priv.h b/hw/xfree86/os-support/bsd/xf86_bsd_priv.h new file mode 100644 index 000000000..477f2d054 --- /dev/null +++ b/hw/xfree86/os-support/bsd/xf86_bsd_priv.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#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 */