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 15/22] topology: Parse link flags of physical DAI links
Date: Thu, 27 Oct 2016 15:14:05 +0800 [thread overview]
Message-ID: <f8085a397a6089a99d71540c7eee3ac79ce84cef.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>
Parse physical DAI link flags in both text conf file or C API template.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/include/topology.h b/include/topology.h
index cf25de5..d7971b7 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -640,6 +640,13 @@ extern "C" {
*
* default_hw_conf_id "1" #default HW config ID for init
*
+ * # Optional flags, the default value is "false".
+ * symmetric_rates "true or false"
+ * symmetric_channels "true or false"
+ * symmetric_sample_bits "true or false"
+ * ignore_suspend "true or false"
+ * ignore_powerdown_time "true or false"
+ *
* data "name" # optional private data
* }
* </pre>
@@ -959,6 +966,10 @@ 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_soc_tplg_private *priv; /*!< private data */
};
/** \struct snd_tplg_obj_template
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 9e5bb8e..daeb32e 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -682,6 +682,53 @@ 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;
+ }
+
+ if (strcmp(id, "ignore_suspend") == 0) {
+ err = parse_flag(n,
+ SND_SOC_TPLG_LNK_FLGBIT_IGNORE_SUSPEND,
+ &link->flag_mask, &link->flags);
+ if (err < 0)
+ return err;
+ continue;
+ }
+
+ if (strcmp(id, "ignore_powerdown_time") == 0) {
+ err = parse_flag(n,
+ SND_SOC_TPLG_LNK_FLGBIT_IGNORE_POWERDOWN_TIME,
+ &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)
@@ -1028,5 +1075,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.5.0
next prev parent reply other threads:[~2016-10-27 7:12 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 ` mengdong.lin [this message]
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=f8085a397a6089a99d71540c7eee3ac79ce84cef.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).