michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: stm32: prevent stop/data-bits HW support code duplication

Browse source 
Preventing code duplication of macros checking for HW support on
stop bits and data-bits during runtime configuration.
Validated runtime configuration on an STM32H743.

Signed-off-by: Jeroen van Dooren <jeroen.van.dooren@nobleo.nl>
This commit is contained in:
Jeroen van Dooren 2023-02-06 09:39:37 +01:00 • committed by Carles Cufí
commit 250e1f93ca
1 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
drivers/serial/uart_stm32.c
View file

@ -310,12 +310,19 @@ static inline enum uart_config_parity uart_stm32_ll2cfg_parity(uint32_t parity)
} }
} }
static inline uint32_t uart_stm32_cfg2ll_stopbits(enum uart_config_stop_bits sb) static inline uint32_t uart_stm32_cfg2ll_stopbits(const struct uart_stm32_config *config,
enum uart_config_stop_bits sb)
{ {
switch (sb) { switch (sb) {
/* Some MCU's don't support 0.5 stop bits */ /* Some MCU's don't support 0.5 stop bits */
#ifdef LL_USART_STOPBITS_0_5 #ifdef LL_USART_STOPBITS_0_5
case UART_CFG_STOP_BITS_0_5: case UART_CFG_STOP_BITS_0_5:
#if HAS_LPUART_1
if (IS_LPUART_INSTANCE(config->usart)) {
/* return the default */
return LL_USART_STOPBITS_1;
}
#endif /* HAS_LPUART_1 */
return LL_USART_STOPBITS_0_5; return LL_USART_STOPBITS_0_5;
#endif /* LL_USART_STOPBITS_0_5 */ #endif /* LL_USART_STOPBITS_0_5 */
case UART_CFG_STOP_BITS_1: case UART_CFG_STOP_BITS_1:
@ -323,6 +330,12 @@ static inline uint32_t uart_stm32_cfg2ll_stopbits(enum uart_config_stop_bits sb)
/* Some MCU's don't support 1.5 stop bits */ /* Some MCU's don't support 1.5 stop bits */
#ifdef LL_USART_STOPBITS_1_5 #ifdef LL_USART_STOPBITS_1_5
case UART_CFG_STOP_BITS_1_5: case UART_CFG_STOP_BITS_1_5:
#if HAS_LPUART_1
if (IS_LPUART_INSTANCE(config->usart)) {
/* return the default */
return LL_USART_STOPBITS_2;
}
#endif
return LL_USART_STOPBITS_1_5; return LL_USART_STOPBITS_1_5;
#endif /* LL_USART_STOPBITS_1_5 */ #endif /* LL_USART_STOPBITS_1_5 */
case UART_CFG_STOP_BITS_2: case UART_CFG_STOP_BITS_2:
@ -455,7 +468,7 @@ static int uart_stm32_configure(const struct device *dev,
const struct uart_stm32_config *config = dev->config; const struct uart_stm32_config *config = dev->config;
struct uart_stm32_data *data = dev->data; struct uart_stm32_data *data = dev->data;
const uint32_t parity = uart_stm32_cfg2ll_parity(cfg->parity); const uint32_t parity = uart_stm32_cfg2ll_parity(cfg->parity);
const uint32_t stopbits = uart_stm32_cfg2ll_stopbits(cfg->stop_bits); const uint32_t stopbits = uart_stm32_cfg2ll_stopbits(config, cfg->stop_bits);
const uint32_t databits = uart_stm32_cfg2ll_databits(cfg->data_bits, const uint32_t databits = uart_stm32_cfg2ll_databits(cfg->data_bits,
cfg->parity); cfg->parity);
const uint32_t flowctrl = uart_stm32_cfg2ll_hwctrl(cfg->flow_ctrl); const uint32_t flowctrl = uart_stm32_cfg2ll_hwctrl(cfg->flow_ctrl);
@ -475,35 +488,17 @@ static int uart_stm32_configure(const struct device *dev,
return -ENOTSUP; return -ENOTSUP;
} }
#if defined(LL_USART_STOPBITS_0_5) && HAS_LPUART_1 /* When the transformed ll stop bits don't match with what was requested, then it's not
if (IS_LPUART_INSTANCE(config->usart) && * supported
(cfg->stop_bits == UART_CFG_STOP_BITS_0_5)) { */
if (uart_stm32_ll2cfg_stopbits(stopbits) != cfg->stop_bits) {
return -ENOTSUP; return -ENOTSUP;
} }
#else
if (cfg->stop_bits == UART_CFG_STOP_BITS_0_5) {
return -ENOTSUP;
}
#endif
#if defined(LL_USART_STOPBITS_1_5) && HAS_LPUART_1 /* When the transformed ll databits don't match with what was requested, then it's not
if (IS_LPUART_INSTANCE(config->usart) && * supported
(cfg->stop_bits == UART_CFG_STOP_BITS_1_5)) { */
return -ENOTSUP; if (uart_stm32_ll2cfg_databits(databits, parity) != cfg->data_bits) {
}
#else
if (cfg->stop_bits == UART_CFG_STOP_BITS_1_5) {
return -ENOTSUP;
}
#endif
/* Driver doesn't support 5 or 6 databits and potentially 7 or 9 */
if ((cfg->data_bits == UART_CFG_DATA_BITS_5) ||
(cfg->data_bits == UART_CFG_DATA_BITS_6)
#ifndef LL_USART_DATAWIDTH_7B
|| (cfg->data_bits == UART_CFG_DATA_BITS_7)
#endif /* LL_USART_DATAWIDTH_7B */
|| (cfg->data_bits == UART_CFG_DATA_BITS_9)) {
return -ENOTSUP; return -ENOTSUP;
} }