mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-05 01:40:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

topology: Fix pcm ID & name parsing

Browse source 
The name and ID of SectionPCM should be set to pcm_name and pcm_id,
for a front-end DAI link in the kernel, not for the front-end DAI
of the link.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mengdong Lin 2016-04-29 11:03:30 +08:00 • committed by Takashi Iwai
parent 0935e32d40
commit 5d23c406d1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sound/asoc.h
View file

@ -414,7 +414,7 @@ struct snd_soc_tplg_pcm {
__le32 size; /* in bytes of this structure */ __le32 size; /* in bytes of this structure */
char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
__le32 pcm_id; /* unique ID - used to match */ __le32 pcm_id; /* unique ID - used to match with DAI link */
__le32 dai_id; /* unique ID - used to match */ __le32 dai_id; /* unique ID - used to match */
__le32 playback; /* supports playback mode */ __le32 playback; /* supports playback mode */
__le32 capture; /* supports capture mode */ __le32 capture; /* supports capture mode */

6
src/topology/pcm.c
View file

@ -337,7 +337,7 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
pcm = elem->pcm; pcm = elem->pcm;
pcm->size = elem->size; pcm->size = elem->size;
elem_copy_text(pcm->dai_name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); elem_copy_text(pcm->pcm_name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
tplg_dbg(" PCM: %s\n", elem->id); tplg_dbg(" PCM: %s\n", elem->id);
@ -366,8 +366,8 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
if (snd_config_get_string(n, &val) < 0) if (snd_config_get_string(n, &val) < 0)
return -EINVAL; return -EINVAL;
pcm->dai_id = atoi(val); pcm->pcm_id = atoi(val);
tplg_dbg("\t%s: %d\n", id, pcm->dai_id); tplg_dbg("\t%s: %d\n", id, pcm->pcm_id);
continue; continue;
} }