ALSA: hda - Move mic mute LED helper to the generic parser
PATCH 1/2 ALSA: hda - Move mic mute LED helper to the generic parser
Move the code for setting up and controlling the mic mute LED hook from dell-wmi helper to the generic parser, so that it can be referred from the multiple driver codes.
No functional change.
Tested-by Pali Rohár <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/dell_wmi_helper.c | 116 ++------------------------ sound/pci/hda/hda_generic.c | 140 ++++++++++++++++++++++++++++++++ sound/pci/hda/hda_generic.h | 16 ++++ 3 files changed, 162 insertions(+), 110 deletions(-)
sound/pci/hda/dell_wmi_helper.c +6 -110
@@ -6,111 +6,18 @@#if IS_ENABLED (CONFIG_DELL_LAPTOP )#include <linux/dell-led.h> -enum { -MICMUTE_LED_ON , -MICMUTE_LED_OFF , -MICMUTE_LED_FOLLOW_CAPTURE , -MICMUTE_LED_FOLLOW_MUTE , -}; - -static int dell_led_mode =MICMUTE_LED_FOLLOW_MUTE ; -static int dell_capture; -static int dell_led_value;static int (*dell_micmute_led_set_func)(int ); -static void (*dell_old_cap_hook)(struct hda_codec *, -struct snd_kcontrol *, -struct snd_ctl_elem_value *); - -static void call_micmute_led_update (void ) -{ -int val; - -switch (dell_led_mode) { -case MICMUTE_LED_ON : - val =1 ; -break ; -case MICMUTE_LED_OFF : - val =0 ; -break ; -case MICMUTE_LED_FOLLOW_CAPTURE : - val = dell_capture; -break ; -case MICMUTE_LED_FOLLOW_MUTE : -default : - val = !dell_capture; -break ; - } - -if (val == dell_led_value) -return ; - dell_led_value = val; -dell_micmute_led_set_func (dell_led_value); -} - -static void update_dell_wmi_micmute_led (struct hda_codec *codec, -struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -if (dell_old_cap_hook) -dell_old_cap_hook (codec, kcontrol, ucontrol); - -if (!ucontrol || !dell_micmute_led_set_func) -return ; -if (strcmp ("Capture Switch" , ucontrol->id.name) ==0 && ucontrol->id.index ==0 ) { -/* TODO: How do I verify if it's a mono or stereo here? */ - dell_capture = (ucontrol->value.integer.value[0 ] || - ucontrol->value.integer.value[1 ]); -call_micmute_led_update (); - } -} -static int dell_mic_mute_led_mode_info (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_info *uinfo) +static void dell_micmute_update (struct hda_codec *codec) { -static const char *const texts[] = { -"On" ,"Off" ,"Follow Capture" ,"Follow Mute" , - }; - -return snd_ctl_enum_info (uinfo,1 ,ARRAY_SIZE (texts), texts); -} +struct hda_gen_spec *spec = codec->spec; -static int dell_mic_mute_led_mode_get (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ - ucontrol->value.enumerated.item[0 ] = dell_led_mode; -return 0 ; +dell_micmute_led_set_func (spec->micmute_led.led_value); } -static int dell_mic_mute_led_mode_put (struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) -{ -unsigned int mode; - - mode = ucontrol->value.enumerated.item[0 ]; -if (mode >MICMUTE_LED_FOLLOW_MUTE ) - mode =MICMUTE_LED_FOLLOW_MUTE ; -if (mode == dell_led_mode) -return 0 ; - dell_led_mode = mode; -call_micmute_led_update (); -return 1 ; -} - -static const struct snd_kcontrol_new dell_mic_mute_mode_ctls[] = { - { - .iface =SNDRV_CTL_ELEM_IFACE_MIXER , - .name ="Mic Mute-LED Mode" , - .info = dell_mic_mute_led_mode_info, - .get = dell_mic_mute_led_mode_get, - .put = dell_mic_mute_led_mode_put, - }, - {} -}; -static void alc_fixup_dell_wmi (struct hda_codec *codec,const struct hda_fixup *fix,int action) { -struct alc_spec *spec = codec->spec;bool removefunc = false;if (action ==HDA_FIXUP_ACT_PROBE ) {
@@ -121,25 +28,14 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,return ; } - removefunc = true; -if (dell_micmute_led_set_func (false) >=0 ) { - dell_led_value =0 ; -if (spec->gen.num_adc_nids >1 && !spec->gen.dyn_adc_switch) -codec_dbg (codec,"Skipping micmute LED control due to several ADCs" ); -else { - dell_old_cap_hook = spec->gen.cap_sync_hook; - spec->gen.cap_sync_hook = update_dell_wmi_micmute_led; - removefunc = false; -add_mixer (spec, dell_mic_mute_mode_ctls); - } - } - + removefunc = (dell_micmute_led_set_func (false) <0 ) || + (snd_hda_gen_add_micmute_led (codec, + dell_micmute_update) <=0 ); }if (dell_micmute_led_set_func && (action ==HDA_FIXUP_ACT_FREE || removefunc)) {symbol_put (dell_micmute_led_set); dell_micmute_led_set_func =NULL ; - dell_old_cap_hook =NULL ; } }
sound/pci/hda/hda_generic.c +140 -0
146 lines not on this page · raw message
sound/pci/hda/hda_generic.h +16 -0
@@ -86,6 +86,16 @@ struct badness_table {extern const struct badness_table hda_main_out_badness;extern const struct badness_table hda_extra_out_badness; +struct hda_micmute_hook { +unsigned int led_mode; +unsigned int capture; +unsigned int led_value; +void (*update)(struct hda_codec *codec); +void (*old_hook)(struct hda_codec *codec, +struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +}; +struct hda_gen_spec {char stream_name_analog[32 ];/* analog PCM stream */ const struct hda_pcm_stream *stream_analog_playback;
@@ -276,6 +286,9 @@ struct hda_gen_spec {struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); +/* mic mute LED hook; called via cap_sync_hook */ +struct hda_micmute_hook micmute_led; +/* PCM hooks */ void (*pcm_playback_hook)(struct hda_pcm_stream *hinfo, struct hda_codec *codec,
@@ -342,4 +355,7 @@ unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec,void snd_hda_gen_stream_pm (struct hda_codec *codec,hda_nid_t nid,bool on);int snd_hda_gen_fix_pin_power (struct hda_codec *codec,hda_nid_t pin); +int snd_hda_gen_add_micmute_led (struct hda_codec *codec, +void (*hook)(struct hda_codec *)); +#endif /* __SOUND_HDA_GENERIC_H */
Signature · 6 lines
2.17.1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
PATCH 2/2 ALSA: hda - Use the common helper for thinkpad_acpi mic mute LED handling
Use the new common helper for setting up and controlling the mic mute LED over thinkpad_acpi. This also provides a new mixer enum "Mic Mute-LED Mode" (that was present only for Dell models), which allows user to choose the mic mute LED behavior. For example, if you want the mic mute LED turned on only while mic is on, choose "Follow Capture" there.
Tested-by Pali Rohár <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/thinkpad_helper.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)
sound/pci/hda/thinkpad_helper.c +8 -19
@@ -27,17 +27,11 @@ static void update_tpacpi_mute_led(void *private_data, int enabled)led_set_func (TPACPI_LED_MUTE , !enabled); } -static void update_tpacpi_micmute_led (struct hda_codec *codec, -struct snd_kcontrol *kcontrol, -struct snd_ctl_elem_value *ucontrol) +static void update_tpacpi_micmute (struct hda_codec *codec) { -if (!ucontrol || !led_set_func) -return ; -if (strcmp ("Capture Switch" , ucontrol->id.name) ==0 && ucontrol->id.index ==0 ) { -/* TODO: How do I verify if it's a mono or stereo here? */ -bool val = ucontrol->value.integer.value[0 ] || ucontrol->value.integer.value[1 ]; -led_set_func (TPACPI_LED_MICMUTE , !val); - } +struct hda_gen_spec *spec = codec->spec; + +led_set_func (TPACPI_LED_MICMUTE , spec->micmute_led.led_value); } static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
@@ -63,15 +57,10 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, spec->vmaster_mute.hook = update_tpacpi_mute_led; removefunc = false; } -if (led_set_func (TPACPI_LED_MICMUTE , false) >=0 ) { -if (spec->num_adc_nids >1 && !spec->dyn_adc_switch) -codec_dbg (codec, -"Skipping micmute LED control due to several ADCs" ); -else { - spec->cap_sync_hook = update_tpacpi_micmute_led; - removefunc = false; - } - } +if (led_set_func (TPACPI_LED_MICMUTE , false) >=0 && +snd_hda_gen_add_micmute_led (codec, + update_tpacpi_micmute) >0 ) + removefunc = false; }if (led_set_func && (action ==HDA_FIXUP_ACT_FREE || removefunc)) {
Signature · 6 lines
2.17.1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel