Module Name: src Committed By: nat Date: Tue Jun 13 00:49:05 UTC 2017
Modified Files: src/sys/dev/wscons: wsbell.c wsbellvar.h Log Message: Remove dying ftom vb_args and use sc_dying instead. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/wscons/wsbell.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/wscons/wsbellvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/wscons/wsbell.c diff -u src/sys/dev/wscons/wsbell.c:1.5 src/sys/dev/wscons/wsbell.c:1.6 --- src/sys/dev/wscons/wsbell.c:1.5 Tue Jun 13 00:42:27 2017 +++ src/sys/dev/wscons/wsbell.c Tue Jun 13 00:49:05 2017 @@ -1,4 +1,4 @@ -/* $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 <nathanialsl...@yahoo.com.au> @@ -107,7 +107,7 @@ */ #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" @@ -305,7 +305,7 @@ wsbell_detach(device_t self, int flags) 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); @@ -400,7 +400,7 @@ bell_thread(void *arg) 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); } @@ -423,7 +423,6 @@ spkr_audio_play(struct wsbell_softc *sc, { 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; Index: src/sys/dev/wscons/wsbellvar.h diff -u src/sys/dev/wscons/wsbellvar.h:1.1 src/sys/dev/wscons/wsbellvar.h:1.2 --- src/sys/dev/wscons/wsbellvar.h:1.1 Sun Jun 11 03:55:56 2017 +++ src/sys/dev/wscons/wsbellvar.h Tue Jun 13 00:49:05 2017 @@ -1,4 +1,4 @@ -/* $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 <nathanialsl...@yahoo.com.au> * All rights reserved. @@ -35,7 +35,6 @@ struct vbell_args { u_int pitch; u_int period; u_int volume; - bool dying; }; struct wsbell_softc {