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 02/13] topology: Merge an element's be & cc pointer to one link pointer
Date: Sun, 6 Nov 2016 13:11:49 +0800 [thread overview]
Message-ID: <9b5fe3318b561348301acc9af4b7a7290dd041e2.1478407716.git.mengdong.lin@linux.intel.com> (raw)
In-Reply-To: <cover.1478407716.git.mengdong.lin@linux.intel.com>
From: Mengdong Lin <mengdong.lin@linux.intel.com>
Code refactoring. Previously an element has two pointers, 'be' and 'cc',
for BE (Back End) and CC (Codec-Codec) link respectively. But actually
the topology tool processes BE and CC links in the same way, so these
two pointers can be merged into one 'link' pointer, which can be used
configure any physical links.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index b7a2df7..64fd78f 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -175,11 +175,7 @@ int tplg_build_link_cfg(snd_tplg_t *tplg, unsigned int type)
return -EINVAL;
}
- if (type == SND_TPLG_TYPE_BE)
- link = elem->be;
- else
- link = elem->cc;
-
+ link = elem->link;
err = tplg_build_stream_cfg(tplg, link->stream,
link->num_streams);
if (err < 0)
@@ -528,7 +524,7 @@ int tplg_parse_be(snd_tplg_t *tplg,
if (!elem)
return -ENOMEM;
- link = elem->be;
+ link = elem->link;
link->size = elem->size;
tplg_dbg(" BE: %s\n", elem->id);
@@ -588,7 +584,7 @@ int tplg_parse_cc(snd_tplg_t *tplg,
if (!elem)
return -ENOMEM;
- link = elem->cc;
+ link = elem->link;
link->size = elem->size;
tplg_dbg(" CC: %s\n", elem->id);
@@ -742,14 +738,12 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
if (!elem)
return -ENOMEM;
- if (t->type == SND_TPLG_TYPE_BE) {
+ if (t->type == SND_TPLG_TYPE_BE)
tplg_dbg("BE Link: %s", link->name);
- lk = elem->be;
- } else {
+ else
tplg_dbg("CC Link: %s", link->name);
- lk = elem->cc;
- }
+ lk = elem->link;
lk->size = elem->size;
lk->id = link->id;
lk->num_streams = link->num_streams;
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 7b30b84..3aa51ee 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -144,8 +144,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_link_config *be;
- struct snd_soc_tplg_link_config *cc;
+ struct snd_soc_tplg_link_config *link;/* physical link */
struct snd_soc_tplg_dapm_graph_elem *route;
struct snd_soc_tplg_stream *stream_cfg;
struct snd_soc_tplg_stream_caps *stream_caps;
--
2.7.4
next prev parent reply other threads:[~2016-11-06 5:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-06 5:10 [PATCH 00/13] topology: Update physical link support for ABI v5 mengdong.lin
2016-11-06 5:11 ` [PATCH 01/13] topology: Use snd_config_get_bool to simplify boolean flag parsing mengdong.lin
2016-11-06 5:11 ` mengdong.lin [this message]
2016-11-06 5:12 ` [PATCH 03/13] topology: Define a function to build a single physical DAI link mengdong.lin
2016-11-06 5:12 ` [PATCH 04/13] topology: ABI - Define DAI physical PCM data formats mengdong.lin
2016-11-06 5:13 ` [PATCH 05/13] topology: ABI - Update physical DAI link configurations to ABI v5 mengdong.lin
2016-11-06 5:13 ` [PATCH 06/13] topology: Rename varaibles for add physical links by C API mengdong.lin
2016-11-06 5:13 ` [PATCH 07/13] topology: Define new type and section name to configure physical links mengdong.lin
2016-11-06 5:13 ` [PATCH 08/13] topology: Parse HW configurations of physical DAI links defined by C API mengdong.lin
2016-11-06 5:14 ` [PATCH 09/13] topology: Parse HW configurations of physical DAI links in text conf file mengdong.lin
2016-11-06 5:14 ` [PATCH 10/13] topology: Parse link flags of physical DAI links mengdong.lin
2016-11-06 5:14 ` [PATCH 11/13] topology: Parse and build private data of physical links mengdong.lin
2016-11-06 5:14 ` [PATCH 12/13] topology: Parse name and stream name of physical DAI links mengdong.lin
2016-11-06 5:14 ` [PATCH 13/13] topology: Remove BE or CC in comments of physical links C API template mengdong.lin
2016-11-14 16:23 ` [PATCH 00/13] topology: Update physical link support for ABI v5 Takashi Iwai
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=9b5fe3318b561348301acc9af4b7a7290dd041e2.1478407716.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).