 @@ -1,14 +1,14 @@
-/* $NetBSD: wsbell.c,v 1.5 2017/06/13 00:42:27 nat Exp $ */
+/* $NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 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.5 2017/06/13 00:42:27 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.6 2017/06/13 00:49:05 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>
 @@ -295,27 +295,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_bell_args.dying = true;
+	sc->sc_dying = 1;
 	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
 @@ -390,50 +390,49 @@ 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 (vb->dying == true) {
+		if (sc->sc_dying) {
 			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);
 		spkrclose(sc->sc_spkr, FWRITE, 0, curlwp);
+	}
+}
 static inline void
 spkr_audio_play(struct wsbell_softc *sc, u_int pitch, u_int period, u_int volume)
+{
 	mutex_enter(&sc->sc_bellock);
 	sc->sc_bell_args.dying = false;
 	sc->sc_bell_args.pitch = pitch;
 	sc->sc_bell_args.period = period / 5;
 	sc->sc_bell_args.volume = volume;
 	cv_broadcast(&sc->sc_bellcv);
 	mutex_exit(&sc->sc_bellock);
+}
 #if NWSMUX > 0
 int
 wsbell_mux_open(struct wsevsrc *me, struct wseventvar *evp)
+{
 	struct wsbell_softc *sc = (struct wsbell_softc *)me;

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsbellvar.h,v 1.1 2017/06/11 03:55:56 nat Exp $ */
+/* $NetBSD: wsbellvar.h,v 1.2 2017/06/13 00:49:05 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.
+ *
 @@ -25,27 +25,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "locators.h"
 #include <dev/wscons/wseventvar.h>
 #include <dev/wscons/wsmuxvar.h>
 #define	wsbelldevcf_mux	cf_loc[WSBELLDEVCF_MUX]
 struct vbell_args {
 	u_int pitch;
 	u_int period;
 	u_int volume;
 	bool dying;
 };
 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 */
 	lwp_t		*sc_bellthread;