libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[BSP] Enhanced stm32f10x serial DMA rx driver reliability.

This commit is contained in:
armink 2017-03-17 16:45:23 +08:00
parent cebbee7908
commit 82930906a2
1 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
bsp/stm32f10x/drivers/usart.c
View File

@ -48,15 +48,18 @@ struct stm32_uart
{ {
USART_TypeDef *uart_device; USART_TypeDef *uart_device;
IRQn_Type irq; IRQn_Type irq;
struct stm32_uart_dma { struct stm32_uart_dma
{
/* dma channel */ /* dma channel */
DMA_Channel_TypeDef *rx_ch; DMA_Channel_TypeDef *rx_ch;
/* dma global flag */ /* dma global flag */
uint32_t rx_gl_flag; uint32_t rx_gl_flag;
/* dma irq channel */ /* dma irq channel */
uint8_t rx_irq_ch; uint8_t rx_irq_ch;
/* setting receive len */
rt_size_t setting_recv_len;
/* last receive index */ /* last receive index */
rt_size_t last_recv_len; rt_size_t last_recv_index;
} dma; } dma;
}; };
@ -145,15 +148,15 @@ static int stm32_putc(struct rt_serial_device *serial, char c)
RT_ASSERT(serial != RT_NULL); RT_ASSERT(serial != RT_NULL);
uart = (struct stm32_uart *)serial->parent.user_data; uart = (struct stm32_uart *)serial->parent.user_data;
if(serial->parent.open_flag & RT_DEVICE_FLAG_INT_TX) if (serial->parent.open_flag & RT_DEVICE_FLAG_INT_TX)
{ {
if(!(uart->uart_device->SR & USART_FLAG_TXE)) if (!(uart->uart_device->SR & USART_FLAG_TXE))
{ {
USART_ITConfig(uart->uart_device, USART_IT_TC, ENABLE); USART_ITConfig(uart->uart_device, USART_IT_TC, ENABLE);
return -1; return -1;
} }
uart->uart_device->DR = c; uart->uart_device->DR = c;
USART_ITConfig(uart->uart_device, USART_IT_TC, ENABLE); USART_ITConfig(uart->uart_device, USART_IT_TC, ENABLE);
} }
else else
{ {
@ -188,24 +191,31 @@ static int stm32_getc(struct rt_serial_device *serial)
*/ */
static void dma_uart_rx_idle_isr(struct rt_serial_device *serial) { static void dma_uart_rx_idle_isr(struct rt_serial_device *serial) {
struct stm32_uart *uart = (struct stm32_uart *) serial->parent.user_data; struct stm32_uart *uart = (struct stm32_uart *) serial->parent.user_data;
rt_size_t recv_total_len, recv_len; rt_size_t recv_total_index, recv_len;
/* disable dma, stop receive data */ rt_base_t level;
DMA_Cmd(uart->dma.rx_ch, DISABLE);
recv_total_len = serial->config.bufsz - DMA_GetCurrDataCounter(uart->dma.rx_ch); /* disable interrupt */
if (recv_total_len > uart->dma.last_recv_len) { level = rt_hw_interrupt_disable();
recv_len = recv_total_len - uart->dma.last_recv_len;
} else { recv_total_index = uart->dma.setting_recv_len - DMA_GetCurrDataCounter(uart->dma.rx_ch);
recv_len = recv_total_len; if (recv_total_index >= uart->dma.last_recv_index)
{
recv_len = recv_total_index - uart->dma.last_recv_index;
}
else
{
recv_len = uart->dma.setting_recv_len - uart->dma.last_recv_index + recv_total_index;
} }
uart->dma.last_recv_len = recv_total_len;
rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8)); uart->dma.last_recv_index = recv_total_index;
/* enable interrupt */
rt_hw_interrupt_enable(level);
if (recv_len) rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8));
/* read a data for clear receive idle interrupt flag */ /* read a data for clear receive idle interrupt flag */
USART_ReceiveData(uart->uart_device); USART_ReceiveData(uart->uart_device);
DMA_ClearFlag(uart->dma.rx_gl_flag); DMA_ClearFlag(uart->dma.rx_gl_flag);
DMA_Cmd(uart->dma.rx_ch, ENABLE);
} }
/** /**
@ -215,24 +225,29 @@ static void dma_uart_rx_idle_isr(struct rt_serial_device *serial) {
*/ */
static void dma_rx_done_isr(struct rt_serial_device *serial) { static void dma_rx_done_isr(struct rt_serial_device *serial) {
struct stm32_uart *uart = (struct stm32_uart *) serial->parent.user_data; struct stm32_uart *uart = (struct stm32_uart *) serial->parent.user_data;
rt_size_t recv_total_len, recv_len; rt_size_t recv_total_index, recv_len;
/* disable dma, stop receive data */ rt_base_t level;
DMA_Cmd(uart->dma.rx_ch, DISABLE);
recv_total_len = serial->config.bufsz - DMA_GetCurrDataCounter(uart->dma.rx_ch); /* disable interrupt */
if (recv_total_len > uart->dma.last_recv_len) { level = rt_hw_interrupt_disable();
recv_len = recv_total_len - uart->dma.last_recv_len;
} else { recv_total_index = uart->dma.setting_recv_len - DMA_GetCurrDataCounter(uart->dma.rx_ch);
recv_len = recv_total_len; if (recv_total_index >= uart->dma.last_recv_index)
{
recv_len = recv_total_index - uart->dma.last_recv_index;
}
else
{
recv_len = uart->dma.setting_recv_len - uart->dma.last_recv_index + recv_total_index;
} }
uart->dma.last_recv_len = recv_total_len;
rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8)); uart->dma.last_recv_index = recv_total_index;
/* enable interrupt */
rt_hw_interrupt_enable(level);
if (recv_len) rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8));
DMA_ClearFlag(uart->dma.rx_gl_flag); DMA_ClearFlag(uart->dma.rx_gl_flag);
/* reload */
DMA_SetCurrDataCounter(uart->dma.rx_ch, serial->config.bufsz);
DMA_Cmd(uart->dma.rx_ch, ENABLE);
} }
/** /**
@ -527,6 +542,8 @@ static void DMA_Configuration(struct rt_serial_device *serial) {
DMA_InitTypeDef DMA_InitStructure; DMA_InitTypeDef DMA_InitStructure;
NVIC_InitTypeDef NVIC_InitStructure; NVIC_InitTypeDef NVIC_InitStructure;
uart->dma.setting_recv_len = serial->config.bufsz;
/* enable transmit idle interrupt */ /* enable transmit idle interrupt */
USART_ITConfig(uart->uart_device, USART_IT_IDLE , ENABLE); USART_ITConfig(uart->uart_device, USART_IT_IDLE , ENABLE);
@ -544,7 +561,7 @@ static void DMA_Configuration(struct rt_serial_device *serial) {
DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte; DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;
DMA_InitStructure.DMA_Mode = DMA_Mode_Normal; DMA_InitStructure.DMA_Mode = DMA_Mode_Circular;
DMA_InitStructure.DMA_Priority = DMA_Priority_High; DMA_InitStructure.DMA_Priority = DMA_Priority_High;
DMA_InitStructure.DMA_M2M = DMA_M2M_Disable; DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
DMA_Init(uart->dma.rx_ch, &DMA_InitStructure); DMA_Init(uart->dma.rx_ch, &DMA_InitStructure);