move to audio_buffer

Author: marcinszkudlinski

src/audio/buffers/comp_buffer.c

@@ -212,8 +212,8 @@ static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, u
 	audio_stream_set_underrun(&buffer->stream, !!(flags & SOF_BUF_UNDERRUN_PERMITTED));
 	audio_stream_set_overrun(&buffer->stream, !!(flags & SOF_BUF_OVERRUN_PERMITTED));
 
-	comp_buffer_reset_source_list(buffer);
-	comp_buffer_reset_sink_list(buffer);
+	audio_buffer_reset_source_list(&buffer->audio_buffer);
+	audio_buffer_reset_sink_list(&buffer->audio_buffer);
 
 	return buffer;
 }
@@ -533,34 +533,3 @@ void comp_update_buffer_consume(struct comp_buffer *buffer, uint32_t bytes)
 		 (char *)audio_stream_get_addr(&buffer->stream)));
 #endif
 }
-
-static inline struct list_item *buffer_comp_list(struct comp_buffer *buffer,
-						 int dir)
-{
-	return dir == PPL_DIR_DOWNSTREAM ?
-			&buffer->source_list :  &buffer->sink_list;
-}
-
-/*
- * Locking: must be called with interrupts disabled! Serialized IPCs protect us
- * from racing attach / detach calls, but the scheduler can interrupt the IPC
- * thread and begin using the buffer for streaming. FIXME: this is still a
- * problem with different cores.
- */
-void buffer_attach(struct comp_buffer *buffer, struct list_item *head, int dir)
-{
-	struct list_item *list = buffer_comp_list(buffer, dir);
-	CORE_CHECK_STRUCT(&buffer->audio_buffer);
-	list_item_prepend(list, head);
-}
-
-/*
- * Locking: must be called with interrupts disabled! See buffer_attach() above
- * for details
- */
-void buffer_detach(struct comp_buffer *buffer, struct list_item *head, int dir)
-{
-	struct list_item *buf_list = buffer_comp_list(buffer, dir);
-	CORE_CHECK_STRUCT(&buffer->audio_buffer);
-	list_item_del(buf_list);
-}

src/audio/pipeline/pipeline-graph.c

@@ -167,9 +167,9 @@ static void buffer_set_comp(struct comp_buffer *buffer, struct comp_dev *comp,
 			    int dir)
 {
 	if (dir == PPL_CONN_DIR_COMP_TO_BUFFER)
-		comp_buffer_set_source_component(buffer, comp);
+		audio_buffer_set_source_component(&buffer->audio_buffer, comp);
 	else
-		comp_buffer_set_sink_component(buffer, comp);
+		audio_buffer_set_sink_component(&buffer->audio_buffer, comp);
 }
 
 int pipeline_connect(struct comp_dev *comp, struct comp_buffer *buffer,
@@ -186,7 +186,7 @@ int pipeline_connect(struct comp_dev *comp, struct comp_buffer *buffer,
 	irq_local_disable(flags);
 
 	comp_list = comp_buffer_list(comp, dir);
-	buffer_attach(buffer, comp_list, dir);
+	audio_buffer_attach(&buffer->audio_buffer, comp_list, dir); //msz bez funkcji
 	buffer_set_comp(buffer, comp, dir);
 
 	irq_local_enable(flags);
@@ -207,7 +207,7 @@ void pipeline_disconnect(struct comp_dev *comp, struct comp_buffer *buffer, int
 	irq_local_disable(flags);
 
 	comp_list = comp_buffer_list(comp, dir);
-	buffer_detach(buffer, comp_list, dir);
+	audio_buffer_detach(&buffer->audio_buffer, comp_list, dir); //msz bez funkcji
 	buffer_set_comp(buffer, NULL, dir);
 
 	irq_local_enable(flags);

src/include/sof/audio/audio_buffer.h

@@ -69,6 +69,14 @@ struct sof_audio_buffer {
 
 	bool is_shared;   /* buffer structure is shared between 2 cores */
 
+	/* connected components */
+	struct comp_dev *Xsource;	/* source component */
+	struct comp_dev *Xsink;		/* sink component */
+
+	/* lists */
+	struct list_item Xsource_list;	/* list in comp buffers */
+	struct list_item Xsink_list;	/* list in comp buffers */
+
 #if CONFIG_PIPELINE_2_0
 	/**
 	 * sink API of an additional buffer
@@ -307,4 +315,60 @@ void audio_buffer_reset(struct sof_audio_buffer *buffer)
 		buffer->ops->reset(buffer);
 }
 
+static inline
+struct comp_dev *audio_buffer_get_source_component(const struct sof_audio_buffer *buffer)
+{
+	return buffer->Xsource;
+}
+
+static inline
+struct comp_dev *audio_buffer_get_sink_component(const struct sof_audio_buffer *buffer)
+{
+	return buffer->Xsink;
+}
+
+static inline
+void audio_buffer_set_source_component(struct sof_audio_buffer *buffer, struct comp_dev *comp)
+{
+	buffer->Xsource = comp;
+}
+
+static inline
+void audio_buffer_set_sink_component(struct sof_audio_buffer *buffer, struct comp_dev *comp)
+{
+	buffer->Xsink = comp;
+}
+static inline void audio_buffer_reset_source_list(struct sof_audio_buffer *buffer)
+{
+	list_init(&buffer->Xsource_list);
+}
+
+static inline void audio_buffer_reset_sink_list(struct sof_audio_buffer *buffer)
+{
+	list_init(&buffer->Xsink_list);
+}
+
+#define audio_buffer_from_list(ptr, dir) \
+	((dir) == PPL_DIR_DOWNSTREAM ? \
+	 container_of(ptr, struct sof_audio_buffer, Xsource_list) : \
+	 container_of(ptr, struct sof_audio_buffer, Xsink_list))
+
+/*
+ * Attach a new buffer at the beginning of the list. Note, that "head" must
+ * really be the head of the list, not a list head within another buffer. We
+ * don't Synchronize its cache, so it must not be embedded in an object, using
+ * the coherent API. The caller takes care to protect list heads.
+ */
+void audio_buffer_attach(struct sof_audio_buffer *buffer, struct list_item *head, int dir);
+
+/*
+ * Detach a buffer from anywhere in the list. "head" is again the head of the
+ * list, we need it to verify, whether this buffer was the first or the last on
+ * the list. Again it is assumed that the head's cache doesn't need to be
+ * synchronized. The caller takes care to protect list heads.
+ */
+void audio_buffer_detach(struct sof_audio_buffer *buffer, struct list_item *head, int dir);
+
+
+
 #endif /* __SOF_AUDIO_BUFFER__ */

src/include/sof/audio/buffer.h

@@ -134,54 +134,52 @@ struct comp_buffer {
 	uint32_t core;
 	struct tr_ctx tctx;			/* trace settings */
 
-	/* connected components */
-	struct comp_dev *source;	/* source component */
-	struct comp_dev *sink;		/* sink component */
-
-	/* lists */
-	struct list_item source_list;	/* list in comp buffers */
-	struct list_item sink_list;	/* list in comp buffers */
-
 	/* list of buffers, to be used i.e. in raw data processing mode*/
 	struct list_item buffers_list;
 };
 
 /*
  * get a component providing data to the buffer
  */
+//msz
 static inline struct comp_dev *comp_buffer_get_source_component(const struct comp_buffer *buffer)
 {
-	return buffer->source;
+	return audio_buffer_get_source_component(&buffer->audio_buffer);
 }
 
 /*
  * get a component consuming data from the buffer
  */
+//msz
 static inline struct comp_dev *comp_buffer_get_sink_component(const struct comp_buffer *buffer)
 {
-	return buffer->sink;
+	return audio_buffer_get_sink_component(&buffer->audio_buffer);
 }
 
+//msz
 static inline
 void comp_buffer_set_source_component(struct comp_buffer *buffer, struct comp_dev *comp)
 {
-	buffer->source = comp;
+	audio_buffer_set_source_component(&buffer->audio_buffer, comp);
 }
 
 static inline
-void comp_buffer_set_sink_component(struct comp_buffer *buffer, struct comp_dev *comp)
+struct comp_buffer *comp_buffer_from_audio_buffer(struct sof_audio_buffer *audio_buffer)
 {
-	buffer->sink = comp;
+	return container_of(audio_buffer, struct comp_buffer, audio_buffer);
 }
 
-static inline void comp_buffer_reset_source_list(struct comp_buffer *buffer)
+static inline
+void comp_buffer_set_sink_component(struct comp_buffer *buffer, struct comp_dev *comp)
 {
-	list_init(&buffer->source_list);
+	audio_buffer_set_sink_component(&buffer->audio_buffer, comp);
 }
 
-static inline void comp_buffer_reset_sink_list(struct comp_buffer *buffer)
+static inline
+struct comp_buffer *buffer_from_list(struct list_item *ptr, int dir)
 {
-	list_init(&buffer->sink_list);
+	struct sof_audio_buffer *audio_buffer = audio_buffer_from_list(ptr, dir);
+	return comp_buffer_from_audio_buffer(audio_buffer);
 }
 
 /* Only to be used for synchronous same-core notifications! */
@@ -195,11 +193,6 @@ struct buffer_cb_free {
 	struct comp_buffer *buffer;
 };
 
-#define buffer_from_list(ptr, dir) \
-	((dir) == PPL_DIR_DOWNSTREAM ? \
-	 container_of(ptr, struct comp_buffer, source_list) : \
-	 container_of(ptr, struct comp_buffer, sink_list))
-
 #define buffer_set_cb(buffer, func, data, type) \
 	do {				\
 		buffer->cb = func;	\
@@ -270,23 +263,6 @@ static inline void buffer_stream_writeback(struct comp_buffer *buffer, uint32_t
 #endif
 }
 
-
-/*
- * Attach a new buffer at the beginning of the list. Note, that "head" must
- * really be the head of the list, not a list head within another buffer. We
- * don't synchronise its cache, so it must not be embedded in an object, using
- * the coherent API. The caller takes care to protect list heads.
- */
-void buffer_attach(struct comp_buffer *buffer, struct list_item *head, int dir);
-
-/*
- * Detach a buffer from anywhere in the list. "head" is again the head of the
- * list, we need it to verify, whether this buffer was the first or the last on
- * the list. Again it is assumed that the head's cache doesn't need to be
- * synchronized. The caller takes care to protect list heads.
- */
-void buffer_detach(struct comp_buffer *buffer, struct list_item *head, int dir);
-
 static inline struct comp_dev *buffer_get_comp(struct comp_buffer *buffer, int dir)
 {
 	struct comp_dev *comp = (dir == PPL_DIR_DOWNSTREAM) ?

src/include/sof/audio/component.h

@@ -640,22 +640,35 @@ struct comp_dev {
  * Get a pointer to the first comp_buffer object providing data to the component
  * The function will return NULL if there's no data provider
  */
-static inline struct comp_buffer *comp_dev_get_first_data_producer(struct comp_dev *component)
+static inline struct sof_audio_buffer *Xcomp_dev_get_first_data_producer(struct comp_dev *component)
 {
 	return list_is_empty(&component->bsource_list) ? NULL :
-	       list_first_item(&component->bsource_list, struct comp_buffer, sink_list);
+	       list_first_item(&component->bsource_list, struct sof_audio_buffer, Xsink_list);
+}
+
+static inline struct comp_buffer *comp_dev_get_first_data_producer(struct comp_dev *component)
+{
+	struct sof_audio_buffer *audio_buffer = Xcomp_dev_get_first_data_producer(component);
+	return comp_buffer_from_audio_buffer(audio_buffer);
 }
 
 /**
  * Get a pointer to the next comp_buffer object providing data to the component
  * The function will return NULL if there're no more data providers
  * _save version also checks if producer != NULL
  */
+static inline struct sof_audio_buffer *Xcomp_dev_get_next_data_producer(struct comp_dev *component,
+								        struct sof_audio_buffer *producer)
+{
+	return producer->Xsink_list.next == &component->bsource_list ? NULL :
+	       list_item(producer->Xsink_list.next, struct sof_audio_buffer, Xsink_list);
+	return NULL;
+}
 static inline struct comp_buffer *comp_dev_get_next_data_producer(struct comp_dev *component,
 								  struct comp_buffer *producer)
 {
-	return producer->sink_list.next == &component->bsource_list ? NULL :
-	       list_item(producer->sink_list.next, struct comp_buffer, sink_list);
+	struct sof_audio_buffer *audio_buffer = Xcomp_dev_get_next_data_producer(component, &producer->audio_buffer);
+	return comp_buffer_from_audio_buffer(audio_buffer);
 }
 
 static inline struct comp_buffer *comp_dev_get_next_data_producer_safe(struct comp_dev *component,
@@ -668,22 +681,36 @@ static inline struct comp_buffer *comp_dev_get_next_data_producer_safe(struct co
  * Get a pointer to the first comp_buffer object receiving data from the component
  * The function will return NULL if there's no data consumers
  */
-static inline struct comp_buffer *comp_dev_get_first_data_consumer(struct comp_dev *component)
+static inline struct sof_audio_buffer *Xcomp_dev_get_first_data_consumer(struct comp_dev *component)
 {
 	return list_is_empty(&component->bsink_list) ? NULL :
-	       list_first_item(&component->bsink_list, struct comp_buffer, source_list);
+	       list_first_item(&component->bsink_list, struct sof_audio_buffer, Xsource_list);
 }
 
+static inline struct comp_buffer *comp_dev_get_first_data_consumer(struct comp_dev *component)
+{
+	struct sof_audio_buffer *audio_buffer = Xcomp_dev_get_first_data_consumer(component);
+	return comp_buffer_from_audio_buffer(audio_buffer);
+}
+
+
 /**
  * Get a pointer to the next comp_buffer object receiving data from the component
  * The function will return NULL if there're no more data consumers
  * _safe version also checks if consumer is != NULL
  */
+static inline struct sof_audio_buffer *Xcomp_dev_get_next_data_consumer(struct comp_dev *component,
+								  struct sof_audio_buffer *consumer)
+{
+	return consumer->Xsource_list.next == &component->bsink_list ? NULL :
+			list_item(consumer->Xsource_list.next, struct sof_audio_buffer, Xsource_list);
+}
+
 static inline struct comp_buffer *comp_dev_get_next_data_consumer(struct comp_dev *component,
 								  struct comp_buffer *consumer)
 {
-	return consumer->source_list.next == &component->bsink_list ? NULL :
-			list_item(consumer->source_list.next, struct comp_buffer, source_list);
+	struct sof_audio_buffer *audio_buffer = Xcomp_dev_get_next_data_consumer(component, &consumer->audio_buffer);
+	return comp_buffer_from_audio_buffer(audio_buffer);
 }
 
 static inline struct comp_buffer *comp_dev_get_next_data_consumer_safe(struct comp_dev *component,

src/ipc/ipc-helper.c

@@ -305,15 +305,15 @@ int ipc_comp_free(struct ipc *ipc, uint32_t comp_id)
 
 	irq_local_disable(flags);
 	comp_dev_for_each_producer_safe(icd->cd, buffer, safe) {
-		comp_buffer_set_sink_component(buffer, NULL);
+		audio_buffer_set_sink_component(&buffer->audio_buffer, NULL);
 		/* This breaks the list, but we anyway delete all buffers */
-		comp_buffer_reset_sink_list(buffer);
+		audio_buffer_reset_sink_list(&buffer->audio_buffer);
 	}
 
 	comp_dev_for_each_consumer_safe(icd->cd, buffer, safe) {
 		comp_buffer_set_source_component(buffer, NULL);
 		/* This breaks the list, but we anyway delete all buffers */
-		comp_buffer_reset_source_list(buffer);
+		audio_buffer_reset_source_list(&buffer->audio_buffer);
 	}
 
 	irq_local_enable(flags);