redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

ALSA: Jack: handle jack embedded kcontrol creating within ctljack 

This patch adds a static method get_available_index() to
allocate the index of new jack kcontrols and also adds
jack_kctl_name_gen() which is used to ensure compatibility
with jack naming by removing " Jack" from some incorrectly
passed names.

Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
steinar/wifi_calib_4_9_kernel
Jie Yang 2015-04-27 21:20:57 +08:00 committed by Takashi Iwai
parent 9058cbe1ee
commit b8dd086674
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/control.h
View File

@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
* Helper functions for jack-detection controls
*/
struct snd_kcontrol *
snd_kctl_jack_new(const char *name, int idx, void *private_data);
snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card);
void snd_kctl_jack_report(struct snd_card *card,
struct snd_kcontrol *kctl, bool status);

37
sound/core/ctljack.c
View File

@ -31,15 +31,46 @@ static struct snd_kcontrol_new jack_detect_kctl = {
.get = jack_detect_kctl_get,
};
static int get_available_index(struct snd_card *card, const char *name)
{
struct snd_ctl_elem_id sid;
memset(&sid, 0, sizeof(sid));
sid.index = 0;
sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;
strlcpy(sid.name, name, sizeof(sid.name));
while (snd_ctl_find_id(card, &sid))
sid.index++;
return sid.index;
}
static void jack_kctl_name_gen(char *name, const char *src_name, int size)
{
size_t count = strlen(src_name);
bool need_cat = true;
/* remove redundant " Jack" from src_name */
if (count >= 5)
need_cat = strncmp(&src_name[count - 5], " Jack", 5) ? true : false;
snprintf(name, size, need_cat ? "%s Jack" : "%s", src_name);
}
struct snd_kcontrol *
snd_kctl_jack_new(const char *name, int idx, void *private_data)
snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card)
{
struct snd_kcontrol *kctl;
kctl = snd_ctl_new1(&jack_detect_kctl, private_data);
if (!kctl)
return NULL;
snprintf(kctl->id.name, sizeof(kctl->id.name), "%s Jack", name);
kctl->id.index = idx;
jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
kctl->id.index = get_available_index(card, name);
kctl->private_value = 0;
return kctl;
}

2
sound/core/jack.c
View File

@ -135,7 +135,7 @@ static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const cha
struct snd_jack_kctl *jack_kctl;
int err;
kctl = snd_kctl_jack_new(name, 0, card);
kctl = snd_kctl_jack_new(name, card, card);
if (!kctl)
return NULL;

2
sound/pci/hda/hda_jack.c
View File

@ -402,7 +402,7 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
return 0;
if (jack->kctl)
return 0; /* already created */
kctl = snd_kctl_jack_new(name, idx, codec);
kctl = snd_kctl_jack_new(name, codec, codec->card);
if (!kctl)
return -ENOMEM;
err = snd_hda_ctl_add(codec, nid, kctl);