diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2013-10-30 02:13:54 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2013-10-30 02:13:54 +0000 |
| commit | 20bf6d6619f8ccc59d58fd3cf26108f07386bd76 (patch) | |
| tree | e1b400da626e979bc4adc1cdac331019d48581a0 | |
| parent | 9e6f613fb06cae84075ada5f1d07b425eecb4502 (diff) | |
replace workqs with tasks.
ok mpi@
| -rw-r--r-- | sys/dev/audio.c | 8 | ||||
| -rw-r--r-- | sys/dev/audiovar.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c index d51c63f0093..b7a8f933418 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.115 2013/05/15 08:29:24 ratchov Exp $ */ +/* $OpenBSD: audio.c,v 1.116 2013/10/30 02:13:52 dlg Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -49,7 +49,7 @@ #include <sys/conf.h> #include <sys/audioio.h> #include <sys/device.h> -#include <sys/workq.h> +#include <sys/task.h> #include <dev/audio_if.h> #include <dev/audiovar.h> @@ -353,6 +353,7 @@ audioattach(struct device *parent, struct device *self, void *aux) sc->sc_inports.allports, sc->sc_outports.allports)); timeout_set(&sc->sc_resume_to, audio_resume_to, sc); + task_set(&sc->sc_resume_task, audio_resume_task, sc, NULL); } int @@ -1181,8 +1182,7 @@ void audio_resume_to(void *v) { struct audio_softc *sc = v; - workq_queue_task(NULL, &sc->sc_resume_task, 0, - audio_resume_task, sc, 0); + task_add(systq, &sc->sc_resume_task); } void diff --git a/sys/dev/audiovar.h b/sys/dev/audiovar.h index beb9b2c2a9a..43b0c1fe3a2 100644 --- a/sys/dev/audiovar.h +++ b/sys/dev/audiovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: audiovar.h,v 1.13 2010/09/21 20:08:11 jakemsr Exp $ */ +/* $OpenBSD: audiovar.h,v 1.14 2013/10/30 02:13:53 dlg Exp $ */ /* $NetBSD: audiovar.h,v 1.18 1998/03/03 09:16:16 augustss Exp $ */ /* @@ -140,7 +140,7 @@ struct audio_softc { #define AUDIO_QUIESCE_START 1 #define AUDIO_QUIESCE_SILENT 2 struct timeout sc_resume_to; - struct workq_task sc_resume_task; + struct task sc_resume_task; u_char sc_mute; #ifdef AUDIO_INTR_TIME |