File 0070-topology-Add-API-to-set-a-vendor-specific-... of Package alsa

Overview Repositories Revisions Requests Users Attributes Meta

File 0070-topology-Add-API-to-set-a-vendor-specific-version-nu.patch of Package alsa (Revision 4755e52f41c1d9a8b16ecd9dce7308ee)

Currently displaying revision 4755e52f41c1d9a8b16ecd9dce7308ee , Show latest

From 8b0a5310bf3cb6ca1f7d70e3f4149b25b17b453a Mon Sep 17 00:00:00 2001
From: Mengdong Lin <mengdong.lin@intel.com>
Date: Wed, 16 Sep 2015 17:07:13 +0800
Subject: [PATCH] topology: Add API to set a vendor specific version number

This vendor-specific version number is optional. It will be written to
the 'version' field of each block header of the binary toplogy data file.
The vendor driver can check this number for further processing in kernel.

The topology ABI version number is still stored in the 'abi' field of
block headers.

Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 include/topology.h     | 8 ++++++++
 src/topology/builder.c | 6 +++---
 src/topology/parser.c  | 7 +++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/include/topology.h b/include/topology.h
index 6ff8c5fb4609..9b84bd9331dc 100644
--- a/include/topology.h
+++ b/include/topology.h
@@ -690,6 +690,14 @@ int snd_tplg_build(snd_tplg_t *tplg, const char *outfile);
  */
 int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len);
 
+/**
+ * \brief Set an optional vendor specific version number.
+ * \param tplg Topology instance.
+ * \param version Vendor specific version number.
+ * \return Zero on success, otherwise a negative error code
+ */
+int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version);
+
 /* \} */
 
 #ifdef __cplusplus
diff --git a/src/topology/builder.c b/src/topology/builder.c
index 91412aadd098..8d57a8b719f7 100644
--- a/src/topology/builder.c
+++ b/src/topology/builder.c
@@ -89,7 +89,7 @@ static int write_data_block(snd_tplg_t *tplg, int size, int tplg_type,
 
 	/* write the header for this block */
 	ret = write_block_header(tplg, tplg_type, 0,
-		SND_SOC_TPLG_ABI_VERSION, 0, size, 1);
+		tplg->version, 0, size, 1);
 	if (ret < 0) {
 		SNDERR("error: failed to write %s block %d\n", obj_name, ret);
 		return ret;
@@ -124,7 +124,7 @@ static int write_elem_block(snd_tplg_t *tplg,
 	vendor_type = elem->vendor_type;
 
 	ret = write_block_header(tplg, tplg_type, vendor_type,
-		SND_SOC_TPLG_ABI_VERSION, 0, size, count);
+		tplg->version, 0, size, count);
 	if (ret < 0) {
 		SNDERR("error: failed to write %s block %d\n",
 			obj_name, ret);
@@ -242,7 +242,7 @@ static int write_manifest_data(snd_tplg_t *tplg)
 
 	/* write the header for this block */
 	ret = write_block_header(tplg, SND_SOC_TPLG_TYPE_MANIFEST, 0,
-		SND_SOC_TPLG_ABI_VERSION, 0,
+		tplg->version, 0,
 		sizeof(tplg->manifest) + tplg->manifest.priv.size, 1);
 	if (ret < 0) {
 		SNDERR("error: failed to write manifest block %d\n", ret);
diff --git a/src/topology/parser.c b/src/topology/parser.c
index 44c6146b22f2..6671055ae226 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -361,6 +361,13 @@ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len)
 	return 0;
 }
 
+int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version)
+{
+	tplg->version = version;
+
+	return 0;
+}
+
 void snd_tplg_verbose(snd_tplg_t *tplg, int verbose)
 {
 	tplg->verbose = verbose;
-- 
2.5.3

Places

File 0070-topology-Add-API-to-set-a-vendor-specific-version-nu.patch of Package alsa (Revision 4755e52f41c1d9a8b16ecd9dce7308ee)

Places