Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dying ftom vb_args and use sc_dying instead.

This commit is contained in:
nat 2017-06-13 00:49:05 +00:00
parent e258f5cee2
commit 301cb45f21
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/wscons/wsbell.c
View File

@ -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 <nathanialsloss@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, 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;

3
sys/dev/wscons/wsbellvar.h
View File

@ -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 <nathanialsloss@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 {