xserver: Branch 'master' - 2 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Feb 6 16:28:07 UTC 2025 

 hw/xfree86/os-support/bsd/alpha_video.c   |   10 +---------
 hw/xfree86/os-support/bsd/arm_video.c     |    6 +-----
 hw/xfree86/os-support/bsd/i386_video.c    |   10 +---------
 hw/xfree86/os-support/bsd/ppc_video.c     |    2 ++
 hw/xfree86/os-support/bsd/xf86_bsd_priv.h |   22 ++++++++++++++++++++++
 hw/xfree86/os-support/xf86_OSlib.h        |    4 ----
 6 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 3ed962b85835643530b1c824c2e3b9538d5447dc
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Mar 15 19:41:13 2024 +0100

    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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1411>

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 <machine/sysarch.h>
 #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 <info at 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 */
commit 923da4d56992b35c64c9fc87201785c95305f548
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Mar 15 17:18:07 2024 +0100

    xfree86: os-support: unexport DEV_MEM defines
    
    DEV_MEM define isn't used by any drivers, and BSD seems to be the only one
    left using that define (Linux uses the symbol, but defines on its own)
    
    Therefore, just define it where actually used and drop it from the global
    xf86OSlib.h file.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1411>

diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 279391e42..3d1d92467 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -42,6 +42,8 @@
 #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
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 15b12a86f..b3da3b2ba 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -70,6 +70,8 @@
 #include "xf86_OSlib.h"
 #include "compiler.h"
 
+#define DEV_MEM "/dev/mem"
+
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
 #else
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 607e4ca2b..ef64a61ed 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -40,6 +40,8 @@
 #include <machine/sysarch.h>
 #endif
 
+#define DEV_MEM "/dev/mem"
+
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
 #else
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index f973ace86..582d5a9d8 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -230,10 +230,6 @@ struct pcvtid {
 
 #include <limits.h>
 
-#ifndef DEV_MEM
-#define DEV_MEM "/dev/mem"
-#endif
-
 #ifndef MAP_FAILED
 #define MAP_FAILED ((void *)-1)
 #endif

More information about the xorg-commit mailing list