diff --git a/test/cmocka/src/audio/eq_fir/eq_fir_process.c b/test/cmocka/src/audio/eq_fir/eq_fir_process.c index ebfd02b2411f..2b657c23c2fb 100644 --- a/test/cmocka/src/audio/eq_fir/eq_fir_process.c +++ b/test/cmocka/src/audio/eq_fir/eq_fir_process.c @@ -72,10 +72,7 @@ static struct sof_ipc_comp_process *create_eq_fir_comp_ipc(struct test_data *td) struct sof_eq_fir_config *eq; size_t ipc_size = sizeof(struct sof_ipc_comp_process); struct sof_abi_hdr *blob = (struct sof_abi_hdr *)fir_coef_2ch; - const struct sof_uuid uuid = { - .a = 0x43a90ce7, .b = 0xf3a5, .c = 0x41df, - .d = {0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3} - }; + const struct sof_uuid uuid = SOF_REG_UUID(eq_fir); ipc = calloc(1, ipc_size + blob->size + SOF_UUID_SIZE); memcpy_s(ipc + 1, SOF_UUID_SIZE, &uuid, SOF_UUID_SIZE); diff --git a/test/cmocka/src/audio/eq_iir/eq_iir_process.c b/test/cmocka/src/audio/eq_iir/eq_iir_process.c index 54716bcfd0f1..763d87b87518 100644 --- a/test/cmocka/src/audio/eq_iir/eq_iir_process.c +++ b/test/cmocka/src/audio/eq_iir/eq_iir_process.c @@ -71,10 +71,7 @@ static struct sof_ipc_comp_process *create_eq_iir_comp_ipc(struct test_data *td) struct sof_eq_iir_config *eq; size_t ipc_size = sizeof(struct sof_ipc_comp_process); struct sof_abi_hdr *blob = (struct sof_abi_hdr *)iir_coef_2ch; - const struct sof_uuid uuid = { - .a = 0x5150c0e6, .b = 0x27f9, .c = 0x4ec8, - .d = {0x83, 0x51, 0xc7, 0x05, 0xb6, 0x42, 0xd1, 0x2f} - }; + const struct sof_uuid uuid = SOF_REG_UUID(eq_iir); ipc = calloc(1, ipc_size + blob->size + SOF_UUID_SIZE); memcpy_s(ipc + 1, SOF_UUID_SIZE, &uuid, SOF_UUID_SIZE); diff --git a/test/cmocka/src/audio/mux/demux_copy.c b/test/cmocka/src/audio/mux/demux_copy.c index 40040023b6df..17414b4f7c25 100644 --- a/test/cmocka/src/audio/mux/demux_copy.c +++ b/test/cmocka/src/audio/mux/demux_copy.c @@ -96,10 +96,7 @@ static struct sof_ipc_comp_process *create_demux_comp_ipc(struct test_data *td) size_t ipc_size = sizeof(struct sof_ipc_comp_process); size_t mux_size = sizeof(struct sof_mux_config) + MUX_MAX_STREAMS * sizeof(struct mux_stream_data); - const struct sof_uuid uuid = { - .a = 0xc4b26868, .b = 0x1430, .c = 0x470e, - .d = {0xa0, 0x89, 0x15, 0xd1, 0xc7, 0x7f, 0x85, 0x1a} - }; + const struct sof_uuid uuid = SOF_REG_UUID(demux); int i, j; ipc = calloc(1, ipc_size + mux_size + SOF_UUID_SIZE); diff --git a/test/cmocka/src/audio/mux/mux_copy.c b/test/cmocka/src/audio/mux/mux_copy.c index 6e391269054a..2ecc814483bd 100644 --- a/test/cmocka/src/audio/mux/mux_copy.c +++ b/test/cmocka/src/audio/mux/mux_copy.c @@ -114,10 +114,7 @@ static struct sof_ipc_comp_process *create_mux_comp_ipc(struct test_data *td) size_t ipc_size = sizeof(struct sof_ipc_comp_process); size_t mux_size = sizeof(struct sof_mux_config) + MUX_MAX_STREAMS * sizeof(struct mux_stream_data); - const struct sof_uuid uuid = { - .a = 0xc607ff4d, .b = 0x9cb6, .c = 0x49dc, - .d = {0xb6, 0x78, 0x7d, 0xa3, 0xc6, 0x3e, 0xa5, 0x57} - }; + const struct sof_uuid uuid = SOF_REG_UUID(mux); int i, j; ipc = calloc(1, ipc_size + mux_size + SOF_UUID_SIZE); diff --git a/test/cmocka/src/audio/mux/mux_get_processing_function.c b/test/cmocka/src/audio/mux/mux_get_processing_function.c index af9fd418ec56..0e4f22ff7021 100644 --- a/test/cmocka/src/audio/mux/mux_get_processing_function.c +++ b/test/cmocka/src/audio/mux/mux_get_processing_function.c @@ -40,10 +40,7 @@ static struct sof_ipc_comp_process *create_mux_comp_ipc(struct test_data *td) size_t ipc_size = sizeof(struct sof_ipc_comp_process); size_t mux_size = sizeof(struct sof_mux_config) + MUX_MAX_STREAMS * sizeof(struct mux_stream_data); - const struct sof_uuid uuid = { - .a = 0xc607ff4d, .b = 0x9cb6, .c = 0x49dc, - .d = {0xb6, 0x78, 0x7d, 0xa3, 0xc6, 0x3e, 0xa5, 0x57} - }; + const struct sof_uuid uuid = SOF_REG_UUID(mux); int i, j; ipc = calloc(1, ipc_size + mux_size + SOF_UUID_SIZE);