....

Author: marcinszkudlinski

src/audio/module_adapter/module_adapter.c

@@ -621,17 +621,14 @@ static void module_adapter_process_output(struct comp_dev *dev)
 
 	/* copy from all output local buffers to sink buffers */
 	i = 0;
-	list_for_item(blist, &dev->bsink_list) {  //msz tutaj do nowych
-		struct list_item *_blist;
+	comp_dev_for_each_consumer(dev, sink) {
 		int j = 0;
 
-		list_for_item(_blist, &mod->raw_data_buffers_list) {
+		list_for_item(blist, &mod->raw_data_buffers_list) {
 			if (i == j) {
 				struct comp_buffer *source;
 
-				sink = container_of(blist, struct comp_buffer, Xsource_list);  //tu
-				source = container_of(_blist, struct comp_buffer, Xsink_list); //i tu
-
+				source = container_of(blist, struct comp_buffer, buffers_list);
 				module_copy_samples(dev, source, sink,
 						    mod->output_buffers[i].size);
 
@@ -1011,12 +1008,10 @@ static int module_adapter_raw_data_type_copy(struct comp_dev *dev)
 	}
 
 	/* copy source samples into input buffer */
-	list_for_item(blist, &dev->bsource_list) {
+	comp_dev_for_each_producer(dev, source) {
 		uint32_t bytes_to_process;
 		int frames, source_frame_bytes;
 
-		source = container_of(blist, struct comp_buffer, Xsink_list);
-
 		/* check if the source dev is in the same state as the dev */
 		if (comp_buffer_get_source_state(source) != dev->state)
 			continue;
@@ -1051,10 +1046,7 @@ static int module_adapter_raw_data_type_copy(struct comp_dev *dev)
 
 	i = 0;
 	/* consume from all input buffers */
-	list_for_item(blist, &dev->bsource_list) {
-
-		source = container_of(blist, struct comp_buffer, Xsink_list);
-
+	comp_dev_for_each_producer(dev, source) {
 		comp_update_buffer_consume(source, mod->input_buffers[i].consumed);
 
 		bzero((__sparse_force void *)mod->input_buffers[i].data, size);

src/audio/module_adapter/module_adapter_ipc3.c

@@ -133,24 +133,20 @@ void module_adapter_set_params(struct processing_module *mod, struct sof_ipc_str
 
 static int module_source_state_count(struct comp_dev *dev, uint32_t state)
 {
-	struct list_item *blist;
 	int count = 0;
+	struct comp_buffer *source;
 
 	/* count source with state == status */
-	list_for_item(blist, &dev->bsource_list) {
+	comp_dev_for_each_producer(dev, source)
 		/*
 		 * FIXME: this is racy, state can be changed by another core.
 		 * This is implicitly protected by serialised IPCs. Even when
 		 * IPCs are processed in the pipeline thread, the next IPC will
 		 * not be sent until the thread has processed and replied to the
 		 * current one.
 		 */
-		struct comp_buffer *source = container_of(blist, struct comp_buffer,
-							  Xsink_list);
-
 		if (comp_buffer_get_source_state(source) == state)
 			count++;
-	}
 
 	return count;
 }

src/ipc/ipc-helper.c

@@ -127,7 +127,7 @@ int comp_verify_params(struct comp_dev *dev, uint32_t flag,
 		comp_err(dev, "comp_verify_params(): !params");
 		return -EINVAL;
 	}
-
+//tu jest magiA
 	source_list = comp_buffer_list(dev, PPL_DIR_UPSTREAM);
 	sink_list = comp_buffer_list(dev, PPL_DIR_DOWNSTREAM);
 
@@ -138,11 +138,11 @@ int comp_verify_params(struct comp_dev *dev, uint32_t flag,
 		if (list_is_empty(sink_list))
 			buf = list_first_item(source_list,
 					      struct comp_buffer,
-					      Xsink_list);
+					      Xsink_list); //tu jest magiA
 		else
 			buf = list_first_item(sink_list,
 					      struct comp_buffer,
-					      Xsource_list);
+					      Xsource_list); //tu jest magiA
 
 		/* update specific pcm parameter with buffer parameter if
 		 * specific flag is set.
@@ -307,9 +307,9 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
 	while(buffer) {
 		struct comp_buffer *next_buffer = comp_dev_get_next_data_producer(icd->cd, buffer);
 
-		buffer->sinkX = NULL; //api
+		comp_buffer_set_sink_component(buffer, NULL);
 		/* This breaks the list, but we anyway delete all buffers */
-		list_init(&buffer->Xsink_list);
+		list_init(&buffer->Xsink_list); //TU tez magia
 
 		buffer = next_buffer;
 	}
@@ -318,9 +318,9 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
 	while(buffer) {
 		struct comp_buffer *next_buffer = comp_dev_get_next_data_consumer(icd->cd, buffer);
 
-		buffer->sourceX = NULL; //api
+		comp_buffer_set_source_component(buffer, NULL);
 		/* This breaks the list, but we anyway delete all buffers */
-		list_init(&buffer->Xsource_list);
+		list_init(&buffer->Xsource_list); //TU tez magia
 
 		buffer = next_buffer;
 	}

src/ipc/ipc3/handler.c

@@ -167,18 +167,15 @@ static bool is_hostless_downstream(struct comp_dev *current)
 static bool is_hostless_upstream(struct comp_dev *current)
 {
 	struct list_item *clist;
+	struct comp_buffer *buffer;
 
 	/* check if current is a HOST comp */
 	if (current->ipc_config.type == SOF_COMP_HOST ||
 	    current->ipc_config.type == SOF_COMP_SG_HOST)
 		return false;
 
 	/* check if the pipeline has a HOST comp upstream */
-	list_for_item(clist, &current->bsource_list) {  //msz
-		struct comp_buffer *buffer;
-
-		buffer = container_of(clist, struct comp_buffer, Xsink_list);
-
+	comp_dev_for_each_producer(current, buffer) {
 		/* don't go upstream if this component is not connected */
 		if (!comp_buffer_get_source_component(buffer))
 			continue;