evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ALSA] Keep private TLV entry in vmaster itself

Browse source 
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: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2008-02-18 13:05:50 +01:00
parent e922b0028f
commit 1c82ed1bc5
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/core/vmaster.c
View file

@ -12,6 +12,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/control.h> #include <sound/control.h>
#include <sound/tlv.h>
/* /*
* a subset of information returned via ctl info callback * a subset of information returned via ctl info callback
@ -34,6 +35,7 @@ struct link_master {
struct list_head slaves; struct list_head slaves;
struct link_ctl_info info; struct link_ctl_info info;
int val; /* the master value */ 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; kctl->private_free = master_free;
/* additional (constant) TLV read */ /* additional (constant) TLV read */
if (tlv) { if (tlv && tlv[0] == SNDRV_CTL_TLVT_DB_SCALE) {
/* FIXME: this assumes that the max volume is 0 dB */
kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ; 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; return kctl;
} }

2
sound/pci/hda/Makefile
View file

@ -2,7 +2,7 @@ snd-hda-intel-y := hda_intel.o
# since snd-hda-intel is the only driver using hda-codec, # since snd-hda-intel is the only driver using hda-codec,
# merge it into a single module although it was originally # merge it into a single module although it was originally
# designed to be individual modules # 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_PROC_FS) += hda_proc.o
snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

6
sound/pci/hda/patch_analog.c
View file

@ -80,7 +80,6 @@ struct ad198x_spec {
#endif #endif
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
u32 vmaster_tlv[4];
const char **slave_vols; const char **slave_vols;
const char **slave_sws; 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 we have no master control, let's create it */
if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
unsigned int vmaster_tlv[4];
snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid, 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", err = snd_hda_add_vmaster(codec, "Master Playback Volume",
spec->vmaster_tlv, vmaster_tlv,
(spec->slave_vols ? (spec->slave_vols ?
spec->slave_vols : ad_slave_vols)); spec->slave_vols : ad_slave_vols));
if (err < 0) if (err < 0)

6
sound/pci/hda/patch_realtek.c
View file

@ -272,7 +272,6 @@ struct alc_spec {
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
u32 vmaster_tlv[4];
#ifdef CONFIG_SND_HDA_POWER_SAVE #ifdef CONFIG_SND_HDA_POWER_SAVE
struct hda_loopback_check loopback; struct hda_loopback_check loopback;
#endif #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 we have no master control, let's create it */
if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
unsigned int vmaster_tlv[4];
snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid, 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", err = snd_hda_add_vmaster(codec, "Master Playback Volume",
spec->vmaster_tlv, alc_slave_vols); vmaster_tlv, alc_slave_vols);
if (err < 0) if (err < 0)
return err; return err;
} }

8
sound/pci/hda/patch_sigmatel.c
View file

@ -186,9 +186,6 @@ struct sigmatel_spec {
struct hda_input_mux private_dimux; struct hda_input_mux private_dimux;
struct hda_input_mux private_imux; struct hda_input_mux private_imux;
struct hda_input_mux private_mono_mux; struct hda_input_mux private_mono_mux;
/* virtual master */
unsigned int vmaster_tlv[4];
}; };
static hda_nid_t stac9200_adc_nids[1] = { 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 we have no master control, let's create it */
if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { 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], 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", err = snd_hda_add_vmaster(codec, "Master Playback Volume",
spec->vmaster_tlv, slave_vols); vmaster_tlv, slave_vols);
if (err < 0) if (err < 0)
return err; return err;
} }