diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-12-23 10:19:40 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-12-23 10:19:40 +0000 |
| commit | a651df387260dd9bd6db80265150da060a2f0efe (patch) | |
| tree | 4de83b2556aa61603ec9df3c5a89ff208953a3c7 /sys | |
| parent | 2dd60027b29a6e39f4d47b187f27e4d297802e48 (diff) | |
enable beep and CD mixer controls on alc88x codecs if appropriate
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 0ebf4f4c37a..10dcf7222b5 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.88 2008/12/23 10:06:50 jakemsr Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.89 2008/12/23 10:19:39 jakemsr Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -94,6 +94,7 @@ void azalia_pin_config_ov(widget_t *, int, int); int azalia_ad1984_mixer_init(codec_t *); int azalia_alc260_mixer_init(codec_t *); int azalia_alc88x_mixer_init(codec_t *); +int azalia_alc88x_init_widget(const codec_t *, widget_t *, nid_t); int azalia_stac9200_mixer_init(codec_t *); int azalia_stac9202_mixer_init(codec_t *); int azalia_stac9221_init_widget(const codec_t *, widget_t *, nid_t); @@ -132,22 +133,27 @@ azalia_codec_init_vtbl(codec_t *this) case 0x10ec0880: this->name = "Realtek ALC880"; this->mixer_init = azalia_alc88x_mixer_init; + this->init_widget = azalia_alc88x_init_widget; break; case 0x10ec0882: this->name = "Realtek ALC882"; this->mixer_init = azalia_alc88x_mixer_init; + this->init_widget = azalia_alc88x_init_widget; break; case 0x10ec0883: this->name = "Realtek ALC883"; this->mixer_init = azalia_alc88x_mixer_init; + this->init_widget = azalia_alc88x_init_widget; break; case 0x10ec0885: this->name = "Realtek ALC885"; this->mixer_init = azalia_alc88x_mixer_init; + this->init_widget = azalia_alc88x_init_widget; break; case 0x10ec0888: this->name = "Realtek ALC888"; this->mixer_init = azalia_alc88x_mixer_init; + this->init_widget = azalia_alc88x_init_widget; break; case 0x111d76b2: this->name = "IDT 92HD71B7"; @@ -1765,6 +1771,23 @@ azalia_alc88x_mixer_init(codec_t *this) return 0; } +int +azalia_alc88x_init_widget(const codec_t *this, widget_t *w, nid_t nid) +{ + if (nid == 0x1c &&w->enable == 0 && w->d.pin.device == CORB_CD_CD) { + azalia_pin_config_ov(w, CORB_CD_PORT_MASK, CORB_CD_FIXED); + w->widgetcap |= COP_AWCAP_STEREO; + w->enable = 1; + } + if (nid == 0x1d && w->enable == 0) { + azalia_pin_config_ov(w, CORB_CD_DEVICE_MASK, CORB_CD_BEEP); + azalia_pin_config_ov(w, CORB_CD_PORT_MASK, CORB_CD_FIXED); + w->widgetcap |= COP_AWCAP_STEREO; + w->enable = 1; + } + return 0; +} + /* Sigmatel STAC9200 */ int azalia_stac9200_mixer_init(codec_t *this) |