From 14022083b262bd87020594b479247c740142c5c2 Mon Sep 17 00:00:00 2001 From: Jakub Rzeszutko Date: Mon, 7 Dec 2020 12:18:41 +0100 Subject: [PATCH] shell: internal api update: uart backend Add prefix Z_ to internal macros. Remove obsolete and not used macros. Signed-off-by: Jakub Rzeszutko --- include/shell/shell_uart.h | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/include/shell/shell_uart.h b/include/shell/shell_uart.h index 6e3e29b8289..c05b84e154a 100644 --- a/include/shell/shell_uart.h +++ b/include/shell/shell_uart.h @@ -31,24 +31,19 @@ struct shell_uart_ctrl_blk { }; #ifdef CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN -#define UART_SHELL_TX_RINGBUF_DECLARE(_name, _size) \ +#define Z_UART_SHELL_TX_RINGBUF_DECLARE(_name, _size) \ RING_BUF_DECLARE(_name##_tx_ringbuf, _size) -#define UART_SHELL_TX_BUF_DECLARE(_name) \ - uint8_t _name##_txbuf[SHELL_UART_TX_BUF_SIZE] +#define Z_UART_SHELL_RX_TIMER_DECLARE(_name) /* Empty */ +#define Z_UART_SHELL_TX_RINGBUF_PTR(_name) (&_name##_tx_ringbuf) -#define UART_SHELL_RX_TIMER_DECLARE(_name) /* Empty */ - -#define UART_SHELL_TX_RINGBUF_PTR(_name) (&_name##_tx_ringbuf) - -#define UART_SHELL_RX_TIMER_PTR(_name) NULL +#define Z_UART_SHELL_RX_TIMER_PTR(_name) NULL #else /* CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN */ -#define UART_SHELL_TX_RINGBUF_DECLARE(_name, _size) /* Empty */ -#define UART_SHELL_TX_BUF_DECLARE(_name) /* Empty */ -#define UART_SHELL_RX_TIMER_DECLARE(_name) static struct k_timer _name##_timer -#define UART_SHELL_TX_RINGBUF_PTR(_name) NULL -#define UART_SHELL_RX_TIMER_PTR(_name) (&_name##_timer) +#define Z_UART_SHELL_TX_RINGBUF_DECLARE(_name, _size) /* Empty */ +#define Z_UART_SHELL_RX_TIMER_DECLARE(_name) static struct k_timer _name##_timer +#define Z_UART_SHELL_TX_RINGBUF_PTR(_name) NULL +#define Z_UART_SHELL_RX_TIMER_PTR(_name) (&_name##_timer) #endif /* CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN */ /** @brief Shell UART transport instance structure. */ @@ -62,13 +57,13 @@ struct shell_uart { /** @brief Macro for creating shell UART transport instance. */ #define SHELL_UART_DEFINE(_name, _tx_ringbuf_size, _rx_ringbuf_size) \ static struct shell_uart_ctrl_blk _name##_ctrl_blk; \ - UART_SHELL_RX_TIMER_DECLARE(_name); \ - UART_SHELL_TX_RINGBUF_DECLARE(_name, _tx_ringbuf_size); \ + Z_UART_SHELL_RX_TIMER_DECLARE(_name); \ + Z_UART_SHELL_TX_RINGBUF_DECLARE(_name, _tx_ringbuf_size); \ RING_BUF_DECLARE(_name##_rx_ringbuf, _rx_ringbuf_size); \ static const struct shell_uart _name##_shell_uart = { \ .ctrl_blk = &_name##_ctrl_blk, \ - .timer = UART_SHELL_RX_TIMER_PTR(_name), \ - .tx_ringbuf = UART_SHELL_TX_RINGBUF_PTR(_name), \ + .timer = Z_UART_SHELL_RX_TIMER_PTR(_name), \ + .tx_ringbuf = Z_UART_SHELL_TX_RINGBUF_PTR(_name), \ .rx_ringbuf = &_name##_rx_ringbuf, \ }; \ struct shell_transport _name = { \