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 17/22] topology: Parse name and stream name of physical DAI links
Date: Thu, 27 Oct 2016 15:14:24 +0800 [thread overview]
Message-ID: <a662a1628f4bf9a462c2665e86662f0c9ff27f0d.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 name and stream name to C API template of physical DAI links.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/include/topology.h b/include/topology.h
index d7971b7..f7ab7fe 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -632,6 +632,8 @@ extern "C" {
*
* id "0" # used for binding to the link
*
+ * stream_name "name" # used for binding to the link
+ *
* hw_configs [ # runtime supported HW configurations, optional
* "config1"
* "config2"
@@ -960,6 +962,8 @@ struct snd_tplg_hw_config_template {
struct snd_tplg_link_template {
const char *name; /*!< link name */
int id; /*!< unique ID - used to match with existing BE and CC links */
+ const char *stream_name; /*!< stream name of the link */
+
int num_streams; /*!< number of configs */
struct snd_tplg_stream_template *stream; /*!< supported configs */
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index c4857ba..67d647b 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -640,6 +640,7 @@ int tplg_parse_link(snd_tplg_t *tplg,
link = elem->link;
link->size = elem->size;
+ elem_copy_text(link->name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
tplg_dbg(" Link: %s\n", elem->id);
@@ -673,6 +674,16 @@ int tplg_parse_link(snd_tplg_t *tplg,
continue;
}
+ if (strcmp(id, "stream_name") == 0) {
+ if (snd_config_get_string(n, &val) < 0)
+ return -EINVAL;
+
+ elem_copy_text(link->stream_name, val,
+ SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+ tplg_dbg("\t%s: %s\n", id, val);
+ continue;
+ }
+
if (strcmp(id, "hw_configs") == 0) {
err = parse_hw_config_refs(tplg, n, elem);
if (err < 0)
@@ -1066,7 +1077,13 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
link = elem->link;
link->size = elem->size;
+ /* ID and names */
link->id = link_tpl->id;
+ elem_copy_text(link->name, link_tpl->name,
+ SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+ elem_copy_text(link->stream_name, link_tpl->stream_name,
+ SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+
/* stream configs */
if (link_tpl->num_streams > SND_SOC_TPLG_STREAM_CONFIG_MAX)
return -EINVAL;
--
2.5.0
next prev parent reply other threads:[~2016-10-27 7:13 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 ` mengdong.lin [this message]
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 ` [PATCH 20/22] topology: Parse physical DAIs in text conf file mengdong.lin
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=a662a1628f4bf9a462c2665e86662f0c9ff27f0d.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).