SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-08-16 22:25:46 +00:00
parent 4b69692ae6
commit 50c8bafd9f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
4 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
distrib/sets/lists/xshare/mi
View file

@ -674,11 +674,6 @@
./usr/X11R6/include/xcb/xtest.h
./usr/X11R6/include/xcb/xv.h
./usr/X11R6/include/xcb/xvmc.h
./usr/X11R6/lib/X11/x11perfcomp
./usr/X11R6/lib/X11/x11perfcomp/Xmark
./usr/X11R6/lib/X11/x11perfcomp/fillblnk
./usr/X11R6/lib/X11/x11perfcomp/perfboth
./usr/X11R6/lib/X11/x11perfcomp/perfratio
./usr/X11R6/lib/X11/xedit
./usr/X11R6/lib/X11/xedit/lisp
./usr/X11R6/lib/X11/xedit/lisp/indent.lsp
@ -2858,6 +2853,11 @@
./usr/X11R6/share/X11/locale/zh_TW/XI18N_OBJS
./usr/X11R6/share/X11/locale/zh_TW/XLC_LOCALE
./usr/X11R6/share/X11/rgb.txt
./usr/X11R6/share/X11/x11perfcomp
./usr/X11R6/share/X11/x11perfcomp/Xmark
./usr/X11R6/share/X11/x11perfcomp/fillblnk
./usr/X11R6/share/X11/x11perfcomp/perfboth
./usr/X11R6/share/X11/x11perfcomp/perfratio
./usr/X11R6/share/X11/xkb
./usr/X11R6/share/X11/xkb/compat
./usr/X11R6/share/X11/xkb/compat/README

22
xserver/hw/xfree86/os-support/bsd/bsd_init.c
View file

@ -430,7 +430,7 @@ xf86OpenSyscons(void)
xf86Info.vtno = -1;
}
#if 0
}
}
#endif
if (xf86Info.vtno == -1) {
@ -458,11 +458,8 @@ xf86OpenSyscons(void)
}
close(fd);
#ifndef __OpenBSD__
snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x", xf86Info.vtno - 1);
#else
sprintf(vtname, sizeof(vtname), "/dev/ttyC%01x", xf86Info.vtno - 1);
#endif
snprintf(vtname, sizeof(vtname), "/dev/ttyv%01x",
xf86Info.vtno - 1);
if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0) {
FatalError("xf86OpenSyscons: Cannot open %s (%s)",
vtname, strerror(errno));
@ -525,7 +522,7 @@ xf86OpenPcvt(void)
#endif
if (fd >= 0) {
if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0) {
if(ioctl(fd, VT_GETMODE, &vtmode) < 0) {
if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {
FatalError("%s: VT_GETMODE failed\n%s%s\n%s",
"xf86OpenPcvt",
"Found pcvt driver but X11 seems to be",
@ -551,22 +548,23 @@ xf86OpenPcvt(void)
xf86Info.vtno = initialVT;
}
else {
FatalError("%s: Cannot find a free VT",
"xf86OpenPcvt");
FatalError("%s: Cannot find a free VT", "xf86OpenPcvt");
}
}
}
close(fd);
snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
xf86Info.vtno - 1);
if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
vtname, strerror(errno));
xf86Info.vtno = initialVT;
snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix, xf86Info.vtno - 1);
snprintf(vtname, sizeof(vtname), "%s%01x", vtprefix,
xf86Info.vtno - 1);
if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
FatalError("xf86OpenPcvt: Cannot open %s (%s)",
vtname, strerror(errno));
vtname, strerror(errno));
}
}
if (ioctl(fd, VT_GETMODE, &vtmode) < 0) {

74
xserver/hw/xfree86/os-support/bsd/i386_video.c
View file

@ -83,11 +83,11 @@ checkDevMem(Bool warn)
/* Try the aperture driver first */
if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
/* Try to map a page at the VGA address */
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t)0xA0000);
base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t) 0xA0000);
if (base != MAP_FAILED) {
munmap((caddr_t)base, 4096);
munmap((caddr_t) base, 4096);
devMemFd = fd;
useDevMem = TRUE;
xf86Msg(X_PROBED, "checkDevMem: using aperture driver %s\n",
@ -104,16 +104,17 @@ checkDevMem(Bool warn)
#endif
if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
/* Try to map a page at the VGA address */
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t)0xA0000);
base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t) 0xA0000);
if (base != MAP_FAILED) {
munmap((caddr_t)base, 4096);
munmap((caddr_t) base, 4096);
devMemFd = fd;
useDevMem = TRUE;
return;
}
else {
if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno));
@ -128,17 +129,19 @@ checkDevMem(Bool warn)
#else
#ifndef __OpenBSD__
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
#else /* __OpenBSD__ */
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
"\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
SYSCTL_MSG);
#endif /* __OpenBSD__ */
xf86ErrorF("\tlinear framebuffer access unavailable\n");
}
useDevMem = FALSE;
return;
#endif
}
@ -148,6 +151,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
checkDevMem(TRUE);
pci_system_init_dev_mem(devMemFd);
pVidMem->initialised = TRUE;
}
@ -159,7 +163,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
static Bool ExtendedEnabled = FALSE;
Bool
xf86EnableIO()
xf86EnableIO(void)
{
if (ExtendedEnabled)
return TRUE;
@ -180,7 +184,7 @@ xf86EnableIO()
}
void
xf86DisableIO()
xf86DisableIO(void)
{
if (!ExtendedEnabled)
return;
@ -203,7 +207,7 @@ xf86DisableIO()
static Bool ExtendedEnabled = FALSE;
Bool
xf86EnableIO()
xf86EnableIO(void)
{
if (ExtendedEnabled)
return TRUE;
@ -224,7 +228,7 @@ xf86EnableIO()
}
void
xf86DisableIO()
xf86DisableIO(void)
{
if (!ExtendedEnabled)
return;
@ -244,7 +248,7 @@ xf86DisableIO()
static int IoFd = -1;
Bool
xf86EnableIO()
xf86EnableIO(void)
{
if (IoFd >= 0)
return TRUE;
@ -258,7 +262,7 @@ xf86EnableIO()
}
void
xf86DisableIO()
xf86DisableIO(void)
{
if (IoFd < 0)
return;
@ -279,18 +283,18 @@ xf86SetTVOut(int mode)
{
switch (xf86Info.consType) {
#ifdef PCCONS_SUPPORT
case PCCONS:{
case PCCONS:{
if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to TV output, %s\n",
strerror(errno));
}
}
break;
#endif /* PCCONS_SUPPORT */
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to TV output, %s\n",
strerror(errno));
}
}
break;
#endif /* PCCONS_SUPPORT */
default:
default:
FatalError("Xf86SetTVOut: Unsupported console");
break;
}
@ -298,22 +302,22 @@ xf86SetTVOut(int mode)
}
void
xf86SetRGBOut()
xf86SetRGBOut(void)
{
switch (xf86Info.consType) {
#ifdef PCCONS_SUPPORT
case PCCONS:{
case PCCONS:{
if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to RGB output, %s\n",
strerror(errno));
}
}
break;
#endif /* PCCONS_SUPPORT */
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to RGB output, %s\n",
strerror(errno));
}
}
break;
#endif /* PCCONS_SUPPORT */
default:
default:
FatalError("Xf86SetTVOut: Unsupported console");
break;
}

1
xserver/os/Makefile.am
View file

@ -31,7 +31,6 @@ libos_la_SOURCES = \
xstrans.c \
xprintf.c \
$(XORG_SRCS)
libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) $(LTLIBOBJS)
if SECURE_RPC