ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 05:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove workaround for ancient FreeBSD versions before 2.2.8.

Browse Source 
This workaround was unnecessarily active for current DragonFlyBSD,
as well as probably for current FreeBSD as well, because the
"pcvt" console support would be used by default. Hence this adds
explicit code for the PCVT case to skip the quirk on FreeBSD and
DragonFlyBSD.

Signed-off-by: Imre Vadász <imre@vdsz.com>
This commit is contained in:
Imre Vadász 2026-01-11 21:12:24 +01:00 committed by Enrico Weigelt
parent b5f2c96901
commit e0f4acc929
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -38,7 +38,6 @@
#include "xf86_OSlib.h"
#include "xf86_OSproc.h"
#include <sys/utsname.h>
#include <sys/ioctl.h>
#include <stdlib.h>
#include <errno.h>
@ -152,9 +151,6 @@ xf86OpenConsole(void)
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
int result;
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
struct utsname uts;
#endif
vtmode_t vtmode;
#endif
@ -207,18 +203,15 @@ xf86OpenConsole(void)
switch (xf86Info.consType) {
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
case SYSCONS:
/* as of FreeBSD 2.2.8, syscons driver does not need the #1 vt
* switching anymore. Here we check for FreeBSD 3.1 and up.
* Add cases for other *BSD that behave the same.
/*
* As of FreeBSD 2.2.8, syscons driver does not need the #1 vt
* switching anymore.
*/
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
uname(&uts);
i = atof(uts.release) * 100;
if (i >= 310)
goto acquire_vt;
#endif
/* otherwise fall through */
goto acquire_vt;
case PCVT:
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
goto acquire_vt;
#endif
#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
/*
* First activate the #1 VT. This is a hack to allow a server
@ -226,16 +219,13 @@ xf86OpenConsole(void)
* a better way.
*/
if (initialVT != 1) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) {
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
}
sleep(1);
}
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
acquire_vt:
#endif
acquire_vt:
if (!xf86Info.ShareVTs) {
/*
* now get the VT