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 08/22] topology: Define a function to build a single physical DAI link
Date: Thu, 27 Oct 2016 15:12:23 +0800 [thread overview]
Message-ID: <03075fbd4e3aed4033075e005f260dda3d348979.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>
Code refactoring. Rename the function to build all physical links from
tplg_build_link_config() to tplg_build_links(). And define a new function
build_link() to build a single physical DAI link element.
The function build_link() will be extended to handle more properties
of a physical DAI link (e.g. backend or codec-codec link).
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/src/topology/parser.c b/src/topology/parser.c
index 7b2c879..ded2eb7 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -271,11 +271,11 @@ static int tplg_build_integ(snd_tplg_t *tplg)
if (err < 0)
return err;
- err = tplg_build_link_cfg(tplg, SND_TPLG_TYPE_BE);
+ err = tplg_build_links(tplg, SND_TPLG_TYPE_BE);
if (err < 0)
return err;
- err = tplg_build_link_cfg(tplg, SND_TPLG_TYPE_CC);
+ err = tplg_build_links(tplg, SND_TPLG_TYPE_CC);
if (err < 0)
return err;
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 64c8fd9..08f2ca8 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -148,12 +148,31 @@ static int tplg_build_stream_cfg(snd_tplg_t *tplg,
return 0;
}
+static int build_link(snd_tplg_t *tplg, struct tplg_elem *elem)
+{
+ struct snd_soc_tplg_link_config *link = elem->link;
+ struct tplg_elem *ref_elem = NULL;
+ struct snd_soc_tplg_link_cmpnt *codec, *cmpnt;
+ struct tplg_ref *ref;
+ struct list_head *base, *pos;
+ int i, num_hw_configs = 0, err = 0;
+
+ err = tplg_build_stream_cfg(tplg, link->stream,
+ link->num_streams);
+ if (err < 0)
+ return err;
+
+ /* add link to manifest */
+ tplg->manifest.dai_link_elems++;
+
+ return 0;
+}
+
/* build BE/CC DAI link configurations */
-int tplg_build_link_cfg(snd_tplg_t *tplg, unsigned int type)
+int tplg_build_links(snd_tplg_t *tplg, unsigned int type)
{
struct list_head *base, *pos;
struct tplg_elem *elem;
- struct snd_soc_tplg_link_config *link;
int err = 0;
switch (type) {
@@ -175,9 +194,7 @@ int tplg_build_link_cfg(snd_tplg_t *tplg, unsigned int type)
return -EINVAL;
}
- link = elem->link;
- err = tplg_build_stream_cfg(tplg, link->stream,
- link->num_streams);
+ err = build_link(tplg, elem);
if (err < 0)
return err;
}
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 3aa51ee..548f42d 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -284,6 +284,6 @@ int tplg_add_bytes(snd_tplg_t *tplg, struct snd_tplg_bytes_template *bytes_ctl,
struct tplg_elem **e);
int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type);
-int tplg_build_link_cfg(snd_tplg_t *tplg, unsigned int type);
+int tplg_build_links(snd_tplg_t *tplg, unsigned int type);
int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);
int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);
--
2.5.0
next prev parent reply other threads:[~2016-10-27 7:11 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 ` mengdong.lin [this message]
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 ` [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=03075fbd4e3aed4033075e005f260dda3d348979.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).