Commit 1c82ed1b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

[ALSA] Keep private TLV entry in vmaster itself 



Use a private array for TLV entries of virtual master controls instead
of (supposed) static array.  This cleans up the existing codes.

Also, now vmaster assumes the simple dB-range TLV that is the only type
it can handle.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e922b002

sound/core/vmaster.c

+6 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/slab.h>

#include <sound/core.h>

#include <sound/control.h>

#include <sound/tlv.h>



/*

 * a subset of information returned via ctl info callback
@@ -34,6 +35,7 @@ struct link_master { 
	struct list_head slaves;

	struct link_ctl_info info;

	int val;		/* the master value */

	unsigned int tlv[4];

};



/*
@@ -357,11 +359,12 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name, 
	kctl->private_free = master_free;



	/* additional (constant) TLV read */

	if (tlv) {

		/* FIXME: this assumes that the max volume is 0 dB */

	if (tlv && tlv[0] == SNDRV_CTL_TLVT_DB_SCALE) {

		kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;

		kctl->tlv.p = tlv;

		memcpy(master->tlv, tlv, sizeof(master->tlv));

		kctl->tlv.p = master->tlv;

	}



	return kctl;

}

sound/pci/hda/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ snd-hda-intel-y := hda_intel.o 
# since snd-hda-intel is the only driver using hda-codec,

# merge it into a single module although it was originally

# designed to be individual modules

snd-hda-intel-y += hda_codec.o vmaster.o

snd-hda-intel-y += hda_codec.o

snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

sound/pci/hda/patch_analog.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct ad198x_spec { 
#endif

	/* for virtual master */

	hda_nid_t vmaster_nid;

	u32 vmaster_tlv[4];

	const char **slave_vols;

	const char **slave_sws;

};
@@ -185,10 +184,11 @@ static int ad198x_build_controls(struct hda_codec *codec) 


	/* if we have no master control, let's create it */

	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {

		unsigned int vmaster_tlv[4];

		snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,

					HDA_OUTPUT, spec->vmaster_tlv);

					HDA_OUTPUT, vmaster_tlv);

		err = snd_hda_add_vmaster(codec, "Master Playback Volume",

					  spec->vmaster_tlv,

					  vmaster_tlv,

					  (spec->slave_vols ?

					   spec->slave_vols : ad_slave_vols));

		if (err < 0)

sound/pci/hda/patch_realtek.c

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ struct alc_spec { 


	/* for virtual master */

	hda_nid_t vmaster_nid;

	u32 vmaster_tlv[4];

#ifdef CONFIG_SND_HDA_POWER_SAVE

	struct hda_loopback_check loopback;

#endif
@@ -1534,10 +1533,11 @@ static int alc_build_controls(struct hda_codec *codec) 


	/* if we have no master control, let's create it */

	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {

		unsigned int vmaster_tlv[4];

		snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,

					HDA_OUTPUT, spec->vmaster_tlv);

					HDA_OUTPUT, vmaster_tlv);

		err = snd_hda_add_vmaster(codec, "Master Playback Volume",

					  spec->vmaster_tlv, alc_slave_vols);

					  vmaster_tlv, alc_slave_vols);

		if (err < 0)

			return err;

	}

sound/pci/hda/patch_sigmatel.c

+3 −5
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ struct sigmatel_spec { 
	struct hda_input_mux private_dimux;

	struct hda_input_mux private_imux;

	struct hda_input_mux private_mono_mux;



	/* virtual master */

	unsigned int vmaster_tlv[4];

};



static hda_nid_t stac9200_adc_nids[1] = {
@@ -930,10 +927,11 @@ static int stac92xx_build_controls(struct hda_codec *codec) 


	/* if we have no master control, let's create it */

	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {

		unsigned int vmaster_tlv[4];

		snd_hda_set_vmaster_tlv(codec, spec->multiout.dac_nids[0],

					HDA_OUTPUT, spec->vmaster_tlv);

					HDA_OUTPUT, vmaster_tlv);

		err = snd_hda_add_vmaster(codec, "Master Playback Volume",

					  spec->vmaster_tlv, slave_vols);

					  vmaster_tlv, slave_vols);

		if (err < 0)

			return err;

	}