Skip to content

driver: uart-stm32: add line_ctrl_set/get support #8306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

driver: uart-stm32: add line_ctrl_set/get support #8306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 105 additions & 35 deletions drivers/serial/uart_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,27 +240,6 @@ static void uart_stm32_isr(void *arg)

#endif /* CONFIG_UART_INTERRUPT_DRIVEN */

static const struct uart_driver_api uart_stm32_driver_api = {
.poll_in = uart_stm32_poll_in,
.poll_out = uart_stm32_poll_out,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.fifo_fill = uart_stm32_fifo_fill,
.fifo_read = uart_stm32_fifo_read,
.irq_tx_enable = uart_stm32_irq_tx_enable,
.irq_tx_disable = uart_stm32_irq_tx_disable,
.irq_tx_ready = uart_stm32_irq_tx_ready,
.irq_tx_complete = uart_stm32_irq_tx_complete,
.irq_rx_enable = uart_stm32_irq_rx_enable,
.irq_rx_disable = uart_stm32_irq_rx_disable,
.irq_rx_ready = uart_stm32_irq_rx_ready,
.irq_err_enable = uart_stm32_irq_err_enable,
.irq_err_disable = uart_stm32_irq_err_disable,
.irq_is_pending = uart_stm32_irq_is_pending,
.irq_update = uart_stm32_irq_update,
.irq_callback_set = uart_stm32_irq_callback_set,
#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
};

static void uart_stm32_usart_set_baud_rate(struct device *dev,
u32_t clock_rate, u32_t baud_rate)
{
Expand Down Expand Up @@ -292,6 +271,108 @@ static void uart_stm32_lpuart_set_baud_rate(struct device *dev,
}
#endif

static inline void uart_stm32_set_baud_rate(struct device *dev,
u32_t clock_rate, u32_t baud_rate)
{
#ifdef CONFIG_UART_STM32_LPUART_1
USART_TypeDef * UartInstance = UART_STRUCT(dev);

if (IS_LPUART_INSTANCE(UartInstance)) {
uart_stm32_lpuart_set_baud_rate(dev, clock_rate, baud_rate);
} else {
uart_stm32_usart_set_baud_rate(dev, clock_rate, baud_rate);
}
#else
uart_stm32_usart_set_baud_rate(dev, clock_rate, baud_rate);
#endif
}

#ifdef CONFIG_UART_LINE_CTRL
static int uart_stm32_line_ctrl_set(struct device *dev,
u32_t ctrl, u32_t val)
{
USART_TypeDef *UartInstance = UART_STRUCT(dev);
struct uart_stm32_data *data = DEV_DATA(dev);
int result = 0;

LL_USART_Disable(UartInstance);

switch (ctrl) {
case LINE_CTRL_BAUD_RATE:
Copy link
Member

@erwango erwango Jun 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not store information in baud_rate which is used to hold start-up configuration.
I propose you update registers directly.

uart_stm32_set_baud_rate(dev, data->clock_rate, val);
data->baud_rate = val;
break;
case LINE_CTRL_RTS:
if (!IS_UART_HWFLOW_INSTANCE(UartInstance)) {
result = -ENOTSUP;
goto done;
} else if (val) {
LL_USART_SetHWFlowCtrl(UartInstance,
LL_USART_HWCONTROL_RTS_CTS);
} else {
LL_USART_SetHWFlowCtrl(UartInstance,
LL_USART_HWCONTROL_NONE);
}
break;
default:
result = -EINVAL;
break;
}

done:
LL_USART_Enable(UartInstance);
return result;
}

static int uart_stm32_line_ctrl_get(struct device *dev,
u32_t ctrl, u32_t *val)
{
USART_TypeDef *UartInstance = UART_STRUCT(dev);
struct uart_stm32_data *data = DEV_DATA(dev);

switch (ctrl) {
case LINE_CTRL_BAUD_RATE:
*val = data->baud_rate;
return 0;
case LINE_CTRL_RTS:
if (!IS_UART_HWFLOW_INSTANCE(UartInstance)) {
return -EINVAL;
}

*val = (LL_USART_GetHWFlowCtrl(UartInstance)
== LL_USART_HWCONTROL_RTS_CTS);
return 0;
}

return -ENOTSUP;
}
#endif /* CONFIG_UART_LINE_CTRL */

static const struct uart_driver_api uart_stm32_driver_api = {
.poll_in = uart_stm32_poll_in,
.poll_out = uart_stm32_poll_out,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.fifo_fill = uart_stm32_fifo_fill,
.fifo_read = uart_stm32_fifo_read,
.irq_tx_enable = uart_stm32_irq_tx_enable,
.irq_tx_disable = uart_stm32_irq_tx_disable,
.irq_tx_ready = uart_stm32_irq_tx_ready,
.irq_tx_complete = uart_stm32_irq_tx_complete,
.irq_rx_enable = uart_stm32_irq_rx_enable,
.irq_rx_disable = uart_stm32_irq_rx_disable,
.irq_rx_ready = uart_stm32_irq_rx_ready,
.irq_err_enable = uart_stm32_irq_err_enable,
.irq_err_disable = uart_stm32_irq_err_disable,
.irq_is_pending = uart_stm32_irq_is_pending,
.irq_update = uart_stm32_irq_update,
.irq_callback_set = uart_stm32_irq_callback_set,
#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
#ifdef CONFIG_UART_LINE_CTRL
.line_ctrl_set = uart_stm32_line_ctrl_set,
.line_ctrl_get = uart_stm32_line_ctrl_get,
#endif /* CONFIG_UART_LINE_CTRL */
};

/**
* @brief Initialize UART channel
*
Expand All @@ -308,9 +389,6 @@ static int uart_stm32_init(struct device *dev)
struct uart_stm32_data *data = DEV_DATA(dev);
USART_TypeDef *UartInstance = UART_STRUCT(dev);

u32_t baud_rate = config->baud_rate;
u32_t clock_rate;

__uart_stm32_get_clock(dev);
/* enable clock */
clock_control_on(data->clock,
Expand All @@ -331,17 +409,9 @@ static int uart_stm32_init(struct device *dev)
/* Get clock rate */
clock_control_get_rate(data->clock,
(clock_control_subsys_t *)&config->pclken,
&clock_rate);
&data->clock_rate);

#ifdef CONFIG_UART_STM32_LPUART_1
if (IS_LPUART_INSTANCE(UartInstance)) {
uart_stm32_lpuart_set_baud_rate(dev, clock_rate, baud_rate);
} else {
uart_stm32_usart_set_baud_rate(dev, clock_rate, baud_rate);
}
#else
uart_stm32_usart_set_baud_rate(dev, clock_rate, baud_rate);
#endif
uart_stm32_set_baud_rate(dev, data->clock_rate, data->baud_rate);

LL_USART_Enable(UartInstance);

Expand Down Expand Up @@ -397,10 +467,10 @@ static const struct uart_stm32_config uart_stm32_cfg_##name = { \
STM32_UART_IRQ_HANDLER_FUNC(name) \
}, \
STM32_CLOCK_UART(clock_bus, clock_enr), \
.baud_rate = CONFIG_UART_STM32_##name##_BAUD_RATE \
}; \
\
static struct uart_stm32_data uart_stm32_data_##name = { \
.baud_rate = CONFIG_UART_STM32_##name##_BAUD_RATE, \
}; \
\
DEVICE_AND_API_INIT(uart_stm32_##name, CONFIG_UART_STM32_##name##_NAME, \
Expand Down
5 changes: 3 additions & 2 deletions drivers/serial/uart_stm32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ struct uart_stm32_config {
struct uart_device_config uconf;
/* clock subsystem driving this peripheral */
struct stm32_pclken pclken;
/* Baud rate */
u32_t baud_rate;
};

/* driver data */
struct uart_stm32_data {
/* clock device */
struct device *clock;
u32_t clock_rate;
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
uart_irq_callback_user_data_t user_cb;
void *user_data;
#endif
/* Baud rate */
u32_t baud_rate;
};

#endif /* ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_ */