Merge branch 'RT-Thread:master' into master

Author: wormsX

.github/workflows/action.yml

@@ -79,6 +79,7 @@ jobs:
          - {RTT_BSP: "stm32/stm32f103-yf-ufun", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f107-uc-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f207-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "stm32/stm32f302-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f401-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f405-smdz-breadfruit", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32f407-atk-explorer", RTT_TOOL_CHAIN: "sourcery-arm"}
@@ -108,6 +109,7 @@ jobs:
          - {RTT_BSP: "stm32/stm32h747-st-discovery", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32h750-artpi-h750", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32l4r9-st-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "stm32/stm32l4r9-st-sensortile-box", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32l010-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32l053-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32l412-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}

.github/workflows/action_utest.yml

@@ -12,6 +12,7 @@ jobs:
       matrix:
        legs:
          - {UTEST: "kernel/mem",       RTT_BSP: "bsp/qemu-vexpress-a9",    QEMU_ARCH: "arm",      QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/mem.conf",     SD_FILE: "sd.bin"}
+         - {UTEST: "kernel/ipc",       RTT_BSP: "bsp/qemu-vexpress-a9",    QEMU_ARCH: "arm",      QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/ipc.conf",     SD_FILE: "sd.bin"}
          - {UTEST: "components/utest", RTT_BSP: "bsp/qemu-vexpress-a9",    QEMU_ARCH: "arm",      QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "utest_self/self.conf", SD_FILE: "sd.bin"}
          - {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-riscv-virt64", QEMU_ARCH: "riscv64",  QEMU_MACHINE: "virt",  CONFIG_FILE: "kernel/mem.conf",   SD_FILE: "None"}
     env:

.ignore_format.yml

@@ -10,4 +10,5 @@ dir_path:
 - components/net/lwip-1.4.1
 - components/net/lwip-2.0.2
 - components/net/lwip-2.0.3
-- components/net/lwip-2.1.2
+- components/net/lwip-2.1.2
+- bsp/mm32f327x/Libraries

bsp/bluetrum/ab32vg1-ab-prougen/.config

@@ -29,6 +29,7 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=256
 #
 # CONFIG_RT_KSERVICE_USING_STDLIB is not set
 # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set
+# CONFIG_RT_USING_ASM_MEMCPY is not set
 CONFIG_RT_DEBUG=y
 # CONFIG_RT_DEBUG_COLOR is not set
 # CONFIG_RT_DEBUG_INIT_CONFIG is not set
@@ -74,6 +75,7 @@ CONFIG_RT_USING_DEVICE_OPS=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
+# CONFIG_RT_PRINTF_LONGLONG is not set
 CONFIG_RT_VER_NUM=0x40004
 # CONFIG_RT_USING_CPU_FFS is not set
 # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
@@ -162,7 +164,7 @@ CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_PTHREADS is not set
 # CONFIG_RT_USING_MODULE is not set
-CONFIG_RT_LIBC_FIXED_TIMEZONE=8
+CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 
 #
 # Network
@@ -568,6 +570,7 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
 #
 CONFIG_BSP_USING_UART=y
 CONFIG_BSP_USING_UART0=y
+CONFIG_BSP_UART0_FIFO_SIZE=10
 # CONFIG_BSP_USING_UART1 is not set
 # CONFIG_BSP_USING_UART2 is not set
 # CONFIG_BSP_USING_SDIO is not set

bsp/bluetrum/ab32vg1-ab-prougen/board/Kconfig

@@ -1,5 +1,10 @@
 menu "Hardware Drivers Config"
 
+config SOC_AB32VG1
+    bool
+    select PKG_USING_BLUETRUM_SDK
+    default y
+
 menu "Onboard Peripheral Drivers"
 
     menuconfig BSP_USING_AUDIO
@@ -29,20 +34,40 @@ endmenu
 
 menu "On-chip Peripheral Drivers"
     menuconfig BSP_USING_UART
-		bool "Enable UART"
+        bool "Enable UART"
         if BSP_USING_UART
             config BSP_USING_UART0
                 bool "Enable UART0"
                 select RT_USING_SERIAL
                 default y
+            if BSP_USING_UART0
+                config BSP_UART0_FIFO_SIZE
+                    int "BSP_UART0_FIFO_SIZE"
+                    range 5 255
+                    default 10
+            endif
+
             config BSP_USING_UART1
                 bool "Enable UART1"
                 select RT_USING_SERIAL
                 default n
+            if BSP_USING_UART1
+                config BSP_UART1_FIFO_SIZE
+                    int "BSP_UART1_FIFO_SIZE"
+                    range 5 255
+                    default 10
+            endif
+
             config BSP_USING_UART2
                 bool "Enable UART2"
                 select RT_USING_SERIAL
                 default n
+            if BSP_USING_UART2
+                config BSP_UART2_FIFO_SIZE
+                    int "BSP_UART2_FIFO_SIZE"
+                    range 5 255
+                    default 10
+            endif
         endif
 
     config BSP_USING_SDIO
@@ -174,12 +199,12 @@ menu "On-chip Peripheral Drivers"
         default n
         if BSP_USING_ONCHIP_RTC
             config RTC_USING_INTERNAL_CLK
-            bool "Using internal clock RTC"
-            default y
+                bool "Using internal clock RTC"
+                default y
             config RTC_USING_1S_INT
-            bool "Using 1 second interrupt"
-            depends on RT_USING_ALARM
-            default n
+                bool "Using 1 second interrupt"
+                depends on RT_USING_ALARM
+                default n
         endif
 
     menuconfig BSP_USING_ADC

bsp/bluetrum/ab32vg1-ab-prougen/board/board.c

@@ -21,6 +21,7 @@ void set_cpu_irq_comm(void (*irq_hook)(void));
 void load_cache();
 void os_cache_init(void);
 void sys_error_hook(uint8_t err_no);
+void huart_timer_isr(void);
 
 typedef void (*spiflash_init_func)(uint8_t sf_read, uint8_t dummy);
 
@@ -29,6 +30,7 @@ static struct rt_mutex mutex_cache = {0};
 extern volatile rt_uint8_t rt_interrupt_nest;
 extern uint32_t __heap_start, __heap_end;
 
+#ifdef RT_USING_CONSOLE
 void hal_printf(const char *fmt, ...)
 {
     rt_device_t console = rt_console_get_device();
@@ -64,13 +66,17 @@ void hal_printf(const char *fmt, ...)
 #endif
     va_end(args);
 }
+#endif
 
 RT_SECTION(".irq.timer")
 void timer0_isr(int vector, void *param)
 {
     rt_interrupt_enter();
     TMR0CPND = BIT(9);
     rt_tick_increase();
+#ifdef RT_USING_SERIAL
+    huart_timer_isr();
+#endif
     rt_interrupt_leave();
 }
 
@@ -206,8 +212,10 @@ void exception_isr(void)
     extern long list_thread(void);
     sys_error_hook(1);
 
+#ifdef RT_USING_CONSOLE
     rt_console_set_device(RT_NULL);
     rt_kprintf(stack_info, rt_thread_self()->sp, rt_thread_self()->name);
+#endif
 
     while(1);
 }

bsp/bluetrum/ab32vg1-ab-prougen/rtconfig.h

@@ -91,7 +91,7 @@
 /* POSIX layer and C standard library */
 
 #define RT_USING_LIBC
-#define RT_LIBC_FIXED_TIMEZONE 8
+#define RT_LIBC_DEFAULT_TIMEZONE 8
 
 /* Network */
 
@@ -176,6 +176,7 @@
 
 #define BSP_USING_UART
 #define BSP_USING_UART0
+#define BSP_UART0_FIFO_SIZE 10
 
 /* Board extended module Drivers */
 

bsp/bluetrum/libraries/hal_drivers/SConscript

@@ -4,6 +4,7 @@ from building import *
 
 cwd     = GetCurrentDir()
 src     = []
+src    += ['drv_common.c']
 path    = [cwd]
 path   += [cwd + '/config']
 

bsp/bluetrum/libraries/hal_drivers/drv_common.c

@@ -0,0 +1,80 @@
+#include "drv_common.h"
+
+#define DRV_THREAD_PRIORITY         18
+#define DRV_THREAD_STACK_SIZE       512
+#define DRV_THREAD_TIMESLICE        5
+
+enum {
+    MSG_UART0_IRQ,
+    MSG_UART1_IRQ,
+    MSG_UART2_IRQ,
+};
+
+static rt_thread_t drv_tid = RT_NULL;
+static rt_mq_t drv_mq = RT_NULL;
+
+void uart0_irq_process(void);
+void uart1_irq_process(void);
+
+RT_SECTION(".irq.uart")
+void uart0_irq_post(void)
+{
+    uint8_t mq_msg = MSG_UART0_IRQ;
+    rt_mq_send(drv_mq, &mq_msg, 1);
+}
+
+RT_SECTION(".irq.uart")
+void uart1_irq_post(void)
+{
+    uint8_t mq_msg = MSG_UART1_IRQ;
+    rt_mq_send(drv_mq, &mq_msg, 1);
+}
+
+RT_SECTION(".irq.uart")
+void uart2_irq_post(void)
+{
+    uint8_t mq_msg = MSG_UART2_IRQ;
+    rt_mq_send(drv_mq, &mq_msg, 1);
+}
+
+static void drv_thread_entry(void *parameter)
+{
+    uint8_t mq_msg = 0;
+    while (1) {
+        rt_mq_recv(drv_mq, &mq_msg, 1, RT_WAITING_FOREVER);
+        switch (mq_msg) {
+#ifdef BSP_USING_UART0
+            case MSG_UART0_IRQ:
+                uart0_irq_process();
+                break;
+#endif
+#ifdef BSP_USING_UART1
+            case MSG_UART1_IRQ:
+                uart1_irq_process();
+                break;
+#endif
+#ifdef BSP_USING_UART2
+            case MSG_UART2_IRQ:
+                uart2_irq_process();
+                break;
+#endif
+            default:
+                break;
+        }
+    }
+}
+
+static int drv_thread_init(void)
+{
+    drv_mq = rt_mq_create("drv", 1, 128, RT_IPC_FLAG_FIFO);
+    drv_tid = rt_thread_create("drv",
+            drv_thread_entry,
+            RT_NULL,
+            DRV_THREAD_STACK_SIZE,
+            DRV_THREAD_PRIORITY,
+            DRV_THREAD_TIMESLICE);
+
+    if (drv_tid != RT_NULL)
+        rt_thread_startup(drv_tid);
+}
+INIT_PREV_EXPORT(drv_thread_init);

bsp/bluetrum/libraries/hal_drivers/drv_common.h

@@ -17,4 +17,8 @@
 
 #define GET_PIN(PORTx,PIN) (uint8_t)__AB32_GET_PIN_##PORTx(PIN)
 
+void uart0_irq_post(void);
+void uart1_irq_post(void);
+void uart2_irq_post(void);
+
 #endif // DRV_COMMON_H__