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

Various messages clean-ups.

This commit is contained in:
Matthieu Herrb 2008-05-19 08:09:33 +02:00 committed by Matthieu Herrb
parent 41a65e1104
commit 155fcecb32
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,8 +310,7 @@ acquire_vt:
#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
#ifdef WSCONS_SUPPORT #ifdef WSCONS_SUPPORT
case WSCONS: case WSCONS:
fprintf(stderr, "xf86OpenConsole\n"); /* Nothing to do */
/* xf86Info.consoleFd = open("/dev/wskbd0", 0); */
break; break;
#endif #endif
} }
@ -575,8 +574,14 @@ xf86OpenPcvt()
sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1); sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1);
if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0)
{ {
FatalError("xf86OpenPcvt: Cannot open %s (%s)", ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
vtname, strerror(errno)); vtname, strerror(errno));
xf86Info.vtno = initialVT;
sprintf(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));
}
} }
if (ioctl(fd, VT_GETMODE, &vtmode) < 0) if (ioctl(fd, VT_GETMODE, &vtmode) < 0)
{ {
@ -585,8 +590,8 @@ xf86OpenPcvt()
xf86Info.consType = PCVT; xf86Info.consType = PCVT;
#ifdef WSCONS_SUPPORT #ifdef WSCONS_SUPPORT
xf86Msg(X_PROBED, xf86Msg(X_PROBED,
"Using wscons driver in pcvt compatibility mode " "Using wscons driver on %s in pcvt compatibility mode "
"(version %d.%d)\n", "(version %d.%d)\n", vtname,
pcvt_version.rmajor, pcvt_version.rminor); pcvt_version.rmajor, pcvt_version.rminor);
#else #else
xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n", xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
@ -620,7 +625,7 @@ xf86OpenWScons()
#if defined(__NetBSD__) #if defined(__NetBSD__)
sprintf(ttyname, "/dev/ttyE%d", i); sprintf(ttyname, "/dev/ttyE%d", i);
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
sprintf(ttyname, "/dev/ttyC%d", i); sprintf(ttyname, "/dev/ttyC%x", i);
#endif #endif
if ((fd = open(ttyname, 2)) != -1) if ((fd = open(ttyname, 2)) != -1)
break; break;
@ -662,7 +667,7 @@ xf86CloseConsole()
VT.mode = VT_AUTO; VT.mode = VT_AUTO;
ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */ ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */
} }
#if !defined(USE_DEV_IO) && !defined(USE_I386_IOPL) #if !defined(OpenBSD) && !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)
if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0) if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0)
{ {
xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)", xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",