diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-08-05 16:59:58 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-08-05 16:59:58 +0000 |
| commit | 3506198ba75b83f8209a3f603e787a17a8a72394 (patch) | |
| tree | 95842fd2245280a57dca6252bd0d93f4448e0d2c /sys/dev/wscons/wsmux.c | |
| parent | abf0e33e77db61eb3b704c1dddd10ac7bc15a477 (diff) | |
On platforms which do not use wsmux (because they can't have more than one
keyboard at once), force wskbd0 to connect to wsdisplay0 even if they are
not console devices.
Diffstat (limited to 'sys/dev/wscons/wsmux.c')
| -rw-r--r-- | sys/dev/wscons/wsmux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index e6e42b54a3b..d3e29f3da38 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmux.c,v 1.16 2006/04/28 20:06:00 miod Exp $ */ +/* $OpenBSD: wsmux.c,v 1.17 2006/08/05 16:59:57 miod Exp $ */ /* $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $ */ /* @@ -98,7 +98,7 @@ void wsmux_do_open(struct wsmux_softc *, struct wseventvar *); void wsmux_do_close(struct wsmux_softc *); #if NWSDISPLAY > 0 -int wsmux_evsrc_set_display(struct device *, struct wsevsrc *); +int wsmux_evsrc_set_display(struct device *, struct device *); #else #define wsmux_evsrc_set_display NULL #endif @@ -757,11 +757,10 @@ wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag, * Set display of a mux via the parent mux. */ int -wsmux_evsrc_set_display(struct device *dv, struct wsevsrc *ame) +wsmux_evsrc_set_display(struct device *dv, struct device *displaydv) { struct wsmux_softc *muxsc = (struct wsmux_softc *)ame; struct wsmux_softc *sc = (struct wsmux_softc *)dv; - struct device *displaydv = muxsc ? muxsc->sc_displaydv : NULL; DPRINTF(("wsmux_set_display: %s: displaydv=%p\n", sc->sc_base.me_dv.dv_xname, displaydv)); |