diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/azalia.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h index 154a09a0f76..070469e3a93 100644 --- a/sys/dev/pci/azalia.h +++ b/sys/dev/pci/azalia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.h,v 1.24 2008/11/28 21:33:26 jakemsr Exp $ */ +/* $OpenBSD: azalia.h,v 1.25 2008/11/28 21:45:49 jakemsr Exp $ */ /* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */ /*- @@ -561,7 +561,7 @@ typedef struct { #define MI_TARGET_SPDIF_CC 0x108 #define MI_TARGET_EAPD 0x109 #define MI_TARGET_MUTESET 0x110 -#define AZ_TARGET_PINSENSE 0xf00 +#define MI_TARGET_PINSENSE 0x111 } mixer_item_t; #define VALID_WIDGET_NID(nid, codec) (nid == (codec)->audiofunc || \ diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 0e536fe032f..d358f8d49fa 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.73 2008/11/28 09:58:18 jakemsr Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.74 2008/11/28 21:45:49 jakemsr Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -823,7 +823,7 @@ azalia_generic_mixer_init(codec_t *this) this->w[j].name); d->type = AUDIO_MIXER_ENUM; d->mixer_class = AZ_CLASS_OUTPUT; - m->target = AZ_TARGET_PINSENSE; + m->target = MI_TARGET_PINSENSE; d->un.e.num_mem = 2; d->un.e.member[0].ord = 0; strlcpy(d->un.e.member[0].label.name, "unplugged", @@ -1276,7 +1276,7 @@ azalia_generic_mixer_get(const codec_t *this, nid_t nid, int target, } /* sense pin */ - else if (target == AZ_TARGET_PINSENSE) { + else if (target == MI_TARGET_PINSENSE) { err = this->comresp(this, nid, CORB_GET_PIN_SENSE, 0, &result); if (err) @@ -1591,7 +1591,7 @@ azalia_generic_mixer_set(codec_t *this, nid_t nid, int target, return err; } - else if (target == AZ_TARGET_PINSENSE) { + else if (target == MI_TARGET_PINSENSE) { /* do nothing, control is read only */ } |