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

Commit 9e3fd871 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

ALSA: hda - introduce HDA_SUBDEV_AMP_FLAG (ControlAmp in proc) 



The purpose of this changeset is to show information about amplifier
setting in the codec proc file. Something like:

  Control: name="Front Playback Volume", index=0, device=0
    ControlAmp: chs=3, dir=Out, idx=0, ofs=0
  Control: name="Front Playback Switch", index=0, device=0
    ControlAmp: chs=3, dir=In, idx=2, ofs=0

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 5b0cb1d8

sound/pci/hda/hda_codec.c

+9 −5
Original line number Diff line number Diff line
@@ -1723,19 +1723,22 @@ EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl); 
 *

 * snd_hda_ctl_add() checks the control subdev id field whether

 * #HDA_SUBDEV_NID_FLAG bit is set.  If set (and @nid is zero), the lower

 * bits value is taken as the NID to assign.

 * bits value is taken as the NID to assign. The #HDA_NID_ITEM_AMP bit

 * specifies if kctl->private_value is a HDA amplifier value.

 */

int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,

		    struct snd_kcontrol *kctl)

{

	int err;

	unsigned short flags = 0;

	struct hda_nid_item *item;



	if (kctl->id.subdevice & HDA_SUBDEV_NID_FLAG) {

		if (nid == 0)

	if (kctl->id.subdevice & HDA_SUBDEV_AMP_FLAG)

		flags |= HDA_NID_ITEM_AMP;

	if ((kctl->id.subdevice & HDA_SUBDEV_NID_FLAG) != 0 && nid == 0)

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

	if (kctl->id.subdevice & 0xf0000000)

		kctl->id.subdevice = 0;

	}

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

	if (err < 0)

		return err;
@@ -1744,6 +1747,7 @@ int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid, 
		return -ENOMEM;

	item->kctl = kctl;

	item->nid = nid;

	item->flags = flags;

	return 0;

}

EXPORT_SYMBOL_HDA(snd_hda_ctl_add);

sound/pci/hda/hda_local.h

+8 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 * in snd_hda_ctl_add(), so that this value won't appear in the outside.

 */

#define HDA_SUBDEV_NID_FLAG	(1U << 31)

#define HDA_SUBDEV_AMP_FLAG	(1U << 30)



/*

 * for mixer controls
@@ -42,7 +43,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 = HDA_SUBDEV_NID_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	  	    SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
@@ -63,7 +64,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 = HDA_SUBDEV_NID_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put, \
@@ -81,7 +82,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 = HDA_SUBDEV_NID_FLAG | (nid), \

	  .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | (nid), \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .put = snd_hda_mixer_amp_switch_put_beep, \
@@ -466,10 +467,14 @@ u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid); 
u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);

int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);



/* flags for hda_nid_item */

#define HDA_NID_ITEM_AMP	(1<<0)



struct hda_nid_item {

	struct snd_kcontrol *kctl;

	unsigned int index;

	hda_nid_t nid;

	unsigned short flags;

};



int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,

sound/pci/hda/hda_proc.c

+8 −0
Original line number Diff line number Diff line
@@ -76,6 +76,14 @@ static void print_nid_array(struct snd_info_buffer *buffer, 
			  "  Control: name=\"%s\", index=%i, device=%i\n",

			  kctl->id.name, kctl->id.index + item->index,

			  kctl->id.device);

			if (item->flags & HDA_NID_ITEM_AMP)

				snd_iprintf(buffer,

				  "    ControlAmp: chs=%lu, dir=%s, "

				  "idx=%lu, ofs=%lu\n",

				  get_amp_channels(kctl),

				  get_amp_direction(kctl) ? "Out" : "In",

				  get_amp_index(kctl),

				  get_amp_offset(kctl));

		}

	}

}

sound/pci/hda/patch_analog.c

+7 −5
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | 0x1a,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x1a,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1986a_hp_master_sw_put,
@@ -2602,7 +2602,9 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name, 
	if (! knew->name)

		return -ENOMEM;

	if (get_amp_nid_(val))

		knew->subdevice = HDA_SUBDEV_NID_FLAG | get_amp_nid_(val);

		knew->subdevice = HDA_SUBDEV_NID_FLAG |

				  HDA_SUBDEV_AMP_FLAG |

				  get_amp_nid_(val);

	knew->private_value = val;

	return 0;

}
@@ -3756,7 +3758,7 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1884a_mobile_master_sw_put,
@@ -3785,7 +3787,7 @@ static struct snd_kcontrol_new ad1884a_mobile_mixers[] = { 
	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",

		.subdevice = HDA_SUBDEV_NID_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = ad1884a_mobile_master_sw_put,
@@ -4127,7 +4129,7 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = { 
/*	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.subdevice = HDA_SUBDEV_NID_FLAG | 0x21,

		.subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x21,

		.name = "Master Playback Switch",

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

sound/pci/hda/patch_cirrus.c

+2 −0
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ static int add_mute(struct hda_codec *codec, const char *name, int index, 
	knew.private_value = pval;

	snprintf(tmp, sizeof(tmp), "%s %s Switch", name, dir_sfx[dir]);

	*kctlp = snd_ctl_new1(&knew, codec);

	(*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;

	return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp);

}
@@ -513,6 +514,7 @@ static int add_volume(struct hda_codec *codec, const char *name, 
	knew.private_value = pval;

	snprintf(tmp, sizeof(tmp), "%s %s Volume", name, dir_sfx[dir]);

	*kctlp = snd_ctl_new1(&knew, codec);

	(*kctlp)->id.subdevice = HDA_SUBDEV_AMP_FLAG;

	return snd_hda_ctl_add(codec, get_amp_nid_(pval), *kctlp);

}