* [PATCH 18/30] ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
@ 2009-10-09 10:40 LoganLi
0 siblings, 0 replies; 2+ messages in thread
From: LoganLi @ 2009-10-09 10:40 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, HaraldWelte, LydiaWang
From: Lydia Wang <lydiawang@viatech.com.cn>
Subject: ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
Rewrite nid_vol/mute assignment for clearity, and check line connection
before adding control for it.
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
---
pci/hda/patch_via.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- a/pci/hda/patch_via.c
+++ b/pci/hda/patch_via.c
@@ -1570,7 +1570,7 @@
{
char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE",
"Side" };
- hda_nid_t nid, nid_vol = 0;
+ hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
int i, err;
for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
@@ -1579,8 +1579,7 @@
if (!nid)
continue;
- if (i != AUTO_SEQ_FRONT)
- nid_vol = 0x18 + i;
+ nid_vol = nid_vols[i];
if (i == AUTO_SEQ_CENLFE) {
/* Center/LFE */
@@ -1612,13 +1611,13 @@
/* add control to mixer index 0 */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
"Master Front Playback
Volume",
- HDA_COMPOSE_AMP_VAL(0x17,
3, 0,
+
HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
"Master Front Playback
Switch",
- HDA_COMPOSE_AMP_VAL(0x17,
3, 0,
+
HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 18/30] ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
@ 2009-10-10 11:08 Logan Li
0 siblings, 0 replies; 2+ messages in thread
From: Logan Li @ 2009-10-10 11:08 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, HaraldWelte, LydiaWang
From: Lydia Wang <lydiawang@viatech.com.cn>
Subject: ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls.
Rewrite nid_vol/mute assignment for clearity, and check line connection
before adding control for it.
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
---
sound/pci/hda/patch_via.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1570,7 +1570,7 @@
{
char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
- hda_nid_t nid, nid_vol = 0;
+ hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
int i, err;
for (i = 0; i <= AUTO_SEQ_SIDE; i++) {
@@ -1579,8 +1579,7 @@
if (!nid)
continue;
- if (i != AUTO_SEQ_FRONT)
- nid_vol = 0x18 + i;
+ nid_vol = nid_vols[i];
if (i == AUTO_SEQ_CENLFE) {
/* Center/LFE */
@@ -1612,13 +1611,13 @@
/* add control to mixer index 0 */
err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
"Master Front Playback Volume",
- HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
+ HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
"Master Front Playback Switch",
- HDA_COMPOSE_AMP_VAL(0x17, 3, 0,
+ HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,
HDA_INPUT));
if (err < 0)
return err;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-10 11:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-10 11:08 [PATCH 18/30] ALSA: HDA VIA: Modify vt1708_auto_create_multi_out_ctls Logan Li
-- strict thread matches above, loose matches on Subject: below --
2009-10-09 10:40 LoganLi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.