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

(submit/bsd-DEV_MEM) xfree86: os-support: unexport DEV_MEM defines 

DEV_MEM define isn't used by any drivers, and BSD seems to be the only
platform using /dev/pmem instead of /dev/mem - as well as the DEV_MEM
define from xf86_OSlib.h (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.

Note that /dev/pmem refers to physical memory, not to be mixed up with
Linux's persistent memory subsys, which uses /dev/pmem[N] device nodes.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-15 17:18:07 +01:00
parent cd77fe0347
commit 90c6770d0e
4 changed files with 6 additions and 7 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

@ -42,6 +42,8 @@
#include "xf86_os_support.h" #include "xf86_os_support.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#define DEV_MEM "/dev/pmem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

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

@ -70,6 +70,8 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "compiler.h" #include "compiler.h"
#define DEV_MEM "/dev/pmem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

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

@ -40,6 +40,8 @@
#include <machine/sysarch.h> #include <machine/sysarch.h>
#endif #endif
#define DEV_MEM "/dev/pmem"
#if defined(__NetBSD__) && !defined(MAP_FILE) #if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED #define MAP_FLAGS MAP_SHARED
#else #else

7
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -111,9 +111,6 @@
#endif /* !VT_ACKACQ */ #endif /* !VT_ACKACQ */
#if defined(SVR4) #if defined(SVR4)
#if !(defined(__sun) && defined (SVR4))
#define DEV_MEM "/dev/pmem"
#endif
#define CLEARDTR_SUPPORT #define CLEARDTR_SUPPORT
#endif /* SVR4 */ #endif /* SVR4 */
@ -242,10 +239,6 @@ struct pcvtid {
#include <limits.h> #include <limits.h>
#ifndef DEV_MEM
#define DEV_MEM "/dev/mem"
#endif
#ifndef MAP_FAILED #ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1) #define MAP_FAILED ((void *)-1)
#endif #endif