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 10/13] topology: Parse link flags of physical DAI links
Date: Sun,  6 Nov 2016 13:14:15 +0800	[thread overview]
Message-ID: <21b71a222fe1c7afb073012dd43fc9169999b4c2.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>

Parse physical DAI link flags defined by text conf file or C API.
The flag mask and flags are added to C API template for physical DAI
links.

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

diff --git a/include/topology.h b/include/topology.h
index 85818ac..3692da4 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -639,6 +639,11 @@ extern "C" {
  *
  *	default_hw_conf_id "1"		#default HW config ID for init
  *
+ *	# Optional boolean flags
+ *	symmetric_rates			"true"
+ *	symmetric_channels		"false"
+ *	symmetric_sample_bits		"true"
+ *
  *	data "name"			# optional private data
  * }
  * </pre>
@@ -988,6 +993,9 @@ struct snd_tplg_link_template {
 	struct snd_tplg_hw_config_template *hw_config; /*!< supported HW configs */
 	int num_hw_configs;		/* number of hw configs */
 	int default_hw_config_id;       /* default hw config ID for init */
+
+	unsigned int flag_mask;         /* bitmask of flags to configure */
+	unsigned int flags;             /* SND_SOC_TPLG_LNK_FLGBIT_* flag value */
 };
 
 /** \struct snd_tplg_obj_template
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index e92d2b9..a751851 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -664,6 +664,35 @@ int tplg_parse_link(snd_tplg_t *tplg,
 			continue;
 		}
 
+		/* flags */
+		if (strcmp(id, "symmetric_rates") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES,
+				&link->flag_mask, &link->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_channels") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS,
+				&link->flag_mask, &link->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_sample_bits") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS,
+				&link->flag_mask, &link->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		/* private data */
 		if (strcmp(id, "data") == 0) {
 			err = tplg_parse_data_refs(n, elem);
 			if (err < 0)
@@ -1010,5 +1039,9 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 	link->default_hw_config_id = link_tpl->default_hw_config_id;
 	for (i = 0; i < link->num_hw_configs; i++)
 		set_link_hw_config(&link->hw_config[i], &link_tpl->hw_config[i]);
+
+	/* flags */
+	link->flag_mask = link_tpl->flag_mask;
+	link->flags = link_tpl->flags;
 	return 0;
 }
-- 
2.7.4

  parent reply	other threads:[~2016-11-06  5:12 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 ` [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 ` mengdong.lin [this message]
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=21b71a222fe1c7afb073012dd43fc9169999b4c2.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).