Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d02d1b6 authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Takashi Iwai
Browse files

ALSA: hda - proc - add support for dynamic controls to mixer<->NID mapping 



This patch adds support for dynamically created controls to proc codec file
(Control: lines).

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3911a4c1

sound/pci/hda/hda_codec.c

+6 −1
Original line number Diff line number Diff line
@@ -1523,6 +1523,11 @@ int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid, 
	int err;

	struct hda_nid_item *item;



	if (kctl->id.subdevice & (1<<31)) {

		if (nid == 0)

			nid = kctl->id.subdevice & 0xffff;

		kctl->id.subdevice = 0;

	}

	err = snd_ctl_add(codec->bus->card, kctl);

	if (err < 0)

		return err;

sound/pci/hda/hda_local.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
/* mono volume with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \

	  .subdevice = (1<<31)|(nid), \

	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
@@ -53,6 +54,7 @@ 
/* mono mute switch with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \

	  .subdevice = (1<<31)|(nid), \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put, \
@@ -69,6 +71,7 @@ 
/* special beep mono mute switch with index (index=0,1,...) (channel=1,2) */

#define HDA_CODEC_MUTE_BEEP_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \

	  .subdevice = (1<<31)|(nid), \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put_beep, \

sound/pci/hda/patch_analog.c

+2 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,8 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name, 
	knew->name = kstrdup(name, GFP_KERNEL);

	if (! knew->name)

		return -ENOMEM;

	if (get_amp_nid_(val))

		knew->subdevice = (1<<31)|get_amp_nid_(val);

	knew->private_value = val;

	return 0;

}

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -4323,6 +4323,8 @@ static int add_control(struct alc_spec *spec, int type, const char *name, 
	knew->name = kstrdup(name, GFP_KERNEL);

	if (!knew->name)

		return -ENOMEM;

	if (get_amp_nid_(val))

		knew->subdevice = (1<<31)|get_amp_nid_(val);

	knew->private_value = val;

	return 0;

}

sound/pci/hda/patch_sigmatel.c

+7 −3
Original line number Diff line number Diff line
@@ -2671,7 +2671,8 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = { 
static struct snd_kcontrol_new *

stac_control_new(struct sigmatel_spec *spec,

		 struct snd_kcontrol_new *ktemp,

		 const char *name)

		 const char *name,

		 hda_nid_t nid)

{

	struct snd_kcontrol_new *knew;
@@ -2687,6 +2688,8 @@ stac_control_new(struct sigmatel_spec *spec, 
		spec->kctls.alloced--;

		return NULL;

	}

	if (nid)

		knew->subdevice = (1<<31)|nid;

	return knew;

}
@@ -2695,7 +2698,8 @@ static int stac92xx_add_control_temp(struct sigmatel_spec *spec, 
				     int idx, const char *name,

				     unsigned long val)

{

	struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name);

	struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name,

							 get_amp_nid_(val));

	if (!knew)

		return -ENOMEM;

	knew->index = idx;
@@ -2766,7 +2770,7 @@ static int stac92xx_add_input_source(struct sigmatel_spec *spec) 
	if (!spec->num_adcs || imux->num_items <= 1)

		return 0; /* no need for input source control */

	knew = stac_control_new(spec, &stac_input_src_temp,

				stac_input_src_temp.name);

				stac_input_src_temp.name, 0);

	if (!knew)

		return -ENOMEM;

	knew->count = spec->num_adcs;