mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-03 09:01:52 -05:00
topology: Parse vendor private data for manifest
In text conf file, user can define a manifest section and let it refer to private data sections, in the same syntax as other element types. The text conf file can have at most 1 manifest section. Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mengdong Lin
Takashi Iwai
parent
62c180981b
commit
a3683a2ba0
5 changed files with 153 additions and 2 deletions
|
|
@ -26,6 +26,10 @@ struct snd_soc_tplg_private *get_priv_data(struct tplg_elem *elem)
|
|||
struct snd_soc_tplg_private *priv = NULL;
|
||||
|
||||
switch (elem->type) {
|
||||
case SND_TPLG_TYPE_MANIFEST:
|
||||
priv = &elem->manifest->priv;
|
||||
break;
|
||||
|
||||
case SND_TPLG_TYPE_MIXER:
|
||||
priv = &elem->mixer_ctrl->priv;
|
||||
break;
|
||||
|
|
@ -834,6 +838,103 @@ void tplg_free_tuples(void *obj)
|
|||
free(tuples->set);
|
||||
}
|
||||
|
||||
/* Parse manifest's data references
|
||||
*/
|
||||
int tplg_parse_manifest_data(snd_tplg_t *tplg, snd_config_t *cfg,
|
||||
void *private ATTRIBUTE_UNUSED)
|
||||
{
|
||||
struct snd_soc_tplg_manifest *manifest;
|
||||
struct tplg_elem *elem;
|
||||
snd_config_iterator_t i, next;
|
||||
snd_config_t *n;
|
||||
const char *id;
|
||||
int err;
|
||||
|
||||
if (!list_empty(&tplg->manifest_list)) {
|
||||
SNDERR("error: already has manifest data\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
elem = tplg_elem_new_common(tplg, cfg, NULL, SND_TPLG_TYPE_MANIFEST);
|
||||
if (!elem)
|
||||
return -ENOMEM;
|
||||
|
||||
manifest = elem->manifest;
|
||||
manifest->size = elem->size;
|
||||
|
||||
tplg_dbg(" Manifest: %s\n", elem->id);
|
||||
|
||||
snd_config_for_each(i, next, cfg) {
|
||||
n = snd_config_iterator_entry(i);
|
||||
if (snd_config_get_id(n, &id) < 0)
|
||||
continue;
|
||||
|
||||
/* skip comments */
|
||||
if (strcmp(id, "comment") == 0)
|
||||
continue;
|
||||
if (id[0] == '#')
|
||||
continue;
|
||||
|
||||
|
||||
if (strcmp(id, "data") == 0) {
|
||||
err = tplg_parse_data_refs(n, elem);
|
||||
if (err < 0)
|
||||
return err;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* merge private data of manifest */
|
||||
int tplg_build_manifest_data(snd_tplg_t *tplg)
|
||||
{
|
||||
struct list_head *base, *pos;
|
||||
struct tplg_elem *elem = NULL;
|
||||
struct tplg_ref *ref;
|
||||
struct snd_soc_tplg_manifest *manifest;
|
||||
int err = 0;
|
||||
|
||||
base = &tplg->manifest_list;
|
||||
list_for_each(pos, base) {
|
||||
|
||||
elem = list_entry(pos, struct tplg_elem, list);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!elem) /* no manifest data */
|
||||
return 0;
|
||||
|
||||
base = &elem->ref_list;
|
||||
|
||||
/* for each ref in this manifest elem */
|
||||
list_for_each(pos, base) {
|
||||
|
||||
ref = list_entry(pos, struct tplg_ref, list);
|
||||
if (ref->id == NULL || ref->elem)
|
||||
continue;
|
||||
|
||||
if (ref->type == SND_TPLG_TYPE_DATA) {
|
||||
err = tplg_copy_data(tplg, elem, ref);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
manifest = elem->manifest;
|
||||
if (!manifest->priv.size) /* no manifest data */
|
||||
return 0;
|
||||
|
||||
tplg->manifest_pdata = malloc(manifest->priv.size);
|
||||
if (!tplg->manifest_pdata)
|
||||
return -ENOMEM;
|
||||
|
||||
tplg->manifest.priv.size = manifest->priv.size;
|
||||
memcpy(tplg->manifest_pdata, manifest->priv.data, manifest->priv.size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Parse Private data.
|
||||
*
|
||||
* Object private data can either be from file or defined as bytes, shorts,
|
||||
|
|
|
|||
|
|
@ -150,6 +150,10 @@ struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg,
|
|||
case SND_TPLG_TYPE_DATA:
|
||||
list_add_tail(&elem->list, &tplg->pdata_list);
|
||||
break;
|
||||
case SND_TPLG_TYPE_MANIFEST:
|
||||
list_add_tail(&elem->list, &tplg->manifest_list);
|
||||
obj_size = sizeof(struct snd_soc_tplg_manifest);
|
||||
break;
|
||||
case SND_TPLG_TYPE_TEXT:
|
||||
list_add_tail(&elem->list, &tplg->text_list);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -189,6 +189,15 @@ static int tplg_parse_config(snd_tplg_t *tplg, snd_config_t *cfg)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (strcmp(id, "SectionManifest") == 0) {
|
||||
err = tplg_parse_compound(tplg, n,
|
||||
tplg_parse_manifest_data,
|
||||
NULL);
|
||||
if (err < 0)
|
||||
return err;
|
||||
continue;
|
||||
}
|
||||
|
||||
SNDERR("error: unknown section %s\n", id);
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -246,6 +255,10 @@ static int tplg_build_integ(snd_tplg_t *tplg)
|
|||
if (err < 0)
|
||||
return err;
|
||||
|
||||
err = tplg_build_manifest_data(tplg);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
err = tplg_build_controls(tplg);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
|
@ -374,8 +387,16 @@ out:
|
|||
|
||||
int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len)
|
||||
{
|
||||
if (len <= 0)
|
||||
return 0;
|
||||
|
||||
tplg->manifest.priv.size = len;
|
||||
tplg->manifest_pdata = data;
|
||||
|
||||
tplg->manifest_pdata = malloc(len);
|
||||
if (!tplg->manifest_pdata)
|
||||
return -ENOMEM;
|
||||
|
||||
memcpy(tplg->manifest_pdata, data, len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -423,6 +444,7 @@ snd_tplg_t *snd_tplg_new(void)
|
|||
INIT_LIST_HEAD(&tplg->cc_list);
|
||||
INIT_LIST_HEAD(&tplg->route_list);
|
||||
INIT_LIST_HEAD(&tplg->pdata_list);
|
||||
INIT_LIST_HEAD(&tplg->manifest_list);
|
||||
INIT_LIST_HEAD(&tplg->text_list);
|
||||
INIT_LIST_HEAD(&tplg->pcm_config_list);
|
||||
INIT_LIST_HEAD(&tplg->pcm_caps_list);
|
||||
|
|
@ -437,6 +459,9 @@ snd_tplg_t *snd_tplg_new(void)
|
|||
|
||||
void snd_tplg_free(snd_tplg_t *tplg)
|
||||
{
|
||||
if (tplg->manifest_pdata)
|
||||
free(tplg->manifest_pdata);
|
||||
|
||||
tplg_elem_free_list(&tplg->tlv_list);
|
||||
tplg_elem_free_list(&tplg->widget_list);
|
||||
tplg_elem_free_list(&tplg->pcm_list);
|
||||
|
|
@ -444,6 +469,7 @@ void snd_tplg_free(snd_tplg_t *tplg)
|
|||
tplg_elem_free_list(&tplg->cc_list);
|
||||
tplg_elem_free_list(&tplg->route_list);
|
||||
tplg_elem_free_list(&tplg->pdata_list);
|
||||
tplg_elem_free_list(&tplg->manifest_list);
|
||||
tplg_elem_free_list(&tplg->text_list);
|
||||
tplg_elem_free_list(&tplg->pcm_config_list);
|
||||
tplg_elem_free_list(&tplg->pcm_caps_list);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ struct snd_tplg {
|
|||
|
||||
/* manifest */
|
||||
struct snd_soc_tplg_manifest manifest;
|
||||
const void *manifest_pdata; /* copied by builder at file write */
|
||||
void *manifest_pdata; /* copied by builder at file write */
|
||||
|
||||
/* list of each element type */
|
||||
struct list_head tlv_list;
|
||||
|
|
@ -71,6 +71,7 @@ struct snd_tplg {
|
|||
struct list_head pdata_list;
|
||||
struct list_head token_list;
|
||||
struct list_head tuple_list;
|
||||
struct list_head manifest_list;
|
||||
struct list_head pcm_config_list;
|
||||
struct list_head pcm_caps_list;
|
||||
|
||||
|
|
@ -154,6 +155,7 @@ struct tplg_elem {
|
|||
struct snd_soc_tplg_private *data;
|
||||
struct tplg_vendor_tokens *tokens;
|
||||
struct tplg_vendor_tuples *tuples;
|
||||
struct snd_soc_tplg_manifest *manifest;
|
||||
};
|
||||
|
||||
/* an element may refer to other elements:
|
||||
|
|
@ -195,6 +197,9 @@ int tplg_parse_tuples(snd_tplg_t *tplg, snd_config_t *cfg,
|
|||
|
||||
void tplg_free_tuples(void *obj);
|
||||
|
||||
int tplg_parse_manifest_data(snd_tplg_t *tplg, snd_config_t *cfg,
|
||||
void *private ATTRIBUTE_UNUSED);
|
||||
|
||||
int tplg_parse_control_bytes(snd_tplg_t *tplg,
|
||||
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED);
|
||||
|
||||
|
|
@ -223,6 +228,7 @@ int tplg_parse_cc(snd_tplg_t *tplg,
|
|||
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED);
|
||||
|
||||
int tplg_build_data(snd_tplg_t *tplg);
|
||||
int tplg_build_manifest_data(snd_tplg_t *tplg);
|
||||
int tplg_build_controls(snd_tplg_t *tplg);
|
||||
int tplg_build_widgets(snd_tplg_t *tplg);
|
||||
int tplg_build_routes(snd_tplg_t *tplg);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue