Skip to content

Commit 1c25b2a

Browse files
committed
uuid: Use new UUID registry pervasively
Strip out all the literall UUID management from existing C code (the API itself still works for any out-of-tree or test code users) and exclusively use the new, much simpler, SOF_DEFINE_REG_UUID() macro which sources IDs from the registry by name. Signed-off-by: Andy Ross <[email protected]>
1 parent a0e0cef commit 1c25b2a

File tree

139 files changed

+157
-462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+157
-462
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
3333

3434
/* these ids aligns windows driver requirement to support windows driver */
35-
/* 99f7166d-372c-43ef-81f6-22007aa15f03 */
36-
SOF_DEFINE_UUID("aria", aria_uuid, 0x99f7166d, 0x372c, 0x43ef,
37-
0x81, 0xf6, 0x22, 0x00, 0x7a, 0xa1, 0x5f, 0x03);
35+
SOF_DEFINE_REG_UUID(aria);
3836

3937
DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
4038

src/audio/asrc/asrc_ipc3.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
#include <errno.h>
1717
#include "asrc.h"
1818

19-
/* c8ec72f6-8526-4faf-9d39-a23d0b541de2 */
20-
SOF_DEFINE_UUID("asrc", asrc_uuid, 0xc8ec72f6, 0x8526, 0x4faf,
21-
0x9d, 0x39, 0xa2, 0x3d, 0x0b, 0x54, 0x1d, 0xe2);
19+
SOF_DEFINE_REG_UUID(asrc);
2220

2321
DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
2422

src/audio/asrc/asrc_ipc4.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
#include <errno.h>
1717
#include "asrc.h"
1818

19-
/* 66b4402d-b468-42f2-81a7-b37121863dd4 */
20-
SOF_DEFINE_UUID("asrc4", asrc4_uuid, 0x66b4402d, 0xb468, 0x42f2,
21-
0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4);
19+
SOF_DEFINE_REG_UUID(asrc4);
2220

2321
DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
2422

src/audio/base_fw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636

3737
LOG_MODULE_REGISTER(basefw, CONFIG_SOF_LOG_LEVEL);
3838

39-
/* 0e398c32-5ade-ba4b-93b1-c50432280ee4 */
40-
SOF_DEFINE_UUID("basefw", basefw_uuid, 0xe398c32, 0x5ade, 0xba4b,
41-
0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4);
39+
SOF_DEFINE_REG_UUID(basefw);
4240
DECLARE_TR_CTX(basefw_comp_tr, SOF_UUID(basefw_uuid), LOG_LEVEL_INFO);
4341

4442
static struct ipc4_system_time_info global_system_time_info;

src/audio/buffer.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828
LOG_MODULE_REGISTER(buffer, CONFIG_SOF_LOG_LEVEL);
2929

30-
/* 42544c92-8e92-4e41-b679-34519f1c1d28 */
31-
SOF_DEFINE_UUID("buffer", buffer_uuid, 0x42544c92, 0x8e92, 0x4e41,
32-
0xb6, 0x79, 0x34, 0x51, 0x9f, 0x1c, 0x1d, 0x28);
30+
SOF_DEFINE_REG_UUID(buffer);
3331
DECLARE_TR_CTX(buffer_tr, SOF_UUID(buffer_uuid), LOG_LEVEL_INFO);
3432

3533
static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, uint32_t caps,

src/audio/chain_dma.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ static const uint32_t max_chain_number = DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN;
3535

3636
LOG_MODULE_REGISTER(chain_dma, CONFIG_SOF_LOG_LEVEL);
3737

38-
/* 6a0a274f-27cc-4afb-a3e7-3444723f432e */
39-
SOF_DEFINE_UUID("chain_dma", chain_dma_uuid, 0x6a0a274f, 0x27cc, 0x4afb,
40-
0xa3, 0xe7, 0x34, 0x44, 0x72, 0x3f, 0x43, 0x2e);
38+
SOF_DEFINE_REG_UUID(chain_dma);
4139
DECLARE_TR_CTX(chain_dma_tr, SOF_UUID(chain_dma_uuid), LOG_LEVEL_INFO);
4240

4341
/* chain dma component private data */

src/audio/channel_map.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
LOG_MODULE_REGISTER(channel_map, CONFIG_SOF_LOG_LEVEL);
1818

19-
/* ec290e95-4a20-47eb-bbff-d9c888431831 */
20-
SOF_DEFINE_UUID("chmap", chmap_uuid, 0xec290e95, 0x4a20, 0x47eb,
21-
0xbb, 0xff, 0xd9, 0xc8, 0x88, 0x43, 0x18, 0x31);
19+
SOF_DEFINE_REG_UUID(chmap);
2220

2321
DECLARE_TR_CTX(chmap_tr, SOF_UUID(chmap_uuid), LOG_LEVEL_INFO);
2422

src/audio/codec/dts/dts.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
1313

14-
/* d95fc34f-370f-4ac7-bc86-bfdc5be241e6 */
15-
SOF_DEFINE_UUID("dts", dts_uuid, 0xd95fc34f, 0x370f, 0x4ac7,
16-
0xbc, 0x86, 0xbf, 0xdc, 0x5b, 0xe2, 0x41, 0xe6);
14+
SOF_DEFINE_REG_UUID(dts);
1715
DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
1816

1917
#define MAX_EXPECTED_DTS_CONFIG_DATA_SIZE 8192

src/audio/component.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ LOG_MODULE_REGISTER(component, CONFIG_SOF_LOG_LEVEL);
3535

3636
static SHARED_DATA struct comp_driver_list cd;
3737

38-
/* 7c42ce8b-0108-43d0-9137-56d660478c5f */
39-
SOF_DEFINE_UUID("component", component_uuid, 0x7c42ce8b, 0x0108, 0x43d0,
40-
0x91, 0x37, 0x56, 0xd6, 0x60, 0x47, 0x8c, 0x5f);
38+
SOF_DEFINE_REG_UUID(component);
4139

4240
DECLARE_TR_CTX(comp_tr, SOF_UUID(component_uuid), LOG_LEVEL_INFO);
4341

src/audio/copier/copier.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
4949

5050
/* this id aligns windows driver requirement to support windows driver */
51-
/* 9ba00c83-ca12-4a83-943c-1fa2e82f9dda */
52-
SOF_DEFINE_UUID("copier", copier_uuid, 0x9ba00c83, 0xca12, 0x4a83,
53-
0x94, 0x3c, 0x1f, 0xa2, 0xe8, 0x2f, 0x9d, 0xda);
51+
SOF_DEFINE_REG_UUID(copier);
5452

5553
DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
5654

0 commit comments

Comments
 (0)