diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-06-09 01:43:52 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-06-09 01:43:52 +0000 |
| commit | 450af3de3208b95e7ebe650d235e8e637d8ac844 (patch) | |
| tree | 079d53dbb5964b7fbeebef71e0be39328abd2c4c /sys/dev/wscons | |
| parent | bb516e8250a5509a68d0bb58ad67be4bc93e0fd6 (diff) | |
Remove sc_ready from the softc, we can just test sc_events.io instead.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 5c47d1c19b2..e5a375fefe2 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.19 2001/06/09 01:39:31 aaron Exp $ */ +/* $OpenBSD: wskbd.c,v 1.20 2001/06/09 01:43:51 aaron Exp $ */ /* $NetBSD: wskbd.c,v 1.38 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -154,7 +154,6 @@ struct wskbd_softc { int sc_ledstate; - int sc_ready; /* accepting events */ struct wseventvar sc_events; /* event queue state */ int sc_isconsole; @@ -395,7 +394,7 @@ wskbd_attach(parent, self, aux) sc->sc_accessops = ap->accessops; sc->sc_accesscookie = ap->accesscookie; - sc->sc_ready = 0; /* sanity */ + sc->sc_events.io = NULL; /* sanity */ sc->sc_repeating = 0; sc->sc_translating = 1; sc->sc_ledstate = -1; /* force update */ @@ -621,7 +620,7 @@ wskbd_input(dev, type, value) */ /* no one to receive; punt!*/ - if (!sc->sc_ready) + if (sc->sc_events.io == NULL) return; #if NWSMUX > 0 @@ -742,7 +741,6 @@ wskbdopen(dev, flags, mode, p) wsevent_init(&sc->sc_events); /* may cause sleep */ sc->sc_translating = 0; - sc->sc_ready = 1; /* start accepting events */ wskbd_enable(sc, 1); return (0); @@ -770,7 +768,6 @@ wskbddoclose(dv, flags, mode, p) return (0); } - sc->sc_ready = 0; /* stop accepting events */ sc->sc_translating = 1; wsevent_fini(&sc->sc_events); |