From e2d4a912beb77f55b12920ef2402b3e472dc2962 Mon Sep 17 00:00:00 2001 From: yaoyufan <867142582@qq.com> Date: Fri, 23 Apr 2021 10:21:10 +0800 Subject: fix bluetrum uart1 and uart2 cannot recv data --- bsp/bluetrum/libraries/hal_drivers/drv_usart.c | 39 ++++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c index f09cffee61..16dd7f9366 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c @@ -221,18 +221,39 @@ void uart_irq_process(struct rt_serial_device *serial) rt_hw_interrupt_enable(level); } - rt_size_t rx_length; + if(serial == &uart_obj[0].serial) + { + rt_size_t rx_length; - /* get rx length */ - level = rt_hw_interrupt_disable(); - rx_length = (rx_fifo->put_index >= rx_fifo->get_index)? (rx_fifo->put_index - rx_fifo->get_index): - (serial->config.bufsz - (rx_fifo->get_index - rx_fifo->put_index)); - rt_hw_interrupt_enable(level); + /* get rx length */ + level = rt_hw_interrupt_disable(); + rx_length = (rx_fifo->put_index >= rx_fifo->get_index)? (rx_fifo->put_index - rx_fifo->get_index): + (serial->config.bufsz - (rx_fifo->get_index - rx_fifo->put_index)); + rt_hw_interrupt_enable(level); - if (rx_length) - { - shell_rx_ind(); + if (rx_length) + { + shell_rx_ind(); + } + }else { + /* invoke callback */ + if (serial->parent.rx_indicate != RT_NULL) + { + rt_size_t rx_length; + + /* get rx length */ + level = rt_hw_interrupt_disable(); + rx_length = (rx_fifo->put_index >= rx_fifo->get_index)? (rx_fifo->put_index - rx_fifo->get_index): + (serial->config.bufsz - (rx_fifo->get_index - rx_fifo->put_index)); + rt_hw_interrupt_enable(level); + + if (rx_length) + { + serial->parent.rx_indicate(&serial->parent, rx_length); + } + } } + } RT_SECTION(".irq.usart") -- cgit v1.3.1