diff --git a/sys/dev/wscons/wsbell.c b/sys/dev/wscons/wsbell.c index 572354646b99..d835849d55b6 100644 --- a/sys/dev/wscons/wsbell.c +++ b/sys/dev/wscons/wsbell.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 nat Exp $ */ +/* $NetBSD: wsbell.c,v 1.7 2017/06/13 00:54:37 nat Exp $ */ /*- * Copyright (c) 2017 Nathanial Sloss @@ -107,7 +107,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.7 2017/06/13 00:54:37 nat Exp $"); #if defined(_KERNEL_OPT) #include "wsmux.h" @@ -220,6 +220,7 @@ wsbell_attach(device_t parent, device_t self, void *aux) sc->sc_base.me_dv = self; sc->sc_accesscookie = ap->accesscookie; + sc->sc_dying = false; sc->sc_spkr = device_unit(parent); sc->sc_bell_data = wskbd_default_bell_data; #if NWSMUX > 0 @@ -256,7 +257,7 @@ wsbell_activate(device_t self, enum devact act) struct wsbell_softc *sc = device_private(self); if (act == DVACT_DEACTIVATE) - sc->sc_dying = 1; + sc->sc_dying = true; return (0); } @@ -305,7 +306,7 @@ wsbell_detach(device_t self, int flags) vdevgone(maj, mn, mn, VCHR); mutex_enter(&sc->sc_bellock); - sc->sc_dying = 1; + sc->sc_dying = true; cv_broadcast(&sc->sc_bellcv); mutex_exit(&sc->sc_bellock); @@ -344,7 +345,7 @@ wsbell_do_ioctl(struct wsbell_softc *sc, u_long cmd, void *data, int flag, struct lwp *l) { struct wskbd_bell_data *ubdp, *kbdp; - if (sc->sc_dying) + if (sc->sc_dying == true) return (EIO); /* @@ -400,7 +401,7 @@ bell_thread(void *arg) mutex_enter(&sc->sc_bellock); cv_wait_sig(&sc->sc_bellcv, &sc->sc_bellock); - if (sc->sc_dying) { + if (sc->sc_dying == true) { mutex_exit(&sc->sc_bellock); kthread_exit(0); } diff --git a/sys/dev/wscons/wsbellvar.h b/sys/dev/wscons/wsbellvar.h index ff25f2940c1a..526e965406c7 100644 --- a/sys/dev/wscons/wsbellvar.h +++ b/sys/dev/wscons/wsbellvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsbellvar.h,v 1.2 2017/06/13 00:49:05 nat Exp $ */ +/* $NetBSD: wsbellvar.h,v 1.3 2017/06/13 00:54:37 nat Exp $ */ /*- * Copyright (c) 2017 Nathanial Sloss * All rights reserved. @@ -45,7 +45,7 @@ struct wsbell_softc { void *sc_accesscookie; int sc_refcnt; - u_char sc_dying; /* device is being detached */ + bool sc_dying; /* device is being detached */ lwp_t *sc_bellthread; kmutex_t sc_bellock;