summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2009-04-24 16:30:59 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2009-04-24 16:30:59 +0000
commit62e53fbeef2425348ed154aebeb141dfe55d1f4b (patch)
tree0632859b0d1e1afa6a6e2260279b3e45add02aea /sys
parentf02a365dd41f983e1b2d665f6fb77120f670d16e (diff)
remove no longer needed workaround
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/azalia_codec.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c
index 4679a8e743f..d89ecb6c449 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.117 2009/04/24 16:27:38 jakemsr Exp $ */
+/* $OpenBSD: azalia_codec.c,v 1.118 2009/04/24 16:30:58 jakemsr Exp $ */
/* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */
/*-
@@ -90,7 +90,6 @@ void azalia_pin_config_ov(widget_t *, int, int);
int azalia_gpio_unmute(codec_t *, int);
int azalia_alc88x_init_widget(const codec_t *, widget_t *, nid_t);
-int azalia_stac9221_init_widget(const codec_t *, widget_t *, nid_t);
int azalia_stac7661_mixer_init(codec_t *);
int
@@ -231,7 +230,6 @@ azalia_codec_init_vtbl(codec_t *this)
break;
case 0x83847680:
this->name = "Sigmatel STAC9221";
- this->init_widget = azalia_stac9221_init_widget;
break;
case 0x83847683:
this->name = "Sigmatel STAC9221D";
@@ -2234,30 +2232,6 @@ azalia_alc88x_init_widget(const codec_t *this, widget_t *w, nid_t nid)
return 0;
}
-/* Sigmatel STAC9221 */
-int
-azalia_stac9221_init_widget(const codec_t *codec, widget_t *w, nid_t nid)
-{
- /* Apple didn't follow the HDA spec for associations */
- if (codec->subid == STAC9221_APPLE_ID) {
- if (nid == 0xa &&
- (w->d.pin.color == CORB_CD_WHITE ||
- w->d.pin.color == CORB_CD_GREEN)) {
- w->d.pin.association = 1;
- w->d.pin.sequence = 0;
- }
- if (nid == 0xc && w->d.pin.device == CORB_CD_SPEAKER) {
- w->d.pin.association = 1;
- w->d.pin.sequence = 1;
- }
- if (nid == 0xf && w->d.pin.color == CORB_CD_BLUE) {
- w->d.pin.association = 2;
- w->d.pin.sequence = 0;
- }
- }
- return 0;
-}
-
/* Sigmatel STAC9225 */
int
azalia_stac7661_mixer_init(codec_t *this)