diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-11-30 08:36:58 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-11-30 08:36:58 +0000 |
| commit | 0865b4ee32451455dc4f6f3df10dfa0054b52edc (patch) | |
| tree | fa059ff658e93dcc2762833393e6f1e7934ef824 /sys/dev | |
| parent | 81e99ea4046f9227c18228e9b391182aab996cf3 (diff) | |
- AZ_MAX_SENSE_PINS -> HDA_MAX_SENSE_PINS
- MI_TARGET_* are enumerated in hex
from Alexey Suslikov
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/azalia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/azalia.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index ea394c3c57c..c7c8d0d9e92 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.77 2008/11/30 03:50:29 jakemsr Exp $ */ +/* $OpenBSD: azalia.c,v 1.78 2008/11/30 08:36:57 jakemsr Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -1923,7 +1923,7 @@ azalia_widget_init_pin(widget_t *this, const codec_t *codec) return err; } /* sense pin */ - if (codec->nsense_pins < AZ_MAX_SENSE_PINS && + if (codec->nsense_pins < HDA_MAX_SENSE_PINS && this->d.pin.cap & COP_PINCAP_PRESENCE && CORB_CD_PORT(this->d.pin.config) == CORB_CD_JACK) { /* check override bit */ diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h index 070469e3a93..71f49443e85 100644 --- a/sys/dev/pci/azalia.h +++ b/sys/dev/pci/azalia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.h,v 1.25 2008/11/28 21:45:49 jakemsr Exp $ */ +/* $OpenBSD: azalia.h,v 1.26 2008/11/30 08:36:57 jakemsr Exp $ */ /* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */ /*- @@ -476,7 +476,7 @@ #define CORB_NID_ROOT 0 #define HDA_MAX_CHANNELS 16 -#define AZ_MAX_SENSE_PINS 8 +#define HDA_MAX_SENSE_PINS 16 /* memory-mapped types */ typedef struct { @@ -560,8 +560,8 @@ typedef struct { #define MI_TARGET_SPDIF 0x107 #define MI_TARGET_SPDIF_CC 0x108 #define MI_TARGET_EAPD 0x109 -#define MI_TARGET_MUTESET 0x110 -#define MI_TARGET_PINSENSE 0x111 +#define MI_TARGET_MUTESET 0x10a +#define MI_TARGET_PINSENSE 0x10b } mixer_item_t; #define VALID_WIDGET_NID(nid, codec) (nid == (codec)->audiofunc || \ @@ -613,7 +613,7 @@ typedef struct codec_t { struct audio_encoding* encs; int nencs; - nid_t sense_pins[AZ_MAX_SENSE_PINS]; + nid_t sense_pins[HDA_MAX_SENSE_PINS]; int nsense_pins; uint32_t *extra; |