From e2d4a912beb77f55b12920ef2402b3e472dc2962 Mon Sep 17 00:00:00 2001
From: yaoyufan <867142582@qq.com>
Date: Fri, 23 Apr 2021 10:21:10 +0800
Subject: [PATCH 1/2] fix bluetrum uart1 and uart2 cannot recv data

---
 .../libraries/hal_drivers/drv_usart.c         | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 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;
-
-    /* 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)
+    if(serial == &uart_obj[0].serial)
     {
-        shell_rx_ind();
+        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)
+        {
+            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")

From 58065b05659deaab9d9d9297ad312d915b284d54 Mon Sep 17 00:00:00 2001
From: YYF <57777857+yaoyufan@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:20:04 +0800
Subject: [PATCH 2/2] Update drv_usart.c

---
 .../libraries/hal_drivers/drv_usart.c         | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c
index 16dd7f9366..9e8ecdbf9f 100644
--- a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c
+++ b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c
@@ -221,36 +221,23 @@ void uart_irq_process(struct rt_serial_device *serial)
         rt_hw_interrupt_enable(level);
     }
 
-    if(serial == &uart_obj[0].serial)
-    {
-        rt_size_t rx_length;
+    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)
-        {
+    if ((serial->parent.rx_indicate != RT_NULL) && (rx_length != 0)) {
+    #ifdef RT_CONSOLE_DEVICE_NAME
+        if (serial == &uart_obj[*(RT_CONSOLE_DEVICE_NAME + 4) - '0'].serial) {
             shell_rx_ind();
-        }
-    }else {
-        /* invoke callback */
-        if (serial->parent.rx_indicate != RT_NULL)
+        } else
+    #endif
         {
-            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_kprintf("rx_indicate must loacted in the .comm section!\n");
+            //serial->parent.rx_indicate(&serial->parent, rx_length);
         }
     }