Skip to content

Commit 4291463

Browse files
softwareckisoftwarecki
committed
rimage: manifest: llext: Get uuid from registry & change uuid type
Change the UUID storage type in the module manifest to a sof-compatible structure to enable retrieval of the UUIDs from the registry. Obtain the UUIDs of loadable llext modules from the uuid-registry. Signed-off-by: Adrian Warecki <[email protected]>
1 parent 8a66cfa commit 4291463

File tree

27 files changed

+43
-105
lines changed

27 files changed

+43
-105
lines changed

‎lmdk/libraries/dummy/dummy_mtl.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ count = 1
6060

6161
[[module.entry]]
6262
name = "DUMMY"
63-
uuid = "01010101-0101-0101-0101-010101010101"
63+
uuid = "01234567-89AB-CDEF-0102-030405060708"
6464
affinity_mask = "0x1"
6565
instance_count = "15"
6666
domain_types = "0"

‎lmdk/modules/dummy/dummy.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ __attribute__((section(".module")))
1818
const struct sof_man_module_manifest dummy_module_manifest = {
1919
.module = {
2020
.name = "DUMMY",
21-
.uuid = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
21+
.uuid = { 0x01234567, 0x89AB, 0xCDEF, { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
22+
0x08 }},
2223
.entry_point = (uint32_t)dummyPackageEntryPoint,
2324
.type = {
2425
.load_type = SOF_MAN_MOD_TYPE_MODULE,

‎src/audio/aria/aria.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,10 @@ SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
319319
#include <module/module/llext.h>
320320
#include <rimage/sof/user/manifest.h>
321321

322-
#define UUID_ARIA 0x6D, 0x16, 0xF7, 0x99, 0x2C, 0x37, 0xEF, 0x43, 0xF6, 0x81, \
323-
0x22, 0x00, 0x7A, 0xA1, 0x5F, 0x03
324-
325322
SOF_LLEXT_MOD_ENTRY(aria, &aria_interface);
326323

327324
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
328-
SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, UUID_ARIA, 8);
325+
SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, SOF_REG_UUID(aria), 8);
329326

330327
SOF_LLEXT_BUILDINFO;
331328

‎src/audio/asrc/asrc.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,10 @@ SOF_MODULE_INIT(asrc, sys_comp_module_asrc_interface_init);
879879
#include <module/module/llext.h>
880880
#include <rimage/sof/user/manifest.h>
881881

882-
#define UUID_ASRC 0x2d, 0x40, 0xb4, 0x66, 0x68, 0xb4, 0xf2, 0x42, \
883-
0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4
884882
SOF_LLEXT_MOD_ENTRY(asrc, &asrc_interface);
885883

886884
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
887-
SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, UUID_ASRC, 2),
885+
SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, SOF_REG_UUID(asrc4), 2),
888886
};
889887

890888
SOF_LLEXT_BUILDINFO;

‎src/audio/codec/dts/dts.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,10 @@ SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
478478
#include <module/module/llext.h>
479479
#include <rimage/sof/user/manifest.h>
480480

481-
#define UUID_DTS 0x4F, 0xC3, 0x5F, 0xD9, 0x0F, 0x37, 0xC7, 0x4A, 0x86, 0xBC, \
482-
0xBF, 0xDC, 0x5B, 0xE2, 0x41, 0xE6
483-
484481
SOF_LLEXT_MOD_ENTRY(dts, &dts_interface);
485482

486483
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
487-
SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, UUID_DTS, 40);
484+
SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, SOF_REG_UUID(dts), 40);
488485

489486
SOF_LLEXT_BUILDINFO;
490487

‎src/audio/crossover/crossover.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -639,13 +639,10 @@ SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
639639
#include <module/module/llext.h>
640640
#include <rimage/sof/user/manifest.h>
641641

642-
#define UUID_CROSSOVER 0xD1, 0x9A, 0x8C, 0x94, 0x6A, 0x80, 0x31, 0x41, 0x6C, 0xAD, \
643-
0xB2, 0xBD, 0xA9, 0xE3, 0x5A, 0x9F
644-
645642
SOF_LLEXT_MOD_ENTRY(crossover, &crossover_interface);
646643

647644
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
648-
SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, UUID_CROSSOVER, 40);
645+
SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, SOF_REG_UUID(crossover), 40);
649646

650647
SOF_LLEXT_BUILDINFO;
651648

‎src/audio/dcblock/dcblock.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,10 @@ SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
264264
#include <module/module/llext.h>
265265
#include <rimage/sof/user/manifest.h>
266266

267-
#define UUID_DCBLOCK 0xAF, 0xEF, 0x09, 0xB8, 0x81, 0x56, 0xB1, 0x42, 0xD6, 0x9E, \
268-
0x04, 0xBB, 0x01, 0x2D, 0xD3, 0x84
269-
270267
SOF_LLEXT_MOD_ENTRY(dcblock, &dcblock_interface);
271268

272269
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
273-
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, UUID_DCBLOCK, 40);
270+
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, SOF_REG_UUID(dcblock), 40);
274271

275272
SOF_LLEXT_BUILDINFO;
276273

‎src/audio/drc/drc.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -410,13 +410,10 @@ SOF_MODULE_INIT(drc, sys_comp_module_drc_interface_init);
410410
#include <module/module/api_ver.h>
411411
#include <rimage/sof/user/manifest.h>
412412

413-
#define UUID_DRC 0xda, 0xe4, 0x6e, 0xb3, 0x6f, 0x00, 0xf9, 0x47, \
414-
0xa0, 0x6d, 0xfe, 0xcb, 0xe2, 0xd8, 0xb6, 0xce
415-
416413
SOF_LLEXT_MOD_ENTRY(drc, &drc_interface);
417414

418415
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
419-
SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, UUID_DRC, 40);
416+
SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, SOF_REG_UUID(drc), 40);
420417

421418
SOF_LLEXT_BUILDINFO;
422419

‎src/audio/eq_fir/eq_fir.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -488,13 +488,10 @@ SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
488488
#include <module/module/llext.h>
489489
#include <rimage/sof/user/manifest.h>
490490

491-
#define UUID_EQFIR 0xe7, 0x0c, 0xa9, 0x43, 0xa5, 0xf3, 0xdf, 0x41, \
492-
0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3
493-
494491
SOF_LLEXT_MOD_ENTRY(eq_fir, &eq_fir_interface);
495492

496493
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
497-
SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, UUID_EQFIR, 40);
494+
SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, SOF_REG_UUID(eq_fir), 40);
498495

499496
SOF_LLEXT_BUILDINFO;
500497

‎src/audio/eq_iir/eq_iir.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,10 @@ SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
258258
#include <module/module/llext.h>
259259
#include <rimage/sof/user/manifest.h>
260260

261-
#define UUID_EQIIR 0xE6, 0xC0, 0x50, 0x51, 0xF9, 0x27, 0xC8, 0x4E, \
262-
0x83, 0x51, 0xC7, 0x05, 0xB6, 0x42, 0xD1, 0x2F
263-
264261
SOF_LLEXT_MOD_ENTRY(eq_iir, &eq_iir_interface);
265262

266263
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
267-
SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, UUID_EQIIR, 40);
264+
SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, SOF_REG_UUID(eq_iir), 40);
268265

269266
SOF_LLEXT_BUILDINFO;
270267

‎src/audio/google/google_ctc_audio_processing.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -466,14 +466,11 @@ SOF_MODULE_INIT(google_ctc_audio_processing,
466466
#include <module/module/llext.h>
467467
#include <rimage/sof/user/manifest.h>
468468

469-
#define UUID_GOOGLE_CTC 0xBC, 0x1B, 0x0E, 0xBF, 0x6A, 0xDC, 0xFE, 0x45, 0x90, 0xBC, \
470-
0x25, 0x54, 0xCB, 0x13, 0x7A, 0xB4
471-
472469
SOF_LLEXT_MOD_ENTRY(google_ctc_audio_processing, &google_ctc_audio_processing_interface);
473470

474471
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
475472
SOF_LLEXT_MODULE_MANIFEST("CTC", google_ctc_audio_processing_llext_entry,
476-
1, UUID_GOOGLE_CTC, 40);
473+
1, SOF_REG_UUID(google_ctc_audio_processing), 40);
477474

478475
SOF_LLEXT_BUILDINFO;
479476

‎src/audio/google/google_rtc_audio_processing.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -861,14 +861,11 @@ SOF_MODULE_INIT(google_rtc_audio_processing,
861861
#include <module/module/llext.h>
862862
#include <rimage/sof/user/manifest.h>
863863

864-
#define UUID_GOOGLE_RTC_AEC 0xA6, 0xA0, 0x80, 0xB7, 0x9F, 0x26, 0x6F, 0x46, 0x77, 0xB4, \
865-
0x23, 0xDF, 0xA0, 0x5A, 0xF7, 0x58
866-
867864
SOF_LLEXT_MOD_ENTRY(google_rtc_audio_processing, &google_rtc_audio_processing_interface);
868865

869866
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
870867
SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", google_rtc_audio_processing_llext_entry,
871-
7, UUID_GOOGLE_RTC_AEC, 1);
868+
7, SOF_REG_UUID(google_rtc_audio_processing), 1);
872869

873870
SOF_LLEXT_BUILDINFO;
874871

‎src/audio/igo_nr/igo_nr.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -893,13 +893,10 @@ SOF_MODULE_INIT(igo_nr, sys_comp_module_igo_nr_interface_init);
893893
#include <module/module/llext.h>
894894
#include <rimage/sof/user/manifest.h>
895895

896-
#define UUID_IGO_NR 0xBC, 0xE2, 0x6A, 0x69, 0x77, 0x28, 0xEB, 0x11, 0xC1, 0xAD, \
897-
0x02, 0x42, 0xAC, 0x12, 0x00, 0x02
898-
899896
SOF_LLEXT_MOD_ENTRY(igo_nr, &igo_nr_interface);
900897

901898
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
902-
SOF_LLEXT_MODULE_MANIFEST("IGO_NR", igo_nr_llext_entry, 1, UUID_IGO_NR, 40);
899+
SOF_LLEXT_MODULE_MANIFEST("IGO_NR", igo_nr_llext_entry, 1, SOF_REG_UUID(igo_nr), 40);
903900

904901
SOF_LLEXT_BUILDINFO;
905902

‎src/audio/mfcc/mfcc.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,10 @@ SOF_MODULE_INIT(mfcc, sys_comp_module_mfcc_interface_init);
266266
#include <module/module/llext.h>
267267
#include <rimage/sof/user/manifest.h>
268268

269-
#define UUID_MFCC 0x73, 0xA7, 0x10, 0xDB, 0xA4, 0x1A, 0xEA, 0x4C, 0x1F, 0xA2, \
270-
0x2D, 0x57, 0xA5, 0xC9, 0x82, 0xEB
271-
272269
SOF_LLEXT_MOD_ENTRY(mfcc, &mfcc_interface);
273270

274271
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
275-
SOF_LLEXT_MODULE_MANIFEST("MFCC", mfcc_llext_entry, 1, UUID_MFCC, 40);
272+
SOF_LLEXT_MODULE_MANIFEST("MFCC", mfcc_llext_entry, 1, SOF_REG_UUID(mfcc), 40);
276273

277274
SOF_LLEXT_BUILDINFO;
278275

‎src/audio/mixin_mixout/mixin_mixout.c

+2-7
Original file line numberDiff line numberDiff line change
@@ -949,18 +949,13 @@ SOF_MODULE_INIT(mixout, sys_comp_module_mixout_interface_init);
949949
#include <module/module/llext.h>
950950
#include <rimage/sof/user/manifest.h>
951951

952-
#define UUID_MIXIN 0xB2, 0x6E, 0x65, 0x39, 0x71, 0x3B, 0x49, 0x40, \
953-
0x8D, 0x3F, 0xF9, 0x2C, 0xD5, 0xC4, 0x3C, 0x09
954-
#define UUID_MIXOUT 0x5A, 0x50, 0x56, 0x3C, 0xD7, 0x24, 0x8F, 0x41, \
955-
0xBD, 0xDC, 0xC1, 0xF5, 0xA3, 0xAC, 0x2A, 0xE0
956-
957952
SOF_LLEXT_MOD_ENTRY(mixin, &mixin_interface);
958953
SOF_LLEXT_MOD_ENTRY(mixout, &mixout_interface);
959954

960955
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used =
961956
{
962-
SOF_LLEXT_MODULE_MANIFEST("MIXIN", mixin_llext_entry, 1, UUID_MIXIN, 30),
963-
SOF_LLEXT_MODULE_MANIFEST("MIXOUT", mixout_llext_entry, 1, UUID_MIXOUT, 30),
957+
SOF_LLEXT_MODULE_MANIFEST("MIXIN", mixin_llext_entry, 1, SOF_REG_UUID(mixin), 30),
958+
SOF_LLEXT_MODULE_MANIFEST("MIXOUT", mixout_llext_entry, 1, SOF_REG_UUID(mixout), 30),
964959
};
965960

966961
SOF_LLEXT_BUILDINFO;

‎src/audio/module_adapter/module/waves/waves.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -907,15 +907,10 @@ SOF_MODULE_INIT(waves, sys_comp_module_waves_interface_init);
907907
#include <module/module/llext.h>
908908
#include <rimage/sof/user/manifest.h>
909909

910-
/* d944281a-afe9-4695-a043-d7f62b89538e */
911-
#define UUID_WAVES_CODEC 0x1A, 0x28, 0x44, 0xD9, 0xE9, 0xAF, 0x95, 0x46, \
912-
0xA0, 0x43, 0xD7, 0xF6, 0x2B, 0x89, 0x53, 0x8E
913-
914910
SOF_LLEXT_MOD_ENTRY(waves, &waves_interface);
915911

916912
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
917-
SOF_LLEXT_MODULE_MANIFEST("WAVES", waves_llext_entry,
918-
7, UUID_WAVES_CODEC, 8);
913+
SOF_LLEXT_MODULE_MANIFEST("WAVES", waves_llext_entry, 7, SOF_REG_UUID(waves), 8);
919914

920915
SOF_LLEXT_BUILDINFO;
921916

‎src/audio/multiband_drc/multiband_drc.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,11 @@ SOF_MODULE_INIT(multiband_drc, sys_comp_module_multiband_drc_interface_init);
426426
#include <module/module/llext.h>
427427
#include <rimage/sof/user/manifest.h>
428428

429-
#define UUID_MULTIBAND_DRC 0x56, 0x22, 0x9F, 0x0D, 0x4F, 0x8E, 0xB3, 0x47, 0x48, 0x84, \
430-
0x23, 0x9A, 0x33, 0x4F, 0x11, 0x91
431-
432429
SOF_LLEXT_MOD_ENTRY(multiband_drc, &multiband_drc_interface);
433430

434431
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
435-
SOF_LLEXT_MODULE_MANIFEST("MB_DRC", multiband_drc_llext_entry, 1, UUID_MULTIBAND_DRC, 40);
432+
SOF_LLEXT_MODULE_MANIFEST("MB_DRC", multiband_drc_llext_entry, 1,
433+
SOF_REG_UUID(multiband_drc), 40);
436434

437435
SOF_LLEXT_BUILDINFO;
438436

‎src/audio/mux/mux.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -482,24 +482,20 @@ SOF_MODULE_INIT(demux, sys_comp_module_demux_interface_init);
482482
#include <module/module/llext.h>
483483
#include <rimage/sof/user/manifest.h>
484484

485-
#define UUID_MUX 0x35, 0x6E, 0xCE, 0x64, 0x7A, 0x85, 0x78, 0x48, 0xE8, 0xAC, \
486-
0xE2, 0xA2, 0xF4, 0x2E, 0x30, 0x69
487485
SOF_LLEXT_MOD_ENTRY(mux, &mux_interface);
488486

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

498494
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
499-
SOF_LLEXT_MODULE_MANIFEST("MUX", mux_llext_entry, 1, UUID_MUX, 15),
495+
SOF_LLEXT_MODULE_MANIFEST("MUX", mux_llext_entry, 1, SOF_REG_UUID(mux4), 15),
500496
/*
501497
* See comment above for a demux deactivation reason
502-
* SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, UUID_DEMUX, 15),
498+
* SOF_LLEXT_MODULE_MANIFEST("DEMUX", demux_llext_entry, 1, SOF_REG_UUID(demux), 15),
503499
*/
504500
};
505501

‎src/audio/rtnr/rtnr.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -876,14 +876,10 @@ SOF_MODULE_INIT(rtnr, sys_comp_module_rtnr_interface_init);
876876
#include <module/module/llext.h>
877877
#include <rimage/sof/user/manifest.h>
878878

879-
/* 5c7ca334-e15d-11eb-ba800242ac130004 */
880-
#define UUID_RTNR 0x34, 0xA3, 0x7C, 0x5C, 0x5D, 0xE1, 0xEB, 0x11, \
881-
0xBA, 0x80, 0x02, 0x42, 0xAC, 0x13, 0x00, 0x04
882-
883879
SOF_LLEXT_MOD_ENTRY(rtnr, &rtnr_interface);
884880

885881
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
886-
SOF_LLEXT_MODULE_MANIFEST("RTNR", rtnr_llext_entry, 1, UUID_RTNR, 40);
882+
SOF_LLEXT_MODULE_MANIFEST("RTNR", rtnr_llext_entry, 1, SOF_REG_UUID(rtnr), 40);
887883

888884
SOF_LLEXT_BUILDINFO;
889885

‎src/audio/selector/selector.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -923,13 +923,11 @@ SOF_MODULE_INIT(selector, sys_comp_module_selector_interface_init);
923923
#include <module/module/llext.h>
924924
#include <rimage/sof/user/manifest.h>
925925

926-
#define UUID_SELECTOR 0x32, 0xFE, 0x92, 0xC1, 0x17, 0x1E, 0xC2, 0x4F, 0x58, 0x97, \
927-
0xC7, 0xF3, 0x54, 0x2E, 0x98, 0x0A
928-
929926
SOF_LLEXT_MOD_ENTRY(selector, &selector_interface);
930927

931928
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
932-
SOF_LLEXT_MODULE_MANIFEST("MICSEL", selector_llext_entry, 1, UUID_SELECTOR, 8);
929+
SOF_LLEXT_MODULE_MANIFEST("MICSEL", selector_llext_entry, 1, SOF_REG_UUID(selector4),
930+
8);
933931

934932
SOF_LLEXT_BUILDINFO;
935933

‎src/audio/src/src.c

+3-6
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,18 @@ SOF_MODULE_INIT(src, sys_comp_module_src_interface_init);
8989
#include <module/module/llext.h>
9090
#include <rimage/sof/user/manifest.h>
9191

92-
#define UUID_SRC 0x8D, 0xB2, 0x1B, 0xE6, 0x9A, 0x14, 0x1F, 0x4C, \
93-
0xB7, 0x09, 0x46, 0x82, 0x3E, 0xF5, 0xF5, 0xAE
9492
SOF_LLEXT_MOD_ENTRY(src, &src_interface);
9593

9694
#if CONFIG_COMP_SRC_LITE
97-
#define UUID_SRC_LITE 0x51, 0x10, 0x44, 0x33, 0xCD, 0x44, 0x6A, 0x46, \
98-
0x83, 0xA3, 0x17, 0x84, 0x78, 0x70, 0x8A, 0xEA
9995
extern const struct module_interface src_lite_interface;
10096
SOF_LLEXT_MOD_ENTRY(src_lite, &src_lite_interface);
10197
#endif
10298

10399
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
104-
SOF_LLEXT_MODULE_MANIFEST("SRC", src_llext_entry, 1, UUID_SRC, 1),
100+
SOF_LLEXT_MODULE_MANIFEST("SRC", src_llext_entry, 1, SOF_REG_UUID(src4), 1),
105101
#if CONFIG_COMP_SRC_LITE
106-
SOF_LLEXT_MODULE_MANIFEST("SRC_LITE", src_lite_llext_entry, 1, UUID_SRC_LITE, 1),
102+
SOF_LLEXT_MODULE_MANIFEST("SRC_LITE", src_lite_llext_entry, 1, SOF_REG_UUID(src_lite),
103+
1),
107104
#endif
108105
};
109106

‎src/audio/tdfb/tdfb.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -831,13 +831,10 @@ SOF_MODULE_INIT(tdfb, sys_comp_module_tdfb_interface_init);
831831
#include <module/module/llext.h>
832832
#include <rimage/sof/user/manifest.h>
833833

834-
#define UUID_TDFB 0x49, 0x17, 0x51, 0xdd, 0xfa, 0xd9, 0x5c, 0x45, 0xb3, 0xa7, \
835-
0x13, 0x58, 0x56, 0x93, 0xf1, 0xaf
836-
837834
SOF_LLEXT_MOD_ENTRY(tdfb, &tdfb_interface);
838835

839836
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
840-
SOF_LLEXT_MODULE_MANIFEST("TDFB", tdfb_llext_entry, 1, UUID_TDFB, 40);
837+
SOF_LLEXT_MODULE_MANIFEST("TDFB", tdfb_llext_entry, 1, SOF_REG_UUID(tdfb), 40);
841838

842839
SOF_LLEXT_BUILDINFO;
843840

‎src/audio/volume/volume.c

+2-6
Original file line numberDiff line numberDiff line change
@@ -820,23 +820,19 @@ SOF_MODULE_INIT(gain, sys_comp_module_gain_interface_init);
820820
#include <rimage/sof/user/manifest.h>
821821

822822
#if CONFIG_COMP_PEAK_VOL
823-
#define UUID_PEAKVOL 0x23, 0x13, 0x17, 0x8a, 0xa3, 0x94, 0x1d, 0x4e, \
824-
0xaf, 0xe9, 0xfe, 0x5d, 0xba, 0xa4, 0xc3, 0x93
825823
SOF_LLEXT_MOD_ENTRY(peakvol, &volume_interface);
826824
#endif
827825

828826
#if CONFIG_COMP_GAIN
829-
#define UUID_GAIN 0xa8, 0xa9, 0xbc, 0x61, 0xd0, 0x18, 0x18, 0x4a, \
830-
0x8e, 0x7b, 0x26, 0x39, 0x21, 0x98, 0x04, 0xb7
831827
SOF_LLEXT_MOD_ENTRY(gain, &gain_interface);
832828
#endif
833829

834830
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
835831
#if CONFIG_COMP_PEAK_VOL
836-
SOF_LLEXT_MODULE_MANIFEST("PEAKVOL", peakvol_llext_entry, 1, UUID_PEAKVOL, 10),
832+
SOF_LLEXT_MODULE_MANIFEST("PEAKVOL", peakvol_llext_entry, 1, SOF_REG_UUID(volume), 10),
837833
#endif
838834
#if CONFIG_COMP_GAIN
839-
SOF_LLEXT_MODULE_MANIFEST("GAIN", gain_llext_entry, 1, UUID_GAIN, 40),
835+
SOF_LLEXT_MODULE_MANIFEST("GAIN", gain_llext_entry, 1, SOF_REG_UUID(gain), 40),
840836
#endif
841837
};
842838

‎src/include/module/module/llext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{ \
1111
.module = { \
1212
.name = manifest_name, \
13-
.uuid = {mod_uuid}, \
13+
.uuid = mod_uuid, \
1414
.entry_point = (uint32_t)(entry), \
1515
.instance_max_count = instances, \
1616
.type = { \

0 commit comments

Comments
 (0)