diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-06 06:13:47 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-06 06:13:47 +0000 |
commit | 228c0bb1320b2f216cdecbb71ce0ae647a2a7836 (patch) | |
tree | a5a7d2f82cc819203ff7ecf10c44e8d819fec11b /sys/dev/wscons | |
parent | bd52ddc5230a3251fe3fae8da6ac630a291ca185 (diff) |
Microphone mute button support from acpithinkpad (or elsewhere).
The audio side is a bit lacking; it does not yet mute all types of
devices.
from Alexander Polakov
ok jakemsr
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r-- | sys/dev/wscons/wskbd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 62aed6bd3b4..a8346df58bf 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.66 2011/04/14 19:25:54 shadchin Exp $ */ +/* $OpenBSD: wskbd.c,v 1.67 2011/06/06 06:13:46 deraadt Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -300,7 +300,7 @@ static struct wskbd_internal wskbd_console_data; void wskbd_update_layout(struct wskbd_internal *, kbd_t); #if NAUDIO > 0 -extern int wskbd_set_mixervolume(long dir); +extern int wskbd_set_mixervolume(long dir, int out); #endif void @@ -1630,15 +1630,15 @@ wskbd_translate(struct wskbd_internal *id, u_int type, int value) #if NAUDIO > 0 case KS_AudioMute: workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)0, NULL); + (void *)(long)0, (void *)(int)1); break; case KS_AudioLower: workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)-1, NULL); + (void *)(long)-1, (void*)(int)1); break; case KS_AudioRaise: workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume, - (void *)(long)1, NULL); + (void *)(long)1, (void*)(int)1); return (0); #endif default: |