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 3/5] topology: Support configuring BE DAIs by C API
Date: Mon, 3 Oct 2016 23:04:12 +0800 [thread overview]
Message-ID: <0a8e5220a635356540448ed23f6f8b1f9a979ede.1475505267.git.mengdong.lin@linux.intel.com> (raw)
In-Reply-To: <cover.1475505267.git.mengdong.lin@linux.intel.com>
From: Guneshwor Singh <guneshwor.o.singh@intel.com>
In addition to text conf file, BE (Back End) DAI configurations can
also be added by C API. This patch defines the template to add BE DAI
configurations from C API.
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/include/topology.h b/include/topology.h
index da45848..f98894f 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -894,6 +894,21 @@ struct snd_tplg_pcm_template {
struct snd_tplg_stream_template stream[0]; /*!< supported configs */
};
+/** \struct snd_tplg_be_dai_template
+ * \brief Template type for Back End DAI.
+ */
+struct snd_tplg_be_dai_template {
+ const char *dai_name; /*!< DAI name */
+ unsigned int dai_id; /*!< unique ID - used to match */
+ unsigned int playback; /*!< supports playback mode */
+ unsigned int capture; /*!< supports capture mode */
+ struct snd_tplg_stream_caps_template *caps[2]; /*!< playback & capture for DAI */
+ unsigned int flag_mask; /*!< bitmask of flags to configure */
+ unsigned int flags; /*!< SND_SOC_TPLG_DAI_FLGBIT_* */
+ struct snd_soc_tplg_private *priv; /*!< private data */
+
+};
+
/** \struct snd_tplg_link_template
* \brief Template type for BE and CC DAI Links.
*/
@@ -919,6 +934,7 @@ typedef struct snd_tplg_obj_template {
struct snd_tplg_enum_template *enum_ctl; /*!< Enum control */
struct snd_tplg_graph_template *graph; /*!< Graph elements */
struct snd_tplg_pcm_template *pcm; /*!< PCM elements */
+ struct snd_tplg_be_dai_template *be_dai; /*!< BE DAI elements */
struct snd_tplg_link_template *link; /*!< BE and CC Links */
};
} snd_tplg_obj_template_t;
diff --git a/src/topology/parser.c b/src/topology/parser.c
index aa1b33e..02c19dd 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -355,6 +355,8 @@ int snd_tplg_add_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
return tplg_add_graph_object(tplg, t);
case SND_TPLG_TYPE_PCM:
return tplg_add_pcm_object(tplg, t);
+ case SND_TPLG_TYPE_BE_DAI:
+ return tplg_add_be_dai_object(tplg, t);
case SND_TPLG_TYPE_BE:
case SND_TPLG_TYPE_CC:
return tplg_add_link_object(tplg, t);
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 7e2f68f..42efe4a 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -774,3 +774,58 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
return 0;
}
+
+int tplg_add_be_dai_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
+{
+ struct snd_tplg_be_dai_template *be_tpl = t->be_dai;
+ struct snd_soc_tplg_be_dai *be, *_be;
+ struct tplg_elem *elem;
+ int i;
+
+ tplg_dbg("BE DAI %s\n", be_tpl->dai_name);
+
+ elem = tplg_elem_new_common(tplg, NULL, be_tpl->dai_name,
+ SND_TPLG_TYPE_BE_DAI);
+ if (!elem)
+ return -ENOMEM;
+
+ be = elem->be_dai;
+ be->size = elem->size;
+
+ elem_copy_text(be->dai_name, be_tpl->dai_name,
+ SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+ be->dai_id = be_tpl->dai_id;
+
+ /* stream caps */
+ be->playback = be_tpl->playback;
+ be->capture = be_tpl->capture;
+
+ for (i = 0; i < 2; i++) {
+ if (be_tpl->caps[i])
+ tplg_add_stream_caps(&be->caps[i], be_tpl->caps[i]);
+ }
+
+ /* flags */
+ be->flag_mask = be_tpl->flag_mask;
+ be->flags = be_tpl->flags;
+
+ /* private data */
+ if (be_tpl->priv != NULL) {
+ _be = realloc(be,
+ elem->size + be_tpl->priv->size);
+ if (!_be) {
+ tplg_elem_free(elem);
+ return -ENOMEM;
+ }
+
+ be = _be;
+ be->priv.size = be_tpl->priv->size;
+
+ elem->be_dai = be;
+ elem->size += be->priv.size;
+ memcpy(be->priv.data, be_tpl->priv->data,
+ be->priv.size);
+ }
+
+ return 0;
+}
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index e548ade..dab0162 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -293,3 +293,4 @@ int tplg_build_pcm(snd_tplg_t *tplg, unsigned int type);
int tplg_build_link_cfg(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);
+int tplg_add_be_dai_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);
--
2.5.0
next prev parent reply other threads:[~2016-10-03 15:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-03 15:02 [PATCH 0/5] topology: Upgrade ABI to match kernel v4.8 mengdong.lin
2016-10-03 15:03 ` [PATCH 1/5] topology: ABI - Add the types for BE DAI mengdong.lin
2016-10-06 14:37 ` Mark Brown
2016-10-08 8:00 ` Mengdong Lin
2016-10-11 6:45 ` Mengdong Lin
2016-10-03 15:04 ` [PATCH 2/5] topology: Parse BE DAIs in text conf file mengdong.lin
2016-10-03 15:04 ` mengdong.lin [this message]
2016-10-03 15:04 ` [PATCH 4/5] topology: Export BE DAIs to the binary for kernel mengdong.lin
2016-10-03 15:04 ` [PATCH 5/5] topology: ABI - Add sig_bits to stream caps 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=0a8e5220a635356540448ed23f6f8b1f9a979ede.1475505267.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).