alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
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 06/13] topology: Rename varaibles for add physical links by C API
Date: Sun,  6 Nov 2016 13:13:19 +0800	[thread overview]
Message-ID: <716aa62b2f50876e16e17a49c680869b473de78d.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. When adding a physical link element from C API:
- Rename "link" to "link_tpl" for physical link config template for
  C API users.
- Rename "lk" to "link" for physical link elements created by topology
  internally.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>

diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index d8dd96a..fe8af45 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -740,10 +740,11 @@ int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 	return 0;
 }
 
+/* Add a physical DAI link element from C API */
 int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 {
-	struct snd_tplg_link_template *link = t->link;
-	struct snd_soc_tplg_link_config *lk;
+	struct snd_tplg_link_template *link_tpl = t->link;
+	struct snd_soc_tplg_link_config *link, *_link;
 	struct tplg_elem *elem;
 	int i;
 
@@ -751,22 +752,25 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 		return -EINVAL;
 
 	/* here type can be either BE or CC. */
-	elem = tplg_elem_new_common(tplg, NULL, link->name, t->type);
+	elem = tplg_elem_new_common(tplg, NULL, link_tpl->name, t->type);
 	if (!elem)
 		return -ENOMEM;
 
 	if (t->type == SND_TPLG_TYPE_BE)
-		tplg_dbg("BE Link: %s", link->name);
+		tplg_dbg("BE Link: %s", link_tpl->name);
 	else
-		tplg_dbg("CC Link: %s", link->name);
+		tplg_dbg("CC Link: %s", link_tpl->name);
 
-	lk = elem->link;
-	lk->size = elem->size;
-	lk->id = link->id;
-	lk->num_streams = link->num_streams;
+	link = elem->link;
+	link->size = elem->size;
 
+	link->id = link_tpl->id;
+	/* stream configs */
+	if (link_tpl->num_streams > SND_SOC_TPLG_STREAM_CONFIG_MAX)
+		return -EINVAL;
+	link->num_streams = link_tpl->num_streams;
 	for (i = 0; i < link->num_streams; i++)
-		tplg_add_stream_object(&lk->stream[i], &link->stream[i]);
+		tplg_add_stream_object(&link->stream[i], &link_tpl->stream[i]);
 
 	return 0;
 }
-- 
2.7.4

  parent reply	other threads:[~2016-11-06  5:11 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 ` [PATCH 02/13] topology: Merge an element's be & cc pointer to one link pointer mengdong.lin
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 ` mengdong.lin [this message]
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=716aa62b2f50876e16e17a49c680869b473de78d.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).