From 7072bcc014d286291a0c938bb545452b5557a857 Mon Sep 17 00:00:00 2001 From: Marcin Szkudlinski Date: Mon, 18 Nov 2024 20:59:44 +0100 Subject: [PATCH] fix --- src/ipc/ipc4/helper.c | 1 - .../pipeline/pipeline_connect_upstream.c | 24 +++++++++---------- .../pipeline/pipeline_connection_mocks.c | 16 ++++++------- test/cmocka/src/util.h | 4 ++-- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c index 41b06cf21fcc..1528e2d6dd24 100644 --- a/src/ipc/ipc4/helper.c +++ b/src/ipc/ipc4/helper.c @@ -680,7 +680,6 @@ int ipc_comp_disconnect(struct ipc *ipc, ipc_pipe_comp_connect *_connect) struct comp_buffer *buffer = NULL; struct comp_buffer *buf; struct comp_dev *src, *sink; - struct list_item *sink_list; uint32_t src_id, sink_id, buffer_id; uint32_t flags = 0; int ret, ret1; diff --git a/test/cmocka/src/audio/pipeline/pipeline_connect_upstream.c b/test/cmocka/src/audio/pipeline/pipeline_connect_upstream.c index 2a3b14bf2dfe..b22c201c6488 100644 --- a/test/cmocka/src/audio/pipeline/pipeline_connect_upstream.c +++ b/test/cmocka/src/audio/pipeline/pipeline_connect_upstream.c @@ -102,10 +102,10 @@ static void test_audio_pipeline_complete_connect_downstream_ignore_sink *and first has no upstream components */ list_item_append(&result.sched_comp->bsink_list, - &test_data->b1->source_list); - list_item_append(&test_data->b1->source_list, + &test_data->b1->Xsource_list); + list_item_append(&test_data->b1->Xsource_list, &result.sched_comp->bsink_list); - list_item_append(&test_data->b1->sink_list, + list_item_append(&test_data->b1->Xsink_list, &test_data->second->bsource_list); /*Testing component*/ @@ -128,13 +128,13 @@ static void test_audio_pipeline_complete_connect_upstream_ignore_source *and first has no downstream components */ list_item_append(&result.sched_comp->bsource_list, - &test_data->b1->sink_list); + &test_data->b1->Xsink_list); test_data->b1->sink = result.sched_comp; test_data->b1->source = test_data->second; - list_item_append(&test_data->b1->source_list, + list_item_append(&test_data->b1->Xsource_list, &test_data->second->bsink_list); list_item_append(&test_data->second->bsource_list, - &test_data->b2->sink_list); + &test_data->b2->Xsink_list); test_data->b2->sink = test_data->second; /*Testing component*/ @@ -157,12 +157,12 @@ static void test_audio_pipeline_complete_connect_downstream_full(void **state) comp = &test_data->second->ipc_config; comp->pipeline_id = PIPELINE_ID_SAME; list_item_append(&result.sched_comp->bsink_list, - &test_data->b1->source_list); + &test_data->b1->Xsource_list); test_data->b1->source = result.sched_comp; - list_item_append(&test_data->b1->source_list, + list_item_append(&test_data->b1->Xsource_list, &result.sched_comp->bsink_list); test_data->b1->sink = test_data->second; - list_item_append(&test_data->b1->sink_list, + list_item_append(&test_data->b1->Xsink_list, &test_data->second->bsource_list); test_data->first->frames = 0; @@ -188,7 +188,7 @@ static void test_audio_pipeline_complete_connect_upstream_full(void **state) comp = &test_data->second->ipc_config; comp->pipeline_id = PIPELINE_ID_SAME; list_item_append(&result.sched_comp->bsource_list, - &test_data->b1->sink_list); + &test_data->b1->Xsink_list); test_data->b1->sink = test_data->first; test_data->b1->source = test_data->second; @@ -213,11 +213,11 @@ static void test_audio_pipeline_complete_connect_upstream_other_pipeline comp = &test_data->second->ipc_config; comp->pipeline_id = PIPELINE_ID_DIFFERENT; list_item_append(&result.sched_comp->bsource_list, - &test_data->b1->sink_list); + &test_data->b1->Xsink_list); test_data->b1->sink = test_data->first; test_data->b1->source = test_data->second; list_item_append(&test_data->second->bsource_list, - &test_data->b1->source_list); + &test_data->b1->Xsource_list); /*Testing component*/ pipeline_complete(&result, test_data->first, test_data->second); diff --git a/test/cmocka/src/audio/pipeline/pipeline_connection_mocks.c b/test/cmocka/src/audio/pipeline/pipeline_connection_mocks.c index af811d74df64..f51b16bf9adb 100644 --- a/test/cmocka/src/audio/pipeline/pipeline_connection_mocks.c +++ b/test/cmocka/src/audio/pipeline/pipeline_connection_mocks.c @@ -17,12 +17,12 @@ void cleanup_test_data(struct pipeline_connect_data *data) { list_init(&data->first->bsource_list); list_init(&data->second->bsource_list); - list_init(&data->b1->sink_list); - list_init(&data->b1->source_list); + list_init(&data->b1->Xsink_list); + list_init(&data->b1->Xsource_list); list_init(&data->first->bsink_list); list_init(&data->second->bsink_list); - list_init(&data->b2->sink_list); - list_init(&data->b2->source_list); + list_init(&data->b2->Xsink_list); + list_init(&data->b2->Xsource_list); } struct pipeline_connect_data *get_standard_connect_objects(void) @@ -72,15 +72,15 @@ struct pipeline_connect_data *get_standard_connect_objects(void) buffer->source = first; buffer->sink = second; - list_init(&buffer->sink_list); - list_init(&buffer->source_list); + list_init(&buffer->Xsink_list); + list_init(&buffer->Xsource_list); pipeline_connect_data->b1 = buffer; struct comp_buffer *buffer_2 = calloc(sizeof(struct comp_buffer), 1); buffer_2->source = second; - list_init(&buffer_2->sink_list); - list_init(&buffer_2->source_list); + list_init(&buffer_2->Xsink_list); + list_init(&buffer_2->Xsource_list); pipeline_connect_data->b2 = buffer_2; pipeline_connect_data->p = *pipe; diff --git a/test/cmocka/src/util.h b/test/cmocka/src/util.h index 5ef231ceba64..9c554e17fc44 100644 --- a/test/cmocka/src/util.h +++ b/test/cmocka/src/util.h @@ -29,7 +29,7 @@ static inline struct comp_buffer *create_test_sink(struct comp_dev *dev, /* set bsink list */ if (dev) - list_item_append(&buffer->source_list, &dev->bsink_list); + list_item_append(&buffer->Xsource_list, &dev->bsink_list); /* alloc sink and set default parameters */ buffer->sink = calloc(1, sizeof(struct comp_dev)); @@ -64,7 +64,7 @@ static inline struct comp_buffer *create_test_source(struct comp_dev *dev, /*set bsource list */ if (dev) - list_item_append(&buffer->sink_list, &dev->bsource_list); + list_item_append(&buffer->Xsink_list, &dev->bsource_list); /* alloc source and set default parameters */ buffer->source = calloc(1, sizeof(struct comp_dev));