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

xfree86: os-support: move CONSOLE_X_TV_ON/OFF to i386_video.c 

These are only used in i386_video.c, so move them there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-15 18:51:57 +01:00 committed by Marge Bot
parent 758bee502d
commit 4d677fab46
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,14 @@
#define MAP_FLAGS (MAP_FILE | MAP_SHARED) #define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif #endif
#ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int)
#endif
#ifndef CONSOLE_X_TV_OFF
#define CONSOLE_X_TV_OFF _IO('t',156)
#endif
#ifdef __OpenBSD__ #ifdef __OpenBSD__
#define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\ #define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\
"\tin /etc/sysctl.conf and reboot your machine\n" \ "\tin /etc/sysctl.conf and reboot your machine\n" \

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

@ -195,13 +195,6 @@ struct pcvtid {
#endif /* WSCONS_SUPPORT */ #endif /* WSCONS_SUPPORT */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <sys/mouse.h> #include <sys/mouse.h>
#endif
/* Include these definitions in case ioctl_pc.h didn't get included */
#ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int)
#endif
#ifndef CONSOLE_X_TV_OFF
#define CONSOLE_X_TV_OFF _IO('t',156)
#endif #endif
#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL) #if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)