From 6d36489723e16575a03179284cfe0f375033894a Mon Sep 17 00:00:00 2001 From: Jacob Meuser Date: Sun, 31 May 2009 02:12:55 +0000 Subject: remove special handling for STAC9225 (aka STAC7661). it was just choosing the default recording source and muting ADC input after the device has been configured. the commit message that added these doesn't give a reason why this is done, and it is inconsistent with every other codec. if you really want these settings, either set them in mixerctl.conf, or convince me why this should be done for all codecs. --- sys/dev/pci/azalia_codec.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 81d8dfb7104..dec4f4d1e00 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.127 2009/05/29 21:16:37 jakemsr Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.128 2009/05/31 02:12:54 jakemsr Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -64,7 +64,6 @@ void azalia_devinfo_offon(mixer_devinfo_t *); void azalia_pin_config_ov(widget_t *, int, int); int azalia_gpio_unmute(codec_t *, int); -int azalia_stac7661_mixer_init(codec_t *); int azalia_codec_init_vtbl(codec_t *this) @@ -309,7 +308,6 @@ azalia_codec_init_vtbl(codec_t *this) /* FALLTHROUGH */ case 0x83847662: this->name = "Sigmatel STAC9225"; - this->mixer_init = azalia_stac7661_mixer_init; break; case 0x83847680: this->name = "Sigmatel STAC9220/1"; @@ -2359,26 +2357,3 @@ azalia_codec_widget_quirks(codec_t *this, nid_t nid) return(0); } - -/* ---------------------------------------------------------------- - * codec specific functions - * ---------------------------------------------------------------- */ - -/* Sigmatel STAC9225 */ -int -azalia_stac7661_mixer_init(codec_t *this) -{ - mixer_ctrl_t mc; - - azalia_generic_mixer_init(this); - - mc.dev = -1; - mc.type = AUDIO_MIXER_ENUM; - mc.un.ord = 1; - /* mute ADC input (why?) */ - azalia_generic_mixer_set(this, 0x09, MI_TARGET_INAMP(0), &mc); - /* select internal mic for recording */ - mc.un.ord = 2; - azalia_generic_mixer_set(this, 0x15, MI_TARGET_CONNLIST, &mc); - return 0; -} -- cgit v1.2.3