 @@ -1,14 +1,14 @@
-/* $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 <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -97,27 +97,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Keyboard Bell driver.
  */
 #include <sys/cdefs.h>
-__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"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 @@ -210,26 +210,27 @@ wsbell_match(device_t parent, cfdata_t m
 void
 wsbell_attach(device_t parent, device_t self, void *aux)
+{
         struct wsbell_softc *sc = device_private(self);
 	struct wsbelldev_attach_args *ap = aux;
 #if NWSMUX > 0
 	int mux, error;
 #endif
 	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
 	sc->sc_base.me_ops = &wsbell_srcops;
 	mux = device_cfdata(self)->wsbelldevcf_mux;
 	if (mux >= 0) {
 		error = wsmux_attach_sc(wsmux_getmux(mux), &sc->sc_base);
 		if (error)
 			aprint_error(" attach error=%d", error);
 		else
 			aprint_normal(" mux %d", mux);
+	}
 #else
 @@ -246,27 +247,27 @@ wsbell_attach(device_t parent, device_t
 	mutex_init(&sc->sc_bellock, MUTEX_DEFAULT, IPL_SCHED);
 	cv_init(&sc->sc_bellcv, "bellcv");
 	kthread_create(PRI_BIO, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
 	    bell_thread, sc, &sc->sc_bellthread, "%s", device_xname(self));
+}
 int
 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);
+}
 int
 wsbell_detach(device_t self, int flags)
+{
 	struct wsbell_softc *sc = device_private(self);
 	struct wseventvar *evar;
 	int maj, mn;
 	int s;
 #if NWSMUX > 0
 	/* Tell parent mux we're leaving. */
 @@ -295,27 +296,27 @@ wsbell_detach(device_t self, int flags)
 				       device_xname(self));
+		}
 		splx(s);
+	}
 	/* locate the major number */
 	maj = cdevsw_lookup_major(&wsbell_cdevsw);
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = device_unit(self);
 	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);
 	kthread_join(sc->sc_bellthread);
 	cv_destroy(&sc->sc_bellcv);
 	mutex_destroy(&sc->sc_bellock);
 	return (0);
+}
 #if NWSMUX > 0
 int
 @@ -334,27 +335,27 @@ wsbelldoioctl(device_t dv, u_long cmd, v
 	sc->sc_refcnt++;
 	error = wsbell_do_ioctl(sc, cmd, data, flag, l);
 	if (--sc->sc_refcnt < 0)
 		wakeup(sc);
 	return (error);
+}
 int
 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);
 	/*
 	 * Try the wsbell specific ioctls.
 	 */
 	switch (cmd) {
 	case WSKBDIO_SETBELL:
 		if ((flag & FWRITE) == 0)
 			return (EACCES);
 		kbdp = &sc->sc_bell_data;
 		ubdp = (struct wskbd_bell_data *)data;
 		SETBELL(kbdp, ubdp, kbdp);
 		return (0);
 @@ -390,27 +391,27 @@ wsbell_do_ioctl(struct wsbell_softc *sc,
 static void
 bell_thread(void *arg)
+{
 	struct wsbell_softc *sc = arg;
 	struct vbell_args *vb = &sc->sc_bell_args;
 	tone_t tone;
 	u_int vol;
 	for (;;) {
 		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);
+		}
 		tone.frequency = vb->pitch;
 		tone.duration = vb->period;
 		vol = vb->volume;
 		mutex_exit(&sc->sc_bellock);
 		if (spkropen(sc->sc_spkr, FWRITE, 0, NULL) != 0)
 			continue;
 		spkrioctl(sc->sc_spkr, SPKRSETVOL, &vol, 0, curlwp);
 		spkrioctl(sc->sc_spkr, SPKRTONE, &tone, 0, curlwp);

 @@ -1,14 +1,14 @@
-/* $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 <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -35,26 +35,26 @@ struct vbell_args {
 	u_int pitch;
 	u_int period;
 	u_int volume;
 };
 struct wsbell_softc {
 	struct wsevsrc	sc_base;
 	dev_t		sc_spkr;	/* our spkr device */
 	struct wskbd_bell_data sc_bell_data;
 	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;
 	kcondvar_t	sc_bellcv;
 	struct vbell_args sc_bell_args;
 };
 /*
  * Autoconfiguration helper functions.
  */
 int	wsbelldevprint(void *, const char *);