From bc284e45f4f19ecd5ffe729bf0fdff000735210f Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 15 Mar 2024 19:41:13 +0100 Subject: [PATCH] (submit/bsd-DEV_MEM) xfree86: os-support: bsd: consolidate duplicate defines Consolidate defines duplicated across several sources into one header. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/os-support/bsd/alpha_video.c | 12 +----------- hw/xfree86/os-support/bsd/arm_video.c | 8 +------- hw/xfree86/os-support/bsd/i386_video.c | 12 +----------- hw/xfree86/os-support/bsd/ppc_video.c | 2 ++ hw/xfree86/os-support/bsd/xf86_bsd_priv.h | 22 ++++++++++++++++++++++ 5 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 hw/xfree86/os-support/bsd/xf86_bsd_priv.h diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 97e08a5b4..8c69aa23e 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/pmem" - -#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 f4b14e470..5afdecaf8 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/pmem" - -#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 b146ee44d..ef5c66cb3 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/pmem" - -#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 9d6a1a344..2f4d30007 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..a98f199c9 --- /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/pmem" +#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 */