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 00:39:29 +00:00
parent b609967aa7
commit 14fc12f3b4
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.53 2001/10/27 00:35:48 augustss Exp $ */
/* $NetBSD: wskbd.c,v 1.54 2001/10/27 00:39:29 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.53 2001/10/27 00:35:48 augustss Exp $");
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.54 2001/10/27 00:39:29 augustss Exp $");
/*
* Copyright (c) 1992, 1993
@ -572,7 +572,7 @@ wskbd_input(struct device *dev, u_int type, int value)
}
/*
* If /dev/wskbd is not connected in event mode translate and
* If /dev/wskbdN is not connected in event mode translate and
* send upstream.
*/
if (sc->sc_translating) {

14
sys/dev/wscons/wsmux.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsmux.c,v 1.19 2001/10/27 00:34:57 augustss Exp $ */
/* $NetBSD: wsmux.c,v 1.20 2001/10/27 00:39:29 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -268,14 +268,14 @@ wsmux_do_open(struct wsmux_softc *sc, struct wseventvar *evar)
continue;
}
{
int error = me->me_ops->dopen(me, evar);
int error = wsevsrc_open(me, evar);
if (error) {
DPRINTF(("wsmuxopen: open failed %d\n", error));
}
}
#else
/* ignore errors, failing children will not be marked open */
(void)me->me_ops->dopen(me, evar);
(void)wsevsrc_open(me, evar);
#endif
}
}
@ -332,7 +332,7 @@ wsmux_do_close(struct wsmux_softc *sc)
continue;
}
#endif
(void)me->me_ops->dclose(me);
(void)wsevsrc_close(me);
me->me_evp = NULL;
}
}
@ -650,7 +650,7 @@ wsmux_attach_sc(struct wsmux_softc *sc, struct wsevsrc *me)
/* Mux is open, so open the new subdevice */
DPRINTF(("wsmux_attach_sc: %s: calling open of %s\n",
sc->sc_base.me_dv.dv_xname, me->me_dv.dv_xname));
error = me->me_ops->dopen(me, sc->sc_base.me_evp);
error = wsevsrc_open(me, sc->sc_base.me_evp);
} else {
DPRINTF(("wsmux_attach_sc: %s not open\n",
sc->sc_base.me_dv.dv_xname));
@ -690,7 +690,7 @@ wsmux_detach_sc(struct wsevsrc *me)
if (me->me_evp != NULL) {
DPRINTF(("wsmux_detach_sc: close\n"));
/* mux device is open, so close multiplexee */
(void)me->me_ops->dclose(me);
(void)wsevsrc_close(me);
}
CIRCLEQ_REMOVE(&sc->sc_cld, me, me_next);
@ -796,7 +796,7 @@ wsmux_set_display(struct device *dv, struct wsevsrc *ame)
if (!error) {
ok = 1;
#ifdef WSDISPLAY_COMPAT_RAWKBD
DPRINTF(("wsmux_set_display: on %s set rawkbd=%d\n",
DPRINTF(("wsmux_set_display: %s set rawkbd=%d\n",
me->me_dv.dv_xname, sc->sc_rawkbd));
(void)wsevsrc_ioctl(me, WSKBDIO_SETMODE,
&sc->sc_rawkbd, 0, 0);

6
sys/dev/wscons/wsmuxvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsmuxvar.h,v 1.5 2001/10/25 14:46:42 augustss Exp $ */
/* $NetBSD: wsmuxvar.h,v 1.6 2001/10/27 00:39:29 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -66,6 +66,10 @@ struct wssrcops {
int (*dsetdisplay)(struct device *, struct wsevsrc *);
};
#define wsevsrc_open(me, evp) \
((me)->me_ops->dopen((me), evp))
#define wsevsrc_close(me) \
((me)->me_ops->dclose((me)))
#define wsevsrc_ioctl(me, cmd, data, flag, p) \
((me)->me_ops->dioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, p))
#define wsevsrc_display_ioctl(me, cmd, data, flag, p) \