From: mengdong.lin@linux.intel.com
To: alsa-devel@alsa-project.org
Cc: Mengdong Lin <mengdong.lin@linux.intel.com>,
tiwai@suse.de, hardik.t.shah@intel.com,
guneshwor.o.singh@intel.com, liam.r.girdwood@linux.intel.com,
vinod.koul@intel.com, broonie@kernel.org, mengdong.lin@intel.com
Subject: [PATCH 20/22] topology: Parse physical DAIs in text conf file
Date: Thu, 27 Oct 2016 15:14:49 +0800 [thread overview]
Message-ID: <fbaa2a375126c658bc84c6ed496aeca6f8014b0a.1477549962.git.mengdong.lin@linux.intel.com> (raw)
In-Reply-To: <cover.1477549962.git.mengdong.lin@linux.intel.com>
From: Mengdong Lin <mengdong.lin@linux.intel.com>
Add support for parsing physical DAIs in the text configuration file.
The syntax of physical DAIs is described in document in topology.h
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/include/topology.h b/include/topology.h
index f7ab7fe..c0a4f07 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -666,6 +666,36 @@ extern "C" {
* }
* </pre>
*
+ * <h4>Physical DAI</h4>
+ * A physical DAI (e.g. backend DAI for DPCM) is defined as a new section
+ * that can include a unique ID, playback and capture stream capabilities,
+ * optional flags, and private data. <br>
+ * Its PCM stream capablities are same as those for PCM objects,
+ * please refer to section 'PCM Capabilities'.
+ *
+ * <pre>
+ * SectionDAI."name" {
+ *
+ * index "1" # Index number
+ *
+ * id "0" # used for binding to the Backend DAI
+ *
+ * pcm."playback" {
+ * capabilities "capabilities1" # capabilities for playback
+ * }
+ *
+ * pcm."capture" {
+ * capabilities "capabilities2" # capabilities for capture
+ * }
+ *
+ * symmetric_rates "true" # optional flags
+ * symmetric_channels "true"
+ * symmetric_sample_bits "false"
+ *
+ * data "name" # optional private data
+ * }
+ * </pre>
+ *
* <h4>Manifest Private Data</h4>
* Manfiest may have private data. Users need to define a manifest section
* and add the references to 1 or multiple data sections. Please refer to
@@ -708,6 +738,7 @@ enum snd_tplg_type {
SND_TPLG_TYPE_TUPLE, /*!< Vendor tuples */
SND_TPLG_TYPE_LINK, /*!< Physical DAI link */
SND_TPLG_TYPE_HW_CONFIG, /*!< Link HW config */
+ SND_TPLG_TYPE_DAI, /*!< Physical DAI */
};
/**
diff --git a/src/topology/data.c b/src/topology/data.c
index 59bc970..0d5c430 100644
--- a/src/topology/data.c
+++ b/src/topology/data.c
@@ -46,6 +46,10 @@ struct snd_soc_tplg_private *get_priv_data(struct tplg_elem *elem)
priv = &elem->widget->priv;
break;
+ case SND_TPLG_TYPE_DAI:
+ priv = &elem->dai->priv;
+ break;
+
default:
SNDERR("error: '%s': no support for private data for type %d\n",
elem->id, elem->type);
diff --git a/src/topology/elem.c b/src/topology/elem.c
index 01dce1f..1a5ac84 100644
--- a/src/topology/elem.c
+++ b/src/topology/elem.c
@@ -192,6 +192,10 @@ struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg,
list_add_tail(&elem->list, &tplg->pcm_list);
obj_size = sizeof(struct snd_soc_tplg_pcm);
break;
+ case SND_TPLG_TYPE_DAI:
+ list_add_tail(&elem->list, &tplg->dai_list);
+ obj_size = sizeof(struct snd_soc_tplg_dai);
+ break;
case SND_TPLG_TYPE_BE:
case SND_TPLG_TYPE_LINK:
list_add_tail(&elem->list, &tplg->be_list);
diff --git a/src/topology/parser.c b/src/topology/parser.c
index 7d0486c..72efef4 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -133,6 +133,14 @@ static int tplg_parse_config(snd_tplg_t *tplg, snd_config_t *cfg)
continue;
}
+ if (strcmp(id, "SectionDAI") == 0) {
+ err = tplg_parse_compound(tplg, n,
+ tplg_parse_dai, NULL);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
if (strcmp(id, "SectionHWConfig") == 0) {
err = tplg_parse_compound(tplg, n, tplg_parse_hw_config,
NULL);
@@ -450,6 +458,7 @@ snd_tplg_t *snd_tplg_new(void)
INIT_LIST_HEAD(&tplg->tlv_list);
INIT_LIST_HEAD(&tplg->widget_list);
INIT_LIST_HEAD(&tplg->pcm_list);
+ INIT_LIST_HEAD(&tplg->dai_list);
INIT_LIST_HEAD(&tplg->be_list);
INIT_LIST_HEAD(&tplg->cc_list);
INIT_LIST_HEAD(&tplg->route_list);
@@ -476,6 +485,7 @@ void snd_tplg_free(snd_tplg_t *tplg)
tplg_elem_free_list(&tplg->tlv_list);
tplg_elem_free_list(&tplg->widget_list);
tplg_elem_free_list(&tplg->pcm_list);
+ tplg_elem_free_list(&tplg->dai_list);
tplg_elem_free_list(&tplg->be_list);
tplg_elem_free_list(&tplg->cc_list);
tplg_elem_free_list(&tplg->route_list);
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 67d647b..b255978 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -341,6 +341,7 @@ static int tplg_parse_streams(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
snd_config_t *n;
struct tplg_elem *elem = private;
struct snd_soc_tplg_pcm *pcm;
+ struct snd_soc_tplg_dai *dai;
unsigned int *playback, *capture;
struct snd_soc_tplg_stream_caps *caps;
const char *id, *value;
@@ -357,6 +358,14 @@ static int tplg_parse_streams(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
capture = &pcm->capture;
caps = pcm->caps;
break;
+
+ case SND_TPLG_TYPE_DAI:
+ dai = elem->dai;
+ playback = &dai->playback;
+ capture = &dai->capture;
+ caps = dai->caps;
+ break;
+
default:
return -EINVAL;
}
@@ -575,6 +584,109 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
return 0;
}
+/* Parse physical DAI */
+int tplg_parse_dai(snd_tplg_t *tplg,
+ snd_config_t *cfg, void *private ATTRIBUTE_UNUSED)
+{
+ struct snd_soc_tplg_dai *dai;
+ struct tplg_elem *elem;
+ snd_config_iterator_t i, next;
+ snd_config_t *n;
+ const char *id, *val = NULL;
+ int err;
+
+ elem = tplg_elem_new_common(tplg, cfg, NULL, SND_TPLG_TYPE_DAI);
+ if (!elem)
+ return -ENOMEM;
+
+ dai = elem->dai;
+ dai->size = elem->size;
+ elem_copy_text(dai->dai_name, elem->id,
+ SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+
+ tplg_dbg(" DAI: %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, "index") == 0) {
+ if (snd_config_get_string(n, &val) < 0)
+ return -EINVAL;
+
+ elem->index = atoi(val);
+ tplg_dbg("\t%s: %d\n", id, elem->index);
+ continue;
+ }
+
+ if (strcmp(id, "id") == 0) {
+ if (snd_config_get_string(n, &val) < 0)
+ return -EINVAL;
+
+ dai->dai_id = atoi(val);
+ tplg_dbg("\t%s: %d\n", id, dai->dai_id);
+ continue;
+ }
+
+ /* stream capabilities */
+ if (strcmp(id, "pcm") == 0) {
+ err = tplg_parse_compound(tplg, n,
+ tplg_parse_streams, elem);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
+ /* flags */
+ if (strcmp(id, "symmetric_rates") == 0) {
+ err = parse_flag(n,
+ SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES,
+ &dai->flag_mask, &dai->flags);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
+ if (strcmp(id, "symmetric_channels") == 0) {
+ err = parse_flag(n,
+ SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS,
+ &dai->flag_mask, &dai->flags);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
+ if (strcmp(id, "symmetric_sample_bits") == 0) {
+ err = parse_flag(n,
+ SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS,
+ &dai->flag_mask, &dai->flags);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
+ /* private data */
+ if (strcmp(id, "data") == 0) {
+ if (snd_config_get_string(n, &val) < 0)
+ return -EINVAL;
+
+ tplg_ref_add(elem, SND_TPLG_TYPE_DATA, val);
+ tplg_dbg("\t%s: %s\n", id, val);
+ continue;
+ }
+ }
+
+ return 0;
+}
+
/* parse physical link runtime supported HW configs in text conf file */
static int parse_hw_config_refs(snd_tplg_t *tplg, snd_config_t *cfg,
struct tplg_elem *elem)
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 9e67bf8..eeeb0f1 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -64,6 +64,7 @@ struct snd_tplg {
struct list_head tlv_list;
struct list_head widget_list;
struct list_head pcm_list;
+ struct list_head dai_list;
struct list_head be_list;
struct list_head cc_list;
struct list_head route_list;
@@ -145,6 +146,7 @@ struct tplg_elem {
struct snd_soc_tplg_bytes_control *bytes_ext;
struct snd_soc_tplg_dapm_widget *widget;
struct snd_soc_tplg_pcm *pcm;
+ struct snd_soc_tplg_dai *dai;
struct snd_soc_tplg_link_config *link;/* physical link */
struct snd_soc_tplg_dapm_graph_elem *route;
struct snd_soc_tplg_stream *stream_cfg;
@@ -222,6 +224,9 @@ int tplg_parse_stream_caps(snd_tplg_t *tplg,
int tplg_parse_pcm(snd_tplg_t *tplg,
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED);
+int tplg_parse_dai(snd_tplg_t *tplg, snd_config_t *cfg,
+ void *private ATTRIBUTE_UNUSED);
+
int tplg_parse_link(snd_tplg_t *tplg,
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED);
--
2.5.0
next prev parent reply other threads:[~2016-10-27 7:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 7:09 [PATCH 00/22] topology: Remaining user space patches of ABI v5 mengdong.lin
2016-10-27 7:11 ` [PATCH 01/22] topology: ABI - Update stream caps and PCM objects to " mengdong.lin
2016-10-27 7:11 ` [PATCH 02/22] topology: Parse sig_bits of stream caps mengdong.lin
2016-10-27 7:11 ` [PATCH 03/22] topology: Parse flags for PCM mengdong.lin
2016-10-27 7:11 ` [PATCH 04/22] topology: Define a function to build a single PCM element mengdong.lin
2016-10-27 7:11 ` [PATCH 05/22] topology: Parse and build private data for PCM mengdong.lin
2016-10-27 7:12 ` [PATCH 06/22] topology: tplg_elem_lookup() checks parameter before searching mengdong.lin
2016-10-27 7:12 ` [PATCH 07/22] topology: Merge an element's be & cc pointer to one link pointer mengdong.lin
2016-10-27 7:12 ` [PATCH 08/22] topology: Define a function to build a single physical DAI link mengdong.lin
2016-10-27 7:13 ` [PATCH 09/22] topology: ABI - Define DAI physical PCM data formats mengdong.lin
2016-10-27 7:13 ` [PATCH 10/22] topology: ABI - Update physical DAI link configurations to ABI v5 mengdong.lin
2016-10-27 7:13 ` [PATCH 11/22] topology: Rename varaibles for add physical links by C API mengdong.lin
2016-10-27 7:13 ` [PATCH 12/22] topology: Define new type and section name to configure physical links mengdong.lin
2016-10-27 7:13 ` [PATCH 13/22] topology: Parse HW configurations of physical DAI links defined by C API mengdong.lin
2016-10-27 7:13 ` [PATCH 14/22] topology: Parse HW configurations of physical DAI links in text conf file mengdong.lin
2016-10-27 7:14 ` [PATCH 15/22] topology: Parse link flags of physical DAI links mengdong.lin
2016-10-27 7:14 ` [PATCH 16/22] topology: Parse and build private data of physical links mengdong.lin
2016-10-27 7:14 ` [PATCH 17/22] topology: Parse name and stream name of physical DAI links mengdong.lin
2016-10-27 7:14 ` [PATCH 18/22] topology: ABI - Update manifest to ABI v5 mengdong.lin
2016-10-27 7:14 ` [PATCH 19/22] topology: ABI - Define new types for physical DAI mengdong.lin
2016-10-27 7:14 ` mengdong.lin [this message]
2016-10-27 7:15 ` [PATCH 21/22] topology: Support configuring physical DAIs by C API mengdong.lin
2016-10-27 7:15 ` [PATCH 22/22] topology: Export physical DAIs to the binary for kernel mengdong.lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fbaa2a375126c658bc84c6ed496aeca6f8014b0a.1477549962.git.mengdong.lin@linux.intel.com \
--to=mengdong.lin@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=guneshwor.o.singh@intel.com \
--cc=hardik.t.shah@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=mengdong.lin@intel.com \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).