Skip to content

Commit 5536dbf

Browse files
committed
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 <guennadi.liakhovetski@linux.intel.com>
1 parent 277f25c commit 5536dbf

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

src/audio/mux/mux.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static const struct module_interface demux_interface = {
475475
DECLARE_MODULE_ADAPTER(demux_interface, demux_uuid, demux_tr);
476476
SOF_MODULE_INIT(demux, sys_comp_module_demux_interface_init);
477477

478-
#if CONFIG_COMP_VOLUME_MODULE
478+
#if CONFIG_COMP_MUX_MODULE
479479
/* modular: llext dynamic link */
480480

481481
#include <module/module/api_ver.h>
@@ -486,13 +486,21 @@ SOF_MODULE_INIT(demux, sys_comp_module_demux_interface_init);
486486
0xE2, 0xA2, 0xF4, 0x2E, 0x30, 0x69
487487
SOF_LLEXT_MOD_ENTRY(mux, &mux_interface);
488488

489-
#define UUID_DEMUX 0x68, 0x68, 0xB2, 0xC4, 0x30, 0x14, 0x0E, 0x47, 0x89, 0xA0, \
490-
0x15, 0xD1, 0xC7, 0x7F, 0x85, 0x1A
491-
SOF_LLEXT_MOD_ENTRY(demux, &demux_interface);
489+
/*
490+
* The demux entry is removed because mtl.toml doesn't have an entry
491+
* for it. Once that is fixed, the manifest line below can be
492+
* re-activated:
493+
* #define UUID_DEMUX 0x68, 0x68, 0xB2, 0xC4, 0x30, 0x14, 0x0E, 0x47, 0x89, 0xA0, \
494+
* 0x15, 0xD1, 0xC7, 0x7F, 0x85, 0x1A
495+
* SOF_LLEXT_MOD_ENTRY(demux, &demux_interface);
496+
*/
492497

493498
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
494499
SOF_LLEXT_MODULE_MANIFEST("MUX", mux_llext_entry, 1, UUID_MUX, 15),
495-
SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, UUID_DEMUX, 15),
500+
/*
501+
* See comment above for a demux deactivation reason
502+
* SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, UUID_DEMUX, 15),
503+
*/
496504
};
497505

498506
SOF_LLEXT_BUILDINFO;

0 commit comments

Comments
 (0)