Skip to content

feat[STM32][USART]: add uart error callback support #11328

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

Open
wdfk-prog wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −9
Open

feat[STM32][USART]: add uart error callback support #11328

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
35 changes: 27 additions & 8 deletions bsp/stm32/libraries/HAL_Drivers/drivers/drv_usart_v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,25 +280,39 @@ static rt_err_t stm32_control(struct rt_serial_device *serial, int cmd, void *ar
{
#ifdef RT_SERIAL_USING_DMA
stm32_dma_config(serial, ctrl_arg);
#else
return -RT_ENOSYS;
#endif
}
else
stm32_control(serial, RT_DEVICE_CTRL_SET_INT, (void *)ctrl_arg);
{
return stm32_control(serial, RT_DEVICE_CTRL_SET_INT, (void *)ctrl_arg);
}
break;

case RT_DEVICE_CHECK_OPTMODE: {
case RT_DEVICE_CHECK_OPTMODE:
{
if (ctrl_arg & RT_DEVICE_FLAG_DMA_TX)
return RT_SERIAL_TX_BLOCKING_NO_BUFFER;
else
return RT_SERIAL_TX_BLOCKING_BUFFER;
}
case RT_DEVICE_CTRL_CLOSE:
{
uart->error_indicate = RT_NULL;
if (HAL_UART_DeInit(&(uart->handle)) != HAL_OK)
{
RT_ASSERT(0)
}
break;
}
case UART_CTRL_SET_ERROR_CALLBACK:
{
uart->error_indicate = (rt_err_t (*)(rt_device_t dev, rt_uint32_t error_code))arg;
break;
}
}

return RT_EOK;
}

Expand Down Expand Up @@ -1242,6 +1256,10 @@ void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
struct stm32_uart *uart = (struct stm32_uart *)huart;
LOG_D("%s: %s %d\n", __FUNCTION__, uart->config->name, huart->ErrorCode);
UNUSED(uart);
if(uart->error_indicate != RT_NULL)
{
uart->error_indicate(&uart->serial.parent, huart->ErrorCode);
}
}

/**
Expand Down Expand Up @@ -1304,12 +1322,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
#endif /* RT_SERIAL_USING_DMA */

static const struct rt_uart_ops stm32_uart_ops =
{
.configure = stm32_configure,
.control = stm32_control,
.putc = stm32_putc,
.getc = stm32_getc,
.transmit = stm32_transmit};
{
.configure = stm32_configure,
.control = stm32_control,
.putc = stm32_putc,
.getc = stm32_getc,
.transmit = stm32_transmit
};

int rt_hw_usart_init(void)
{
Expand Down
4 changes: 3 additions & 1 deletion bsp/stm32/libraries/HAL_Drivers/drivers/drv_usart_v2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ int rt_hw_usart_init(void);
#define UART_RX_DMA_IT_HT_FLAG 0x01
#define UART_RX_DMA_IT_TC_FLAG 0x02

#define UART_CTRL_SET_ERROR_CALLBACK 0x100

/* stm32 config class */
struct stm32_uart_config
Expand All @@ -66,7 +67,8 @@ struct stm32_uart
{
UART_HandleTypeDef handle;
struct stm32_uart_config *config;

/* device call back */
rt_err_t (*error_indicate)(rt_device_t dev, rt_uint32_t error_code);
#ifdef RT_SERIAL_USING_DMA
struct
{
Expand Down
Loading