ALSA: HDA: Rename "Int Mic" to "Internal Mic"
PATCH 1/3 ALSA: HDA: Rename "Int Mic" to "Internal Mic"
Signature · 3 lines
-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic
Quoted 1 line
From
c3cd7abfecec21c2ee9efeb615633bd1fd9012b6Mon Sep 17 00:00:00 2001
From: David Henningsson <[email protected]>
Date: Mon, 20 Dec 2010 14:24:29 +0100
Subject: [PATCH 1/3] ALSA: HDA: Rename "Int Mic" to "Internal Mic"
"Int Mic" and "Internal Mic" both mean the same thing, so rename the former to the latter in order to clean up the namespace a little.
Signed-off-by David Henningsson <[email protected]>
--- sound/pci/hda/patch_conexant.c | 36 ++++++++++---------- sound/pci/hda/patch_realtek.c | 72 ++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 54 deletions(-)
sound/pci/hda/patch_conexant.c +18 -18
@@ -869,14 +869,14 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec, }static struct snd_kcontrol_new cxt5045_mixers[] = { -HDA_CODEC_VOLUME ("Int Mic Capture Volume" ,0x1a ,0x01 ,HDA_INPUT ), -HDA_CODEC_MUTE ("Int Mic Capture Switch" ,0x1a ,0x01 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Internal Mic Capture Volume" ,0x1a ,0x01 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Internal Mic Capture Switch" ,0x1a ,0x01 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Ext Mic Capture Volume" ,0x1a ,0x02 ,HDA_INPUT ),HDA_CODEC_MUTE ("Ext Mic Capture Switch" ,0x1a ,0x02 ,HDA_INPUT ),HDA_CODEC_VOLUME ("PCM Playback Volume" ,0x17 ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE ("PCM Playback Switch" ,0x17 ,0x0 ,HDA_INPUT ), -HDA_CODEC_VOLUME ("Int Mic Playback Volume" ,0x17 ,0x1 ,HDA_INPUT ), -HDA_CODEC_MUTE ("Int Mic Playback Switch" ,0x17 ,0x1 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Internal Mic Playback Volume" ,0x17 ,0x1 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Internal Mic Playback Switch" ,0x17 ,0x1 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Ext Mic Playback Volume" ,0x17 ,0x2 ,HDA_INPUT ),HDA_CODEC_MUTE ("Ext Mic Playback Switch" ,0x17 ,0x2 ,HDA_INPUT ),HDA_BIND_VOL ("Master Playback Volume" , &cxt5045_hp_bind_master_vol),
@@ -910,14 +910,14 @@ static struct snd_kcontrol_new cxt5045_benq_mixers[] = { };static struct snd_kcontrol_new cxt5045_mixers_hp530[] = { -HDA_CODEC_VOLUME ("Int Mic Capture Volume" ,0x1a ,0x02 ,HDA_INPUT ), -HDA_CODEC_MUTE ("Int Mic Capture Switch" ,0x1a ,0x02 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Internal Mic Capture Volume" ,0x1a ,0x02 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Internal Mic Capture Switch" ,0x1a ,0x02 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Ext Mic Capture Volume" ,0x1a ,0x01 ,HDA_INPUT ),HDA_CODEC_MUTE ("Ext Mic Capture Switch" ,0x1a ,0x01 ,HDA_INPUT ),HDA_CODEC_VOLUME ("PCM Playback Volume" ,0x17 ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE ("PCM Playback Switch" ,0x17 ,0x0 ,HDA_INPUT ), -HDA_CODEC_VOLUME ("Int Mic Playback Volume" ,0x17 ,0x2 ,HDA_INPUT ), -HDA_CODEC_MUTE ("Int Mic Playback Switch" ,0x17 ,0x2 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Internal Mic Playback Volume" ,0x17 ,0x2 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Internal Mic Playback Switch" ,0x17 ,0x2 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Ext Mic Playback Volume" ,0x17 ,0x1 ,HDA_INPUT ),HDA_CODEC_MUTE ("Ext Mic Playback Switch" ,0x17 ,0x1 ,HDA_INPUT ),HDA_BIND_VOL ("Master Playback Volume" , &cxt5045_hp_bind_master_vol),
@@ -947,7 +947,7 @@ static struct hda_verb cxt5045_init_verbs[] = { {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x1a, AC_VERB_SET_CONNECT_SEL,0x1}, {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
@@ -960,7 +960,7 @@ static struct hda_verb cxt5045_init_verbs[] = { };static struct hda_verb cxt5045_benq_init_verbs[] = { -/* Int Mic, Mic */ +/* Internal Mic, Mic */ {0x12 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_IN |AC_PINCTL_VREF_80 }, {0x14 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_IN |AC_PINCTL_VREF_80 },/* Line In,HP, Amp */
@@ -973,7 +973,7 @@ static struct hda_verb cxt5045_benq_init_verbs[] = { {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x1a, AC_VERB_SET_CONNECT_SEL, 0x1}, {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
@@ -1847,7 +1847,7 @@ static struct hda_verb cxt5051_init_verbs[] = { {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},/* DAC1 */ {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44}, {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44}, {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
@@ -1874,7 +1874,7 @@ static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = { {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},/* DAC1 */ {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44}, {0x14, AC_VERB_SET_CONNECT_SEL, 0x1}, /* SPDIF route: PCM */
@@ -1904,7 +1904,7 @@ static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = { {0x19, AC_VERB_SET_CONNECT_SEL, 0x00},/* DAC1 */ {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44}, {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44}, {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
@@ -1932,7 +1932,7 @@ static struct hda_verb cxt5051_f700_init_verbs[] = { {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},/* DAC1 */ {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -/* Record selector: Int mic */ +/* Record selector: Internal mic */ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44}, {0x14, AC_VERB_SET_CONNECT_SEL, 0x1}, /* SPDIF route: PCM */
@@ -2729,7 +2729,7 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {static struct snd_kcontrol_new cxt5066_vostro_mixers[] = { { .iface =SNDRV_CTL_ELEM_IFACE_MIXER , - .name ="Int Mic Boost Capture Enum" , + .name ="Internal Mic Boost Capture Enum" , .info = cxt5066_mic_boost_mux_enum_info, .get = cxt5066_mic_boost_mux_enum_get, .put = cxt5066_mic_boost_mux_enum_put,
@@ -2955,7 +2955,7 @@ static struct hda_verb cxt5066_init_verbs_ideapad[] = { {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},/* internal microphone */ - {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */ + {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable internal mic *//* EAPD */ {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
@@ -3010,7 +3010,7 @@ static struct hda_verb cxt5066_init_verbs_thinkpad[] = { {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},/* internal microphone */ - {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */ + {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable internal mic *//* EAPD */ {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
sound/pci/hda/patch_realtek.c +36 -36
180 lines not on this page · raw message
Signature · 1 line
1.7.1
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel