modules/openthread/platform: update to new ring_buffer API

Move to use new ring_buffer_api.

Signed-off-by: Måns Ansgariusson <[email protected]>

Author: Mattemagikern

modules/openthread/Kconfig

@@ -206,7 +206,6 @@ config OPENTHREAD_MBEDTLS_LIB_NAME
 config OPENTHREAD_COPROCESSOR
 	bool "OpenThread Co-Processor"
 	select OPENTHREAD_MANUAL_START
-	select RING_BUFFER
 	select UART_INTERRUPT_DRIVEN
 	help
 	  Enable Co-Processor in OpenThread stack.

modules/openthread/platform/ble.c

@@ -57,7 +57,7 @@ static uint8_t ot_plat_ble_msg_buf[PLAT_BLE_MSG_DATA_MAX];
 
 static K_SEM_DEFINE(ot_plat_ble_init_semaphore, 0, 1);
 static K_SEM_DEFINE(ot_plat_ble_event_semaphore, 0, K_SEM_MAX_LIMIT);
-RING_BUF_DECLARE(ot_plat_ble_ring_buf, CONFIG_OPENTHREAD_BLE_TCAT_RING_BUF_SIZE);
+RING_BUFFER_DECLARE(ot_plat_ble_ring_buf, CONFIG_OPENTHREAD_BLE_TCAT_RING_BUF_SIZE);
 static K_THREAD_DEFINE(ot_plat_ble_tid, CONFIG_OPENTHREAD_BLE_TCAT_THREAD_STACK_SIZE,
 		       ot_plat_ble_thread, NULL, NULL, NULL, 5, 0, PLAT_BLE_THREAD_DEALY);
 
@@ -126,11 +126,11 @@ static bool ot_plat_ble_queue_msg(const uint8_t *aData, uint16_t aLen, int8_t aR
 
 	len = sizeof(aLen) + sizeof(aRssi) + ((aLen <= PLAT_BLE_MSG_DATA_MAX) ? aLen : 0);
 
-	if (ring_buf_space_get(&ot_plat_ble_ring_buf) >= len) {
-		ring_buf_put(&ot_plat_ble_ring_buf, (uint8_t *)&aLen, sizeof(aLen));
-		ring_buf_put(&ot_plat_ble_ring_buf, &aRssi, sizeof(aRssi));
+	if (ring_buffer_space(&ot_plat_ble_ring_buf) >= len) {
+		ring_buffer_write(&ot_plat_ble_ring_buf, (uint8_t *)&aLen, sizeof(aLen));
+		ring_buffer_write(&ot_plat_ble_ring_buf, &aRssi, sizeof(aRssi));
 		if (aLen <= PLAT_BLE_MSG_DATA_MAX) {
-			ring_buf_put(&ot_plat_ble_ring_buf, aData, aLen);
+			ring_buffer_write(&ot_plat_ble_ring_buf, aData, aLen);
 		}
 		k_sem_give(&ot_plat_ble_event_semaphore);
 	} else {
@@ -156,10 +156,10 @@ static void ot_plat_ble_thread(void *unused1, void *unused2, void *unused3)
 
 	while (1) {
 		k_sem_take(&ot_plat_ble_event_semaphore, K_FOREVER);
-		ring_buf_get(&ot_plat_ble_ring_buf, (uint8_t *)&len, sizeof(len));
-		ring_buf_get(&ot_plat_ble_ring_buf, &rssi, sizeof(rssi));
+		ring_buffer_read(&ot_plat_ble_ring_buf, (uint8_t *)&len, sizeof(len));
+		ring_buffer_read(&ot_plat_ble_ring_buf, &rssi, sizeof(rssi));
 		if (len <= PLAT_BLE_MSG_DATA_MAX) {
-			ring_buf_get(&ot_plat_ble_ring_buf, ot_plat_ble_msg_buf, len);
+			ring_buffer_read(&ot_plat_ble_ring_buf, ot_plat_ble_msg_buf, len);
 		}
 
 		openthread_mutex_lock();

modules/openthread/platform/uart.c

@@ -28,14 +28,14 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include "platform-zephyr.h"
 
 struct openthread_uart {
-	struct ring_buf *rx_ringbuf;
+	struct ring_buffer *rx_ringbuf;
 	const struct device *dev;
 	atomic_t tx_busy;
 	atomic_t tx_finished;
 };
 
 #define OT_UART_DEFINE(_name, _ringbuf_size) \
-	RING_BUF_DECLARE(_name##_rx_ringbuf, _ringbuf_size); \
+	RING_BUFFER_DECLARE(_name##_rx_ringbuf, _ringbuf_size); \
 	static struct openthread_uart _name = { \
 		.rx_ringbuf = &_name##_rx_ringbuf, \
 	}
@@ -56,19 +56,14 @@ static void uart_rx_handle(const struct device *dev)
 	bool new_data = false;
 
 	do {
-		len = ring_buf_put_claim(
-			ot_uart.rx_ringbuf, &data,
-			ot_uart.rx_ringbuf->size);
+		len = ring_buffer_write_ptr(ot_uart.rx_ringbuf, &data);
 		if (len > 0) {
 			rd_len = uart_fifo_read(dev, data, len);
 			if (rd_len > 0) {
 				new_data = true;
 			}
 
-			int err = ring_buf_put_finish(
-				ot_uart.rx_ringbuf, rd_len);
-			(void)err;
-			__ASSERT_NO_MSG(err == 0);
+			ring_buffer_commit(ot_uart.rx_ringbuf, rd_len);
 		} else {
 			uint8_t dummy;
 
@@ -133,18 +128,9 @@ void platformUartProcess(otInstance *aInstance)
 	const uint8_t *data;
 
 	/* Process UART RX */
-	while ((len = ring_buf_get_claim(
-			ot_uart.rx_ringbuf,
-			(uint8_t **)&data,
-			ot_uart.rx_ringbuf->size)) > 0) {
-		int err;
-
+	while ((len = ring_buffer_write_ptr(ot_uart.rx_ringbuf, (uint8_t **)&data)) > 0) {
 		otPlatUartReceived(data, len);
-		err = ring_buf_get_finish(
-				ot_uart.rx_ringbuf,
-				len);
-		(void)err;
-		__ASSERT_NO_MSG(err == 0);
+		ring_buffer_consume(ot_uart.rx_ringbuf, len);
 	}
 
 	/* Process UART TX */