On Mon, 14 Mar 2016 09:07:36 +0100, Liam Girdwood wrote:
Parsing external ops was missing from the conf files but was in the C API. Fix this now by making sure we also check for external ops.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com
Applied, thanks.
Takashi
src/topology/ctl.c | 8 ++++++++ src/topology/ops.c | 38 ++++++++++++++++++++++++++++++++++++++ src/topology/tplg_local.h | 2 ++ 3 files changed, 48 insertions(+)
diff --git a/src/topology/ctl.c b/src/topology/ctl.c index a8ac398..23c196a 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -393,6 +393,14 @@ int tplg_parse_control_bytes(snd_tplg_t *tplg, return err; continue; }
if (strcmp(id, "extops") == 0) {err = tplg_parse_compound(tplg, n, tplg_parse_ext_ops,be);if (err < 0)return err;continue;}}
return 0;
diff --git a/src/topology/ops.c b/src/topology/ops.c index 243d8c5..1b5c1e2 100644 --- a/src/topology/ops.c +++ b/src/topology/ops.c @@ -82,3 +82,41 @@ int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
return 0; }
+/* Parse External Control operations. Ops can come from standard names above or
- bespoke driver controls with numbers >= 256
- */
+int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
- snd_config_t *cfg, void *private)
+{
- snd_config_iterator_t i, next;
- snd_config_t *n;
- struct snd_soc_tplg_bytes_control *be = private;
- const char *id, *value;
- tplg_dbg("\tExt Ops\n");
- snd_config_for_each(i, next, cfg) {
n = snd_config_iterator_entry(i);/* get id */if (snd_config_get_id(n, &id) < 0)continue;/* get value - try strings then ints */if (snd_config_get_string(n, &value) < 0)continue;if (strcmp(id, "info") == 0)be->ext_ops.info = lookup_ops(value);else if (strcmp(id, "put") == 0)be->ext_ops.put = lookup_ops(value);else if (strcmp(id, "get") == 0)be->ext_ops.get = lookup_ops(value);tplg_dbg("\t\t%s = %s\n", id, value);- }
- return 0;
+} diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index e66d7f4..84050af 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -208,6 +208,8 @@ int tplg_parse_channel(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED, snd_config_t *cfg, void *private); +int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
- snd_config_t *cfg, void *private);
struct tplg_elem *lookup_pcm_dai_stream(struct list_head *base, const char* id); -- 2.5.0