mux: remove DEMUX entry from LLEXT build

mux.toml doesn't have a demux entry in it, therefore we cannot have one in .module either, remove it until fixed. Also fix a copy-paste error in the same code block. Signed-off-by: Guennadi Liakhovetski <[email protected]>
thesofproject · Dec 3, 2024 · 5536dbf · 5536dbf
1 parent 277f25c
commit 5536dbf
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/audio/mux/mux.c b/src/audio/mux/mux.c
@@ -475,7 +475,7 @@ static const struct module_interface demux_interface = {
 DECLARE_MODULE_ADAPTER(demux_interface, demux_uuid, demux_tr);
 SOF_MODULE_INIT(demux, sys_comp_module_demux_interface_init);
 
-#if CONFIG_COMP_VOLUME_MODULE
+#if CONFIG_COMP_MUX_MODULE
 /* modular: llext dynamic link */
 
 #include <module/module/api_ver.h>
@@ -486,13 +486,21 @@ SOF_MODULE_INIT(demux, sys_comp_module_demux_interface_init);
 		0xE2, 0xA2, 0xF4, 0x2E, 0x30, 0x69
 SOF_LLEXT_MOD_ENTRY(mux, &mux_interface);
 
-#define UUID_DEMUX 0x68, 0x68, 0xB2, 0xC4, 0x30, 0x14, 0x0E, 0x47, 0x89, 0xA0, \
-		0x15, 0xD1, 0xC7, 0x7F, 0x85, 0x1A
-SOF_LLEXT_MOD_ENTRY(demux, &demux_interface);
+/*
+ * The demux entry is removed because mtl.toml doesn't have an entry
+ * for it. Once that is fixed, the manifest line below can be
+ * re-activated:
+ * #define UUID_DEMUX 0x68, 0x68, 0xB2, 0xC4, 0x30, 0x14, 0x0E, 0x47, 0x89, 0xA0, \
+ *		0x15, 0xD1, 0xC7, 0x7F, 0x85, 0x1A
+ * SOF_LLEXT_MOD_ENTRY(demux, &demux_interface);
+ */
 
 static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
 	SOF_LLEXT_MODULE_MANIFEST("MUX", mux_llext_entry, 1, UUID_MUX, 15),
-	SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, UUID_DEMUX, 15),
+	/*
+	 * See comment above for a demux deactivation reason
+	 * SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, UUID_DEMUX, 15),
+	 */
 };
 
 SOF_LLEXT_BUILDINFO;