diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-04 11:57:27 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-04 11:57:27 +0000 |
| commit | 80a45b38d4288005c113217084fe2013700780cd (patch) | |
| tree | 1c11c2d90aeb4569c2d849fab54744c9c29ff3dd /sys/arch | |
| parent | 7bc7d64f305711b4a1792780ed48d7a6e66b3b5e (diff) | |
Convert wskbd_set_mixervolume() to use a task internally instead of
being called in a workq.
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/macppc/dev/abtn.c | 13 | ||||
| -rw-r--r-- | sys/arch/sgi/hpc/panel.c | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c index 44db50ad7d7..01587e9d390 100644 --- a/sys/arch/macppc/dev/abtn.c +++ b/sys/arch/macppc/dev/abtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: abtn.c,v 1.14 2011/06/15 21:32:04 miod Exp $ */ +/* $OpenBSD: abtn.c,v 1.15 2013/11/04 11:57:26 mpi Exp $ */ /* $NetBSD: abtn.c,v 1.1 1999/07/12 17:48:26 tsubai Exp $ */ /*- @@ -61,7 +61,7 @@ void abtn_adbcomplete(caddr_t, caddr_t, int); #if NWSKBD > 0 extern int cd_eject(void); #if NAUDIO > 0 -extern int wskbd_set_mixervolume(long dir); +extern int wskbd_set_mixervolume(long, long); #endif #endif @@ -130,18 +130,15 @@ abtn_adbcomplete(caddr_t buffer, caddr_t data, int adb_command) #if NAUDIO > 0 && NWSKBD > 0 case 0x08: /* mute */ case 0x01: /* mute, AV hardware */ - workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)0, (void *)(int)1); + wskbd_set_mixervolume(0, 1); break; case 0x07: /* decrease volume */ case 0x02: /* decrease volume, AV hardware */ - workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)-1, (void *)(int)1); + wskbd_set_mixervolume(-1, 1); break; case 0x06: /* increase volume */ case 0x03: /* increase volume, AV hardware */ - workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)1, (void *)(int)1); + wskbd_set_mixervolume(1, 1); break; #endif case 0x0c: /* mirror display key */ diff --git a/sys/arch/sgi/hpc/panel.c b/sys/arch/sgi/hpc/panel.c index e9e8bb16b7d..2e4e1ed5467 100644 --- a/sys/arch/sgi/hpc/panel.c +++ b/sys/arch/sgi/hpc/panel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: panel.c,v 1.1 2012/04/17 15:23:01 miod Exp $ */ +/* $OpenBSD: panel.c,v 1.2 2013/11/04 11:57:26 mpi Exp $ */ /* * Copyright (c) 2012 Miodrag Vallat. @@ -22,7 +22,6 @@ #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/timeout.h> -#include <sys/workq.h> #include <machine/autoconf.h> #include <mips64/archtype.h> @@ -36,7 +35,7 @@ #include "audio.h" #include "wskbd.h" -extern int wskbd_set_mixervolume(long); +extern int wskbd_set_mixervolume(long, long); struct panel_softc { struct device sc_dev; @@ -222,7 +221,6 @@ panel_volume_adjust(struct panel_softc *sc, uint8_t reg) return; } - workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)adjust, (void *)(int)1); + wskbd_set_mixervolume(adjust, 1); } #endif |