From 62ddd5fe797c3292005d65bf79e1f83b0e635175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Ansgariusson?= Date: Wed, 25 Dec 2024 14:11:19 +0100 Subject: [PATCH] drivers: i2s: Rename struct ring_buf -> struct ring_buffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The struct ring_buf is renamed to struct ring_buffer to be able to coexist with the sys/ring_buffer.h header file. Signed-off-by: Måns Ansgariusson --- drivers/i2s/i2s_litex.c | 4 ++-- drivers/i2s/i2s_litex.h | 4 ++-- drivers/i2s/i2s_ll_stm32.c | 6 +++--- drivers/i2s/i2s_ll_stm32.h | 4 ++-- drivers/i2s/i2s_sam_ssc.c | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/i2s/i2s_litex.c b/drivers/i2s/i2s_litex.c index 06bc4d5bc1d..4e759e6755f 100644 --- a/drivers/i2s/i2s_litex.c +++ b/drivers/i2s/i2s_litex.c @@ -260,7 +260,7 @@ static void i2s_copy_to_fifo(uint8_t *src, size_t size, int sample_width, /* * Get data from the queue */ -static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) +static int queue_get(struct ring_buffer *rb, void **mem_block, size_t *size) { unsigned int key; @@ -282,7 +282,7 @@ static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) /* * Put data in the queue */ -static int queue_put(struct ring_buf *rb, void *mem_block, size_t size) +static int queue_put(struct ring_buffer *rb, void *mem_block, size_t size) { uint16_t head_next; unsigned int key; diff --git a/drivers/i2s/i2s_litex.h b/drivers/i2s/i2s_litex.h index c373371cf9a..9fcae9f98c5 100644 --- a/drivers/i2s/i2s_litex.h +++ b/drivers/i2s/i2s_litex.h @@ -70,7 +70,7 @@ struct queue_item { }; /* Minimal ring buffer implementation */ -struct ring_buf { +struct ring_buffer { struct queue_item *buf; uint16_t len; uint16_t head; @@ -81,7 +81,7 @@ struct stream { int32_t state; struct k_sem sem; struct i2s_config cfg; - struct ring_buf mem_block_queue; + struct ring_buffer mem_block_queue; void *mem_block; }; diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c index 24df83639a4..072e751ea74 100644 --- a/drivers/i2s/i2s_ll_stm32.c +++ b/drivers/i2s/i2s_ll_stm32.c @@ -30,7 +30,7 @@ static unsigned int div_round_closest(uint32_t dividend, uint32_t divisor) return (dividend + (divisor / 2U)) / divisor; } -static bool queue_is_empty(struct ring_buf *rb) +static bool queue_is_empty(struct ring_buffer *rb) { unsigned int key; @@ -50,7 +50,7 @@ static bool queue_is_empty(struct ring_buf *rb) /* * Get data from the queue */ -static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) +static int queue_get(struct ring_buffer *rb, void **mem_block, size_t *size) { unsigned int key; @@ -73,7 +73,7 @@ static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) /* * Put data in the queue */ -static int queue_put(struct ring_buf *rb, void *mem_block, size_t size) +static int queue_put(struct ring_buffer *rb, void *mem_block, size_t size) { uint16_t head_next; unsigned int key; diff --git a/drivers/i2s/i2s_ll_stm32.h b/drivers/i2s/i2s_ll_stm32.h index 1f9d0eb0113..5c4d06b6880 100644 --- a/drivers/i2s/i2s_ll_stm32.h +++ b/drivers/i2s/i2s_ll_stm32.h @@ -13,7 +13,7 @@ struct queue_item { }; /* Minimal ring buffer implementation */ -struct ring_buf { +struct ring_buffer { struct queue_item *buf; uint16_t len; uint16_t head; @@ -44,7 +44,7 @@ struct stream { bool tx_stop_for_drain; struct i2s_config cfg; - struct ring_buf mem_block_queue; + struct ring_buffer mem_block_queue; void *mem_block; bool last_block; bool master; diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c index f96bb34d6d4..cabf8ec64c1 100644 --- a/drivers/i2s/i2s_sam_ssc.c +++ b/drivers/i2s/i2s_sam_ssc.c @@ -58,7 +58,7 @@ struct queue_item { }; /* Minimal ring buffer implementation */ -struct ring_buf { +struct ring_buffer { struct queue_item *buf; uint16_t len; uint16_t head; @@ -83,7 +83,7 @@ struct stream { uint8_t word_size_bytes; bool last_block; struct i2s_config cfg; - struct ring_buf mem_block_queue; + struct ring_buffer mem_block_queue; void *mem_block; int (*stream_start)(struct stream *, Ssc *const, const struct device *); @@ -113,7 +113,7 @@ static void tx_stream_disable(struct stream *, Ssc *const, /* * Get data from the queue */ -static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) +static int queue_get(struct ring_buffer *rb, void **mem_block, size_t *size) { unsigned int key; @@ -137,7 +137,7 @@ static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size) /* * Put data in the queue */ -static int queue_put(struct ring_buf *rb, void *mem_block, size_t size) +static int queue_put(struct ring_buffer *rb, void *mem_block, size_t size) { uint16_t head_next; unsigned int key;