[22/22] topology: Export physical DAIs to the binary for kernel

Commit Message

[e-mail] Oct. 27, 2016, 7:15 a.m. UTC

From: Guneshwor Singh <[e-mail]>

Export the physical DAI objects to the binary output file for kernel.
For physical DAIs defined by the text conf file, find and merge their
stream capablities and private data before exporting.

Signed-off-by: Guneshwor Singh <[e-mail]>
Signed-off-by: Mengdong Lin <[e-mail]>

Patch

diff --git a/src/topology/builder.c b/src/topology/builder.c
index b0ba54e..20fa925 100644
--- a/src/topology/builder.c
+++ b/src/topology/builder.c
@@ -204,6 +204,9 @@  static int write_block(snd_tplg_t *tplg, struct list_head *base,
 	case SND_TPLG_TYPE_DATA:
 		return write_elem_block(tplg, base, size,
 			SND_SOC_TPLG_TYPE_PDATA, "data");
+	case SND_TPLG_TYPE_DAI:
+		return write_elem_block(tplg, base, size,
+			SND_SOC_TPLG_TYPE_DAI, "dai");
 	default:
 		return -EINVAL;
 	}
@@ -293,6 +296,14 @@  int tplg_write_data(snd_tplg_t *tplg)
 		return ret;
 	}
 
+	/* write physical dai elems */
+	ret = write_block(tplg, &tplg->dai_list,
+		SND_TPLG_TYPE_DAI);
+	if (ret < 0) {
+		SNDERR("failed to write physical dai elems %d\n", ret);
+		return ret;
+	}
+
 	/* write be elems */
 	ret = write_block(tplg, &tplg->be_list,
 		SND_TPLG_TYPE_BE);
diff --git a/src/topology/parser.c b/src/topology/parser.c
index 4afa576..c5f9757 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -288,6 +288,10 @@  static int tplg_build_integ(snd_tplg_t *tplg)
 	if (err <  0)
 		return err;
 
+	err = tplg_build_dais(tplg, SND_TPLG_TYPE_DAI);
+	if (err <  0)
+		return err;
+
 	err = tplg_build_links(tplg, SND_TPLG_TYPE_BE);
 	if (err <  0)
 		return err;
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index e1d266a..c41831c 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -129,6 +129,61 @@  int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type)
 	return 0;
 }
 
+/* build a physical DAI */
+static int tplg_build_dai(snd_tplg_t *tplg, struct tplg_elem *elem)
+{
+	struct tplg_ref *ref;
+	struct list_head *base, *pos;
+	int err = 0;
+
+	/* get playback & capture stream caps */
+	err = tplg_build_stream_caps(tplg, elem->id, elem->dai->caps);
+	if (err < 0)
+		return err;
+
+	/* get private data */
+	base = &elem->ref_list;
+	list_for_each(pos, base) {
+
+		ref = list_entry(pos, struct tplg_ref, list);
+
+		if (ref->type == SND_TPLG_TYPE_DATA) {
+			err = tplg_copy_data(tplg, elem, ref);
+			if (err < 0)
+				return err;
+		}
+	}
+
+	/* add DAI to manifest */
+	tplg->manifest.dai_elems++;
+
+	return 0;
+}
+
+/* build physical DAIs*/
+int tplg_build_dais(snd_tplg_t *tplg, unsigned int type)
+{
+	struct list_head *base, *pos;
+	struct tplg_elem *elem;
+	int err = 0;
+
+	base = &tplg->dai_list;
+	list_for_each(pos, base) {
+
+		elem = list_entry(pos, struct tplg_elem, list);
+		if (elem->type != type) {
+			SNDERR("error: invalid elem '%s'\n", elem->id);
+			return -EINVAL;
+		}
+
+		err = tplg_build_dai(tplg, elem);
+		if (err < 0)
+			return err;
+	}
+
+	return 0;
+}
+
 static int tplg_build_stream_cfg(snd_tplg_t *tplg,
 	struct snd_soc_tplg_stream *stream, int num_streams)
 {
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 807462b..f913563 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -294,6 +294,7 @@  int tplg_add_bytes(snd_tplg_t *tplg, struct snd_tplg_bytes_template *bytes_ctl,
 		   struct tplg_elem **e);
 
 int tplg_build_pcms(snd_tplg_t *tplg, unsigned int type);
+int tplg_build_dais(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);