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

topology: Store number of strings of a text section

Browse source 
Enum controls may use text elements and need the number of strings.

This patch adds a text child object for a generic element. When parsing
a text section from the configuation file, store the text strings and
number of strings (num_items) in the text child object of the element.

Reported-by: G Kranthi <gudishax.kranthikumar@intel.com>
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mengdong Lin 2016-11-24 09:34:00 +08:00 • committed by Takashi Iwai
parent f9633ed852
commit f53ff68562
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/topology/ctl.c
View file

@ -159,9 +159,11 @@ static void copy_enum_texts(struct tplg_elem *enum_elem,
struct tplg_elem *ref_elem) struct tplg_elem *ref_elem)
{ {
struct snd_soc_tplg_enum_control *ec = enum_elem->enum_ctrl; struct snd_soc_tplg_enum_control *ec = enum_elem->enum_ctrl;
struct tplg_texts *texts = ref_elem->texts;
memcpy(ec->texts, ref_elem->texts, memcpy(ec->texts, texts->items,
SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN); SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
ec->items += texts->num_items;
} }
/* check referenced text for a enum control */ /* check referenced text for a enum control */

1
src/topology/elem.c
View file

@ -159,6 +159,7 @@ struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg,
break; break;
case SND_TPLG_TYPE_TEXT: case SND_TPLG_TYPE_TEXT:
list_add_tail(&elem->list, &tplg->text_list); list_add_tail(&elem->list, &tplg->text_list);
obj_size = sizeof(struct tplg_texts);
break; break;
case SND_TPLG_TYPE_TLV: case SND_TPLG_TYPE_TLV:
list_add_tail(&elem->list, &tplg->tlv_list); list_add_tail(&elem->list, &tplg->tlv_list);

6
src/topology/text.c
View file

@ -25,6 +25,7 @@
static int parse_text_values(snd_config_t *cfg, struct tplg_elem *elem) static int parse_text_values(snd_config_t *cfg, struct tplg_elem *elem)
{ {
struct tplg_texts *texts = elem->texts;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n; snd_config_t *n;
const char *value = NULL; const char *value = NULL;
@ -44,13 +45,14 @@ static int parse_text_values(snd_config_t *cfg, struct tplg_elem *elem)
if (snd_config_get_string(n, &value) < 0) if (snd_config_get_string(n, &value) < 0)
continue; continue;
elem_copy_text(&elem->texts[j][0], value, elem_copy_text(&texts->items[j][0], value,
SNDRV_CTL_ELEM_ID_NAME_MAXLEN); SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
tplg_dbg("\t%s\n", &elem->texts[j][0]); tplg_dbg("\t%s\n", &texts->items[j][0]);
j++; j++;
} }
texts->num_items = j;
return 0; return 0;
} }

9
src/topology/tplg_local.h
View file

@ -91,6 +91,11 @@ struct tplg_ref {
struct list_head list; struct list_head list;
}; };
struct tplg_texts {
unsigned int num_items;
char items[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
};
/* element for vendor tokens */ /* element for vendor tokens */
struct tplg_token { struct tplg_token {
char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
@ -128,9 +133,6 @@ struct tplg_elem {
char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
/* storage for texts and data if this is text or data elem*/
char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
int index; int index;
enum snd_tplg_type type; enum snd_tplg_type type;
@ -155,6 +157,7 @@ struct tplg_elem {
/* these do not map to UAPI structs but are internal only */ /* these do not map to UAPI structs but are internal only */
struct snd_soc_tplg_ctl_tlv *tlv; struct snd_soc_tplg_ctl_tlv *tlv;
struct tplg_texts *texts;
struct snd_soc_tplg_private *data; struct snd_soc_tplg_private *data;
struct tplg_vendor_tokens *tokens; struct tplg_vendor_tokens *tokens;
struct tplg_vendor_tuples *tuples; struct tplg_vendor_tuples *tuples;