diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-08-07 20:48:57 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-08-07 20:48:57 +0000 |
| commit | 34c9ebb330d62ad8915a3045e16e172880972cdd (patch) | |
| tree | 81c3f1f492ecff560cd2736d0613e0c99a8b205d /sys/dev | |
| parent | 74957763d88ee16846b5fe460116321fff59e962 (diff) | |
restore unsolicited responses from volume knob widgets
tested by deraadt
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/azalia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/azalia.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index e42a2586d37..78411311407 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.179 2010/08/06 05:57:48 jakemsr Exp $ */ +/* $OpenBSD: azalia.c,v 1.180 2010/08/07 20:48:55 jakemsr Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -1459,7 +1459,7 @@ azalia_resume(azalia_t *az) if (err) return err; - err = azalia_codec_enable_unsol(&az->codecs[az->codecno], 1); + err = azalia_codec_enable_unsol(&az->codecs[az->codecno]); if (err) return err; diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h index 27a45ad6691..dc68b012688 100644 --- a/sys/dev/pci/azalia.h +++ b/sys/dev/pci/azalia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.h,v 1.60 2010/06/27 21:47:07 jakemsr Exp $ */ +/* $OpenBSD: azalia.h,v 1.61 2010/08/07 20:48:56 jakemsr Exp $ */ /* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */ /*- @@ -727,4 +727,4 @@ int azalia_comresp(const codec_t *, nid_t, uint32_t, uint32_t, uint32_t *); int azalia_mixer_get(const codec_t *, nid_t, int, mixer_ctrl_t *); int azalia_mixer_set(codec_t *, nid_t, int, const mixer_ctrl_t *); -int azalia_codec_enable_unsol(codec_t *, int); +int azalia_codec_enable_unsol(codec_t *); diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 0cd1a12f713..79594ecdddf 100644 --- a/sys/dev/pci/azalia_codec.c +++ b/sys/dev/pci/azalia_codec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia_codec.c,v 1.147 2010/06/27 21:47:07 jakemsr Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.148 2010/08/07 20:48:56 jakemsr Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -1390,7 +1390,7 @@ azalia_mixer_default(codec_t *this) } this->recvols.mute = 0; - err = azalia_codec_enable_unsol(this, 0); + err = azalia_codec_enable_unsol(this); if (err) return(err); @@ -1398,7 +1398,7 @@ azalia_mixer_default(codec_t *this) } int -azalia_codec_enable_unsol(codec_t *this, int resuming) +azalia_codec_enable_unsol(codec_t *this) { widget_t *w; uint32_t result; @@ -1416,7 +1416,7 @@ azalia_codec_enable_unsol(codec_t *this, int resuming) azalia_unsol_event(this, AZ_TAG_SPKR); /* volume knob */ - if (this->playvols.master != this->audiofunc && !resuming) { + if (this->playvols.master != this->audiofunc) { w = &this->w[this->playvols.master]; err = azalia_comresp(this, w->nid, CORB_GET_VOLUME_KNOB, |