diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c index 79247b9e3e88..1d8574b3ae83 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c @@ -395,49 +395,30 @@ static rt_size_t stm32_transmit(struct rt_serial_device *serial, static void dma_recv_isr(struct rt_serial_device *serial, rt_uint8_t isr_flag) { struct stm32_uart *uart; - rt_base_t level; rt_size_t recv_len, counter; RT_ASSERT(serial != RT_NULL); uart = rt_container_of(serial, struct stm32_uart, serial); - level = rt_hw_interrupt_disable(); recv_len = 0; counter = __HAL_DMA_GET_COUNTER(&(uart->dma_rx.handle)); - switch (isr_flag) - { - case UART_RX_DMA_IT_IDLE_FLAG: - if (counter <= uart->dma_rx.remaining_cnt) - recv_len = uart->dma_rx.remaining_cnt - counter; - else - recv_len = serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter; - break; - - case UART_RX_DMA_IT_HT_FLAG: - if (counter < uart->dma_rx.remaining_cnt) - recv_len = uart->dma_rx.remaining_cnt - counter; - break; - - case UART_RX_DMA_IT_TC_FLAG: - if(counter >= uart->dma_rx.remaining_cnt) - recv_len = serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter; - - default: - break; - } - + if (counter <= uart->dma_rx.remaining_cnt) + recv_len = uart->dma_rx.remaining_cnt - counter; + else + recv_len = serial->config.rx_bufsz + uart->dma_rx.remaining_cnt - counter; if (recv_len) { +#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) + struct rt_serial_rx_fifo *rx_fifo = (struct rt_serial_rx_fifo *) serial->serial_rx; + SCB_InvalidateDCache_by_Addr((uint32_t *)rx_fifo->buffer, serial->config.rx_bufsz); +#endif uart->dma_rx.remaining_cnt = counter; rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_DMADONE | (recv_len << 8)); } - rt_hw_interrupt_enable(level); - } #endif /* RT_SERIAL_USING_DMA */ - /** * Uart common interrupt process. This need add to uart ISR. * @@ -449,7 +430,7 @@ static void uart_isr(struct rt_serial_device *serial) RT_ASSERT(serial != RT_NULL); uart = rt_container_of(serial, struct stm32_uart, serial); - /* If the Read data register is not empty and the RXNE interrupt is enabled (RDR) */ + /* If the Read data register is not empty and the RXNE interrupt is enabled (RDR) */ if ((__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_RXNE) != RESET) && (__HAL_UART_GET_IT_SOURCE(&(uart->handle), UART_IT_RXNE) != RESET)) { @@ -461,7 +442,7 @@ static void uart_isr(struct rt_serial_device *serial) rt_hw_serial_isr(serial, RT_SERIAL_EVENT_RX_IND); } - /* If the Transmit data register is empty and the TXE interrupt enable is enabled (TDR)*/ + /* If the Transmit data register is empty and the TXE interrupt enable is enabled (TDR) */ else if ((__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_TXE) != RESET) && (__HAL_UART_GET_IT_SOURCE(&(uart->handle), UART_IT_TXE)) != RESET) { @@ -954,6 +935,27 @@ static void stm32_uart_get_config(void) static struct dma_config uart4_dma_tx = UART4_DMA_TX_CONFIG; uart_config[UART4_INDEX].dma_tx = &uart4_dma_tx; #endif + +#ifdef BSP_USING_UART5 + uart_obj[UART5_INDEX].serial.config = config; + uart_obj[UART5_INDEX].uart_dma_flag = 0; + + uart_obj[UART5_INDEX].serial.config.rx_bufsz = BSP_UART5_RX_BUFSIZE; + uart_obj[UART5_INDEX].serial.config.tx_bufsz = BSP_UART5_TX_BUFSIZE; + +#ifdef BSP_UART5_RX_USING_DMA + uart_obj[UART5_INDEX].uart_dma_flag |= RT_DEVICE_FLAG_DMA_RX; + static struct dma_config uart5_dma_rx = UART5_DMA_RX_CONFIG; + uart_config[UART5_INDEX].dma_rx = &uart5_dma_rx; +#endif + +#ifdef BSP_UART5_TX_USING_DMA + uart_obj[UART5_INDEX].uart_dma_flag |= RT_DEVICE_FLAG_DMA_TX; + static struct dma_config uart5_dma_tx = UART5_DMA_TX_CONFIG; + uart_config[UART5_INDEX].dma_tx = &uart5_dma_tx; +#endif +#endif + #endif } diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/serial_v2.c index b1e5002d0cc0..6b8392a644f2 100644 --- a/components/drivers/serial/serial_v2.c +++ b/components/drivers/serial/serial_v2.c @@ -12,7 +12,7 @@ #include #include -#define DBG_TAG "UART" +#define DBG_TAG "Serial" #define DBG_LVL DBG_INFO #include @@ -254,7 +254,7 @@ static rt_size_t rt_serial_update_read_index(struct rt_ringbuffer *rb, } static rt_size_t rt_serial_update_write_index(struct rt_ringbuffer *rb, - rt_uint16_t write_index) + rt_uint16_t write_size) { rt_uint16_t size; RT_ASSERT(rb != RT_NULL); @@ -262,27 +262,28 @@ static rt_size_t rt_serial_update_write_index(struct rt_ringbuffer *rb, /* whether has enough space */ size = rt_ringbuffer_space_len(rb); - /* no space */ - if (size == 0) - return 0; - - /* drop some data */ - if (size < write_index) - write_index = size; + /* no space, drop some data */ + if (size < write_size) + { + write_size = size; +#if !defined(RT_USING_ULOG) || defined(ULOG_USING_ISR_LOG) + LOG_W("The serial buffer (len %d) is overflow.", rb->buffer_size); +#endif + } - if (rb->buffer_size - rb->write_index > write_index) + if (rb->buffer_size - rb->write_index > write_size) { /* this should not cause overflow because there is enough space for * length of data in current mirror */ - rb->write_index += write_index; - return write_index; + rb->write_index += write_size; + return write_size; } /* we are going into the other side of the mirror */ rb->write_mirror = ~rb->write_mirror; - rb->write_index = write_index - (rb->buffer_size - rb->write_index); + rb->write_index = write_size - (rb->buffer_size - rb->write_index); - return write_index; + return write_size; } @@ -463,6 +464,12 @@ static rt_size_t _serial_fifo_tx_blocking_nbuf(struct rt_device *dev, tx_fifo = (struct rt_serial_tx_fifo *) serial->serial_tx; RT_ASSERT(tx_fifo != RT_NULL); + if (rt_thread_self() == RT_NULL || (serial->parent.open_flag & RT_DEVICE_FLAG_STREAM)) + { + /* using poll tx when the scheduler not startup or in stream mode */ + return _serial_poll_tx(dev, pos, buffer, size); + } + /* When serial transmit in tx_blocking mode, * if the activated mode is RT_TRUE, it will return directly */ if (tx_fifo->activated == RT_TRUE) return 0; @@ -1121,15 +1128,15 @@ static rt_err_t rt_serial_control(struct rt_device *dev, if (args != RT_NULL) { struct serial_configure *pconfig = (struct serial_configure *) args; - if (serial->parent.ref_count) + if (((pconfig->rx_bufsz != serial->config.rx_bufsz) || (pconfig->tx_bufsz != serial->config.tx_bufsz)) + && serial->parent.ref_count) { /*can not change buffer size*/ return -RT_EBUSY; } - /* set serial configure */ + /* set serial configure */ serial->config = *pconfig; - serial->ops->configure(serial, - (struct serial_configure *) args); + serial->ops->configure(serial, (struct serial_configure *) args); } break; @@ -1477,13 +1484,18 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event) struct rt_serial_rx_fifo *rx_fifo; rt_size_t rx_length = 0; rx_fifo = (struct rt_serial_rx_fifo *)serial->serial_rx; + rt_base_t level; RT_ASSERT(rx_fifo != RT_NULL); /* If the event is RT_SERIAL_EVENT_RX_IND, rx_length is equal to 0 */ rx_length = (event & (~0xff)) >> 8; if (rx_length) + { /* RT_SERIAL_EVENT_RX_DMADONE MODE */ + level = rt_hw_interrupt_disable(); rt_serial_update_write_index(&(rx_fifo->rb), rx_length); + rt_hw_interrupt_enable(level); + } /* Get the length of the data from the ringbuffer */ rx_length = rt_ringbuffer_data_len(&rx_fifo->rb);