xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 10 15:34:16 UTC 2024
hw/xfree86/os-support/bsd/bsd_bell.c | 4 ++++
hw/xfree86/os-support/bsd/bsd_init.c | 8 ++++++++
hw/xfree86/os-support/bsd/i386_video.c | 12 ++++++++++++
hw/xfree86/os-support/xf86_OSlib.h | 33 ---------------------------------
4 files changed, 24 insertions(+), 33 deletions(-)
New commits:
commit bd40e9f836c237e953895ddd44d5b11200ad4fa7
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Mar 18 13:26:06 2024 +0100
xfree86: os-support: move including machine/sysarch.h out of public header
The only consumer seems to be one BSD specific file, the few drivers using
the *_iopl seem to include it on their own. Thus, no need to keep it in
public headers.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 3a5b354ae..607e4ca2b 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -36,6 +36,10 @@
#include "xf86Priv.h"
#include "xf86_OSlib.h"
+#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
+#include <machine/sysarch.h>
+#endif
+
#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 a4a0f517f..2508eaa06 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -197,10 +197,6 @@ struct pcvtid {
#include <sys/mouse.h>
#endif
-#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
-#include <machine/sysarch.h>
-#endif
-
#define CLEARDTR_SUPPORT
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
commit 4d677fab46026fae45448e92d7d4d4695494c960
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 15 18:51:57 2024 +0100
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 at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 403aa08cc..3a5b354ae 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -42,6 +42,14 @@
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#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__
#define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\
"\tin /etc/sysctl.conf and reboot your machine\n" \
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index b87dc8463..a4a0f517f 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -195,13 +195,6 @@ struct pcvtid {
#endif /* WSCONS_SUPPORT */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#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
#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
commit 758bee502d215d5f1d79a651fe2315884a44134c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 15 18:47:12 2024 +0100
xfree86: os-support: move CONSOLE_X_MODE_ON/OFF to bsd_init.c
These are only used in bsd_init.c, so move them there.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 2ef34ba29..5c1323e1a 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -45,6 +45,14 @@
#include "os/osdep.h"
+#ifndef CONSOLE_X_MODE_ON
+#define CONSOLE_X_MODE_ON _IO('t',121)
+#endif
+
+#ifndef CONSOLE_X_MODE_OFF
+#define CONSOLE_X_MODE_OFF _IO('t',122)
+#endif
+
static Bool KeepTty = FALSE;
#ifdef PCCONS_SUPPORT
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 3cbc19ff7..b87dc8463 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -197,12 +197,6 @@ struct pcvtid {
#include <sys/mouse.h>
#endif
/* Include these definitions in case ioctl_pc.h didn't get included */
-#ifndef CONSOLE_X_MODE_ON
-#define CONSOLE_X_MODE_ON _IO('t',121)
-#endif
-#ifndef CONSOLE_X_MODE_OFF
-#define CONSOLE_X_MODE_OFF _IO('t',122)
-#endif
#ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int)
#endif
commit 8958a99c02049e7883443d4da49544d3e39ee42e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 15 18:46:18 2024 +0100
xfree86: os-support: move CONSOLE_X_BELL into bsd_bell.c
This define is only used inside bsd_bell.c, so move it there.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index 2b0bba2f6..1a60a8ad9 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -38,6 +38,10 @@
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
+#ifndef CONSOLE_X_BELL
+#define CONSOLE_X_BELL _IOW('t',123,int[2])
+#endif
+
void
xf86OSRingBell(int loudness, int pitch, int duration)
{
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index c33e7897e..3cbc19ff7 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -203,9 +203,6 @@ struct pcvtid {
#ifndef CONSOLE_X_MODE_OFF
#define CONSOLE_X_MODE_OFF _IO('t',122)
#endif
-#ifndef CONSOLE_X_BELL
-#define CONSOLE_X_BELL _IOW('t',123,int[2])
-#endif
#ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int)
#endif
commit d7e0d174a51e004d4aaf415c45d7891db30f04a4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 15 18:41:43 2024 +0100
xfree86: os-support: drop unused CONSOLE_GET_* defines
These don't seem to be used anywhere, so we can drop them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 8adb0074f..c33e7897e 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -212,15 +212,6 @@ struct pcvtid {
#ifndef CONSOLE_X_TV_OFF
#define CONSOLE_X_TV_OFF _IO('t',156)
#endif
-#ifndef CONSOLE_GET_LINEAR_INFO
-#define CONSOLE_GET_LINEAR_INFO _IOR('t',157,struct map_info)
-#endif
-#ifndef CONSOLE_GET_IO_INFO
-#define CONSOLE_GET_IO_INFO _IOR('t',158,struct map_info)
-#endif
-#ifndef CONSOLE_GET_MEM_INFO
-#define CONSOLE_GET_MEM_INFO _IOR('t',159,struct map_info)
-#endif
#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
#include <machine/sysarch.h>
commit 0560cb35ce393ab4105b34fc54114f54df722b6b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Mar 25 13:53:01 2024 +0100
xfree86. os-support: drop obsolete XMODE_* defines
These only had been used by xf86-video-chips, but meanwhile this
defines them on it's own, so we can drop them from here now.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 0b8363faf..8adb0074f 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -208,10 +208,6 @@ struct pcvtid {
#endif
#ifndef CONSOLE_X_TV_ON
#define CONSOLE_X_TV_ON _IOW('t',155,int)
-#define XMODE_RGB 0
-#define XMODE_NTSC 1
-#define XMODE_PAL 2
-#define XMODE_SECAM 3
#endif
#ifndef CONSOLE_X_TV_OFF
#define CONSOLE_X_TV_OFF _IO('t',156)
More information about the xorg-commit
mailing list