Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetics.

Browse Source
This commit is contained in:
augustss 2001-10-27 13:52:57 +00:00
parent 5d461f21ee
commit 546b6e4434
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.56 2001/10/24 14:07:32 augustss Exp $ */
/* $NetBSD: wsdisplay.c,v 1.57 2001/10/27 13:52:57 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -37,7 +37,7 @@
#include "wsdisplay.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.56 2001/10/24 14:07:32 augustss Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.57 2001/10/27 13:52:57 augustss Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -1656,16 +1656,17 @@ wsdisplay_kbdholdscreen(struct device *dev, int hold)
#if NWSKBD > 0
struct device *
wsdisplay_set_console_kbd(struct wsevsrc *kbd)
wsdisplay_set_console_kbd(struct wsevsrc *src)
{
if (wsdisplay_console_device == NULL)
return (NULL);
#if NWSMUX > 0
if (wskbd_add_mux(kbd->me_dv.dv_unit,
(struct wsmux_softc *)wsdisplay_console_device->sc_input))
if (wsmux_attach_sc(
(struct wsmux_softc *)wsdisplay_console_device->sc_input,
src))
return (NULL);
#else
wsdisplay_console_device->sc_input = kbd;
wsdisplay_console_device->sc_input = src;
#endif
return (&wsdisplay_console_device->sc_dv);
}

9
sys/dev/wscons/wskbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.54 2001/10/27 00:39:29 augustss Exp $ */
/* $NetBSD: wskbd.c,v 1.55 2001/10/27 13:52:57 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.54 2001/10/27 00:39:29 augustss Exp $");
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.55 2001/10/27 13:52:57 augustss Exp $");
/*
* Copyright (c) 1992, 1993
@ -358,7 +358,8 @@ wskbd_attach(struct device *parent, struct device *self, void *aux)
#endif
#if NWSMUX > 0
mux = sc->sc_base.me_dv.dv_cfdata->wskbddevcf_mux;
if (sc->sc_isconsole && mux >= 0) {
if (ap->console) {
/* Ignore mux for console; it always goes to the console mux. */
/* printf(" (mux %d ignored for console)", mux); */
mux = -1;
}
@ -1117,7 +1118,7 @@ wskbd_set_display(struct device *dv, struct wsevsrc *me)
struct device *odisplaydv;
int error;
DPRINTF(("wskbd_set_display: %s me=%p disp=%p odisp=%p cons=%d\n",
DPRINTF(("wskbd_set_display: %s me=%p odisp=%p disp=%p cons=%d\n",
dv->dv_xname, me, sc->sc_base.me_dispdv, displaydv,
sc->sc_isconsole));