From patchwork Thu Oct 27 07:15:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengdong.lin@linux.intel.com X-Patchwork-Id: 9399519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 703D36059C for ; Thu, 27 Oct 2016 14:29:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56A1E2A2FB for ; Thu, 27 Oct 2016 14:29:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B5032A2FF; Thu, 27 Oct 2016 14:29:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3663B2A311 for ; Thu, 27 Oct 2016 14:29:10 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2BD3D267416; Thu, 27 Oct 2016 16:29:09 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id BCC492673F0; Thu, 27 Oct 2016 16:26:41 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D9E49267327; Thu, 27 Oct 2016 09:14:04 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by alsa0.perex.cz (Postfix) with ESMTP id 083202672C7 for ; Thu, 27 Oct 2016 09:13:58 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP; 27 Oct 2016 00:13:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,404,1473145200"; d="scan'208";a="24611860" Received: from amanda-haswell-pc.sh.intel.com ([10.239.159.21]) by orsmga004.jf.intel.com with ESMTP; 27 Oct 2016 00:13:53 -0700 From: mengdong.lin@linux.intel.com To: alsa-devel@alsa-project.org Date: Thu, 27 Oct 2016 15:15:11 +0800 Message-Id: <3d1bf6bfae560f90dac949ea5e64aeffbbf8df92.1477549962.git.mengdong.lin@linux.intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: Cc: Mengdong Lin , 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: [alsa-devel] [PATCH 21/22] topology: Support configuring physical DAIs by C API X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guneshwor Singh 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 Signed-off-by: Mengdong Lin diff --git a/include/topology.h b/include/topology.h index c0a4f07..7b0f3ad 100644 --- a/include/topology.h +++ b/include/topology.h @@ -987,6 +987,21 @@ struct snd_tplg_hw_config_template { unsigned int *rx_chanmap; /* array of slot number */ }; +/** \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. */ @@ -1023,6 +1038,7 @@ typedef struct snd_tplg_obj_template { struct snd_tplg_graph_template *graph; /*!< Graph elements */ struct snd_tplg_pcm_template *pcm; /*!< PCM elements */ struct snd_tplg_link_template *link; /*!< BE and CC Links */ + struct snd_tplg_be_dai_template *dai; /*!< Physical DAI */ }; } snd_tplg_obj_template_t; diff --git a/src/topology/parser.c b/src/topology/parser.c index 72efef4..4afa576 100644 --- a/src/topology/parser.c +++ b/src/topology/parser.c @@ -364,6 +364,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_DAI: + return tplg_add_dai_object(tplg, t); case SND_TPLG_TYPE_LINK: case SND_TPLG_TYPE_BE: case SND_TPLG_TYPE_CC: diff --git a/src/topology/pcm.c b/src/topology/pcm.c index b255978..e1d266a 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -1235,3 +1235,58 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) return 0; } + +int tplg_add_dai_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) +{ + struct snd_tplg_be_dai_template *dai_tpl = t->dai; + struct snd_soc_tplg_dai *dai, *_dai; + struct tplg_elem *elem; + int i; + + tplg_dbg("DAI %s\n", dai_tpl->dai_name); + + elem = tplg_elem_new_common(tplg, NULL, dai_tpl->dai_name, + SND_TPLG_TYPE_DAI); + if (!elem) + return -ENOMEM; + + dai = elem->dai; + dai->size = elem->size; + + elem_copy_text(dai->dai_name, dai_tpl->dai_name, + SNDRV_CTL_ELEM_ID_NAME_MAXLEN); + dai->dai_id = dai_tpl->dai_id; + + /* stream caps */ + dai->playback = dai_tpl->playback; + dai->capture = dai_tpl->capture; + + for (i = 0; i < 2; i++) { + if (dai_tpl->caps[i]) + tplg_add_stream_caps(&dai->caps[i], dai_tpl->caps[i]); + } + + /* flags */ + dai->flag_mask = dai_tpl->flag_mask; + dai->flags = dai_tpl->flags; + + /* private data */ + if (dai_tpl->priv != NULL) { + _dai = realloc(dai, + elem->size + dai_tpl->priv->size); + if (!_dai) { + tplg_elem_free(elem); + return -ENOMEM; + } + + dai = _dai; + dai->priv.size = dai_tpl->priv->size; + + elem->dai = dai; + elem->size += dai->priv.size; + memcpy(dai->priv.data, dai_tpl->priv->data, + dai->priv.size); + } + + return 0; +} diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h index eeeb0f1..807462b 100644 --- a/src/topology/tplg_local.h +++ b/src/topology/tplg_local.h @@ -297,3 +297,4 @@ int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type); int tplg_build_links(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_dai_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t);