Merge pull request #5572 from charlown/master

6 files changed, 254 insertions, 118 deletions

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 91a3f88a1a..5f577d0c4a 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -144,6 +144,8 @@ jobs:
          - {RTT_BSP: "stm32/stm32mp157a-st-ev1", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32u575-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "stm32/stm32wb55-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "wch/arm/ch32f103c8-core", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "wch/arm/ch32f203r-evt", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "swm320-lq100", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "beaglebone", RTT_TOOL_CHAIN: "sourcery-arm"}
diff --git a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f10x.S b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f20x.S
index 07a651fa19..ee113ca635 100644
--- a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f10x.S
+++ b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f20x.S
@@ -1,9 +1,9 @@
 /********************************** (C) COPYRIGHT *******************************
-* File Name          : startup_ch32f10x.s
+* File Name          : startup_ch32f20x.s
 * Author             : WCH
 * Version            : V1.0.0
 * Date               : 2020/11/01
-* Description        : CH32F10x vector table for GCC toolchain.
+* Description        : CH32F20x vector table for GCC toolchain.
 *******************************************************************************/
     
   .syntax unified
@@ -148,7 +148,51 @@ g_pfnVectors:
   .word  EXTI15_10_IRQHandler
   .word  RTCAlarm_IRQHandler
   .word  USBWakeUp_IRQHandler
-  .word  USBHD_IRQHandler
+    .word  TIM8_BRK_IRQHandler
+    .word  TIM8_UP_IRQHandler
+    .word  TIM8_TRG_COM_IRQHandler
+    .word  TIM8_CC_IRQHandler
+	.word  RNG_IRQHandler
+	.word  FSMC_IRQHandler
+	.word  SDIO_IRQHandler
+	.word  TIM5_IRQHandler
+	.word  SPI3_IRQHandler
+	.word  UART4_IRQHandler
+	.word  UART5_IRQHandler
+	.word  TIM6_IRQHandler
+	.word  TIM7_IRQHandler
+	.word  DMA2_Channel1_IRQHandler
+	.word  DMA2_Channel2_IRQHandler
+	.word  DMA2_Channel3_IRQHandler
+	.word  DMA2_Channel4_IRQHandler
+	.word  DMA2_Channel5_IRQHandler
+	.word  ETH_IRQHandler
+	.word  ETH_WKUP_IRQHandler
+	.word  CAN2_TX_IRQHandler
+	.word  CAN2_RX0_IRQHandler
+	.word  CAN2_RX1_IRQHandler
+	.word  CAN2_SCE_IRQHandler
+	.word  OTG_FS_IRQHandler
+	.word  USBHSWakeup_IRQHandler
+	.word  USBHS_IRQHandler
+	.word  DVP_IRQHandler
+	.word  UART6_IRQHandler
+	.word  UART7_IRQHandler
+	.word  UART8_IRQHandler
+	.word  TIM9_BRK_IRQHandler
+	.word  TIM9_UP_IRQHandler
+	.word  TIM9_TRG_COM_IRQHandler
+	.word  TIM9_CC_IRQHandler
+	.word  TIM10_BRK_IRQHandler
+	.word  TIM10_UP_IRQHandler
+	.word  TIM10_TRG_COM_IRQHandler
+	.word  TIM10_CC_IRQHandler
+	.word  DMA2_Channel6_IRQHandler
+	.word  DMA2_Channel7_IRQHandler
+	.word  DMA2_Channel8_IRQHandler
+	.word  DMA2_Channel9_IRQHandler
+	.word  DMA2_Channel10_IRQHandler
+	.word  DMA2_Channel11_IRQHandler
    
 /*******************************************************************************
  Dummy Exception Handlers (infinite loops which can be modified)
@@ -309,5 +353,137 @@ g_pfnVectors:
   .weak  USBWakeUp_IRQHandler
   .thumb_set USBWakeUp_IRQHandler,Default_Handler
 
-  .weak  USBHD_IRQHandler
-  .thumb_set USBHD_IRQHandler,Default_Handler
+  .weak  TIM8_BRK_IRQHandler
+  .thumb_set TIM8_BRK_IRQHandler,Default_Handler
+
+  .weak  TIM8_UP_IRQHandler
+  .thumb_set TIM8_UP_IRQHandler,Default_Handler
+
+  .weak  TIM8_TRG_COM_IRQHandler
+  .thumb_set TIM8_TRG_COM_IRQHandler,Default_Handler
+
+  .weak  TIM8_CC_IRQHandler
+  .thumb_set TIM8_CC_IRQHandler,Default_Handler
+
+  .weak  RNG_IRQHandler
+  .thumb_set RNG_IRQHandler,Default_Handler
+
+  .weak  FSMC_IRQHandler
+  .thumb_set FSMC_IRQHandler,Default_Handler
+
+  .weak  SDIO_IRQHandler
+  .thumb_set SDIO_IRQHandler,Default_Handler
+
+  .weak  TIM5_IRQHandler
+  .thumb_set TIM5_IRQHandler,Default_Handler
+
+  .weak  SPI3_IRQHandler
+  .thumb_set SPI3_IRQHandler,Default_Handler
+
+  .weak  UART4_IRQHandler
+  .thumb_set UART4_IRQHandler,Default_Handler
+
+  .weak  UART5_IRQHandler
+  .thumb_set UART5_IRQHandler,Default_Handler
+
+  .weak  TIM6_IRQHandler
+  .thumb_set TIM6_IRQHandler,Default_Handler
+
+  .weak  TIM7_IRQHandler
+  .thumb_set TIM7_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel1_IRQHandler
+  .thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel2_IRQHandler
+  .thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel3_IRQHandler
+  .thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel4_IRQHandler
+  .thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel5_IRQHandler
+  .thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+  .weak  ETH_IRQHandler
+  .thumb_set ETH_IRQHandler,Default_Handler
+
+  .weak  ETH_WKUP_IRQHandler
+  .thumb_set ETH_WKUP_IRQHandler,Default_Handler
+
+  .weak  CAN2_TX_IRQHandler
+  .thumb_set CAN2_TX_IRQHandler,Default_Handler
+
+  .weak  CAN2_RX0_IRQHandler
+  .thumb_set CAN2_RX0_IRQHandler,Default_Handler
+
+  .weak  CAN2_RX1_IRQHandler
+  .thumb_set CAN2_RX1_IRQHandler,Default_Handler
+
+  .weak  CAN2_SCE_IRQHandler
+  .thumb_set CAN2_SCE_IRQHandler,Default_Handler
+
+  .weak  OTG_FS_IRQHandler
+  .thumb_set OTG_FS_IRQHandler,Default_Handler
+
+  .weak  USBHSWakeup_IRQHandler
+  .thumb_set USBHSWakeup_IRQHandler,Default_Handler
+
+  .weak  USBHS_IRQHandler
+  .thumb_set USBHS_IRQHandler,Default_Handler
+
+  .weak  DVP_IRQHandler
+  .thumb_set DVP_IRQHandler,Default_Handler
+
+  .weak  UART6_IRQHandler
+  .thumb_set UART6_IRQHandler,Default_Handler
+
+  .weak  UART7_IRQHandler
+  .thumb_set UART7_IRQHandler,Default_Handler
+
+  .weak  UART8_IRQHandler
+  .thumb_set UART8_IRQHandler,Default_Handler
+
+  .weak  TIM9_BRK_IRQHandler
+  .thumb_set TIM9_BRK_IRQHandler,Default_Handler
+
+  .weak  TIM9_UP_IRQHandler
+  .thumb_set TIM9_UP_IRQHandler,Default_Handler
+
+  .weak  TIM9_TRG_COM_IRQHandler
+  .thumb_set TIM9_TRG_COM_IRQHandler,Default_Handler
+
+  .weak  TIM9_CC_IRQHandler
+  .thumb_set TIM9_CC_IRQHandler,Default_Handler
+
+  .weak  TIM10_BRK_IRQHandler
+  .thumb_set TIM10_BRK_IRQHandler,Default_Handler
+
+  .weak  TIM10_UP_IRQHandler
+  .thumb_set TIM10_UP_IRQHandler,Default_Handler
+
+  .weak  TIM10_TRG_COM_IRQHandler
+  .thumb_set TIM10_TRG_COM_IRQHandler,Default_Handler
+
+  .weak  TIM10_CC_IRQHandler
+  .thumb_set TIM10_CC_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel6_IRQHandler
+  .thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel7_IRQHandler
+  .thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel8_IRQHandler
+  .thumb_set DMA2_Channel8_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel9_IRQHandler
+  .thumb_set DMA2_Channel9_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel10_IRQHandler
+  .thumb_set DMA2_Channel10_IRQHandler,Default_Handler
+
+  .weak  DMA2_Channel11_IRQHandler
+  .thumb_set DMA2_Channel11_IRQHandler,Default_Handler
diff --git a/bsp/wch/arm/ch32f103c8-core/.config b/bsp/wch/arm/ch32f103c8-core/.config
index 327fe0db7c..8d19eb1108 100644
--- a/bsp/wch/arm/ch32f103c8-core/.config
+++ b/bsp/wch/arm/ch32f103c8-core/.config
@@ -673,18 +673,13 @@ CONFIG_SOC_CH32F103C8=y
 # On-chip Peripheral Drivers
 #
 CONFIG_BSP_USING_UART=y
-CONFIG_BSP_USING_UART1=y
+# CONFIG_BSP_USING_UART1 is not set
 CONFIG_BSP_USING_UART2=y
-CONFIG_BSP_USING_UART3=y
-CONFIG_BSP_USING_SPI=y
-CONFIG_BSP_USING_SPI1=y
-CONFIG_BSP_USING_SPI2=y
-CONFIG_BSP_USING_HWI2C=y
-CONFIG_BSP_USING_HWI2C1=y
-CONFIG_BSP_USING_HWI2C2=y
-CONFIG_BSP_USING_IWDT=y
-CONFIG_BSP_USING_RTC=y
-CONFIG_BSP_USING_RTC_LSI=y
+# CONFIG_BSP_USING_UART3 is not set
+# CONFIG_BSP_USING_SPI is not set
+# CONFIG_BSP_USING_HWI2C is not set
+# CONFIG_BSP_USING_IWDT is not set
+# CONFIG_BSP_USING_RTC is not set
 CONFIG_LSI_VALUE=40000
 # CONFIG_BSP_USING_TIM is not set
 
diff --git a/bsp/wch/arm/ch32f103c8-core/board/board.c b/bsp/wch/arm/ch32f103c8-core/board/board.c
index 10104959e5..f1d3773fa6 100644
--- a/bsp/wch/arm/ch32f103c8-core/board/board.c
+++ b/bsp/wch/arm/ch32f103c8-core/board/board.c
@@ -200,6 +200,7 @@ void ch32f1_i2c_config(I2C_TypeDef *i2cx)
     }
 }
 
+#ifdef BSP_USING_TIM
 void ch32f1_tim_clock_init(TIM_TypeDef *timx)
 {
     if (timx == TIM1)
@@ -434,3 +435,4 @@ void ch32f1_pwm_io_init(TIM_TypeDef *timx, rt_uint8_t channel)
         }
     }
 }
+#endif
diff --git a/bsp/wch/arm/ch32f103c8-core/project.uvprojx b/bsp/wch/arm/ch32f103c8-core/project.uvprojx
index b00c028f60..9153f0f165 100644
--- a/bsp/wch/arm/ch32f103c8-core/project.uvprojx
+++ b/bsp/wch/arm/ch32f103c8-core/project.uvprojx
@@ -533,16 +533,16 @@
           <GroupName>Compiler</GroupName>
           <Files>
             <File>
-              <FileName>syscall_mem.c</FileName>
+              <FileName>syscalls.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c</FilePath>
+              <FilePath>..\..\..\..\components\libc\compilers\armlibc\syscalls.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>syscalls.c</FileName>
+              <FileName>syscall_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\libc\compilers\armlibc\syscalls.c</FilePath>
+              <FilePath>..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -564,6 +564,13 @@
           <GroupName>CPU</GroupName>
           <Files>
             <File>
+              <FileName>showmem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\libcpu\arm\common\showmem.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
               <FileName>div0.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\..\..\libcpu\arm\common\div0.c</FilePath>
@@ -578,9 +585,9 @@
           </Files>
           <Files>
             <File>
-              <FileName>showmem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\libcpu\arm\common\showmem.c</FilePath>
+              <FileName>context_rvds.S</FileName>
+              <FileType>2</FileType>
+              <FilePath>..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
             </File>
           </Files>
           <Files>
@@ -590,13 +597,6 @@
               <FilePath>..\..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath>
             </File>
           </Files>
-          <Files>
-            <File>
-              <FileName>context_rvds.S</FileName>
-              <FileType>2</FileType>
-              <FilePath>..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
-            </File>
-          </Files>
         </Group>
         <Group>
           <GroupName>DeviceDrivers</GroupName>
@@ -616,51 +616,51 @@
           </Files>
           <Files>
             <File>
-              <FileName>ringblk_buf.c</FileName>
+              <FileName>waitqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\ringblk_buf.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\waitqueue.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>workqueue.c</FileName>
+              <FileName>ringblk_buf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\workqueue.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\ringblk_buf.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>completion.c</FileName>
+              <FileName>pipe.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\completion.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\pipe.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>dataqueue.c</FileName>
+              <FileName>completion.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\dataqueue.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\completion.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>pipe.c</FileName>
+              <FileName>ringbuffer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\pipe.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\ringbuffer.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>waitqueue.c</FileName>
+              <FileName>dataqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\waitqueue.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\dataqueue.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>ringbuffer.c</FileName>
+              <FileName>workqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\components\drivers\ipc\ringbuffer.c</FilePath>
+              <FilePath>..\..\..\..\components\drivers\ipc\workqueue.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -722,13 +722,6 @@
           <GroupName>Drivers</GroupName>
           <Files>
             <File>
-              <FileName>startup_ch32f10x.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Source\ARM\startup_ch32f10x.s</FilePath>
-            </File>
-          </Files>
-          <Files>
-            <File>
               <FileName>system_ch32f10x.c</FileName>
               <FileType>1</FileType>
               <FilePath>board\system_ch32f10x.c</FilePath>
@@ -736,37 +729,16 @@
           </Files>
           <Files>
             <File>
-              <FileName>board.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>board\board.c</FilePath>
-            </File>
-          </Files>
-          <Files>
-            <File>
-              <FileName>drv_rtc_ch32f10x.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_rtc_ch32f10x.c</FilePath>
-            </File>
-          </Files>
-          <Files>
-            <File>
-              <FileName>drv_hwi2c_ch32f10x.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_hwi2c_ch32f10x.c</FilePath>
-            </File>
-          </Files>
-          <Files>
-            <File>
-              <FileName>drv_gpio_ch32f10x.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_gpio_ch32f10x.c</FilePath>
+              <FileName>startup_ch32f10x.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Source\ARM\startup_ch32f10x.s</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>drv_spi_ch32f10x.c</FileName>
+              <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_spi_ch32f10x.c</FilePath>
+              <FilePath>board\board.c</FilePath>
             </File>
           </Files>
           <Files>
@@ -778,16 +750,16 @@
           </Files>
           <Files>
             <File>
-              <FileName>drv_iwdt_ch32f10x.c</FileName>
+              <FileName>drv_common.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_iwdt_ch32f10x.c</FilePath>
+              <FilePath>..\Libraries\ch32_drivers\drv_common.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>drv_common.c</FileName>
+              <FileName>drv_gpio_ch32f10x.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Libraries\ch32_drivers\drv_common.c</FilePath>
+              <FilePath>..\Libraries\ch32_drivers\drv_gpio_ch32f10x.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -819,93 +791,93 @@
           <GroupName>Kernel</GroupName>
           <Files>
             <File>
-              <FileName>thread.c</FileName>
+              <FileName>irq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\thread.c</FilePath>
+              <FilePath>..\..\..\..\src\irq.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>mem.c</FileName>
+              <FileName>scheduler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\mem.c</FilePath>
+              <FilePath>..\..\..\..\src\scheduler.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>idle.c</FileName>
+              <FileName>device.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\idle.c</FilePath>
+              <FilePath>..\..\..\..\src\device.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>timer.c</FileName>
+              <FileName>components.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\timer.c</FilePath>
+              <FilePath>..\..\..\..\src\components.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>clock.c</FileName>
+              <FileName>kservice.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\clock.c</FilePath>
+              <FilePath>..\..\..\..\src\kservice.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>irq.c</FileName>
+              <FileName>clock.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\irq.c</FilePath>
+              <FilePath>..\..\..\..\src\clock.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>components.c</FileName>
+              <FileName>mempool.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\components.c</FilePath>
+              <FilePath>..\..\..\..\src\mempool.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>object.c</FileName>
+              <FileName>ipc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\object.c</FilePath>
+              <FilePath>..\..\..\..\src\ipc.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>mempool.c</FileName>
+              <FileName>object.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\mempool.c</FilePath>
+              <FilePath>..\..\..\..\src\object.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>kservice.c</FileName>
+              <FileName>idle.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\kservice.c</FilePath>
+              <FilePath>..\..\..\..\src\idle.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>device.c</FileName>
+              <FileName>mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\device.c</FilePath>
+              <FilePath>..\..\..\..\src\mem.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>ipc.c</FileName>
+              <FileName>timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\ipc.c</FilePath>
+              <FilePath>..\..\..\..\src\timer.c</FilePath>
             </File>
           </Files>
           <Files>
             <File>
-              <FileName>scheduler.c</FileName>
+              <FileName>thread.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\scheduler.c</FilePath>
+              <FilePath>..\..\..\..\src\thread.c</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/bsp/wch/arm/ch32f103c8-core/rtconfig.h b/bsp/wch/arm/ch32f103c8-core/rtconfig.h
index cc5ddae209..8285146024 100644
--- a/bsp/wch/arm/ch32f103c8-core/rtconfig.h
+++ b/bsp/wch/arm/ch32f103c8-core/rtconfig.h
@@ -209,18 +209,7 @@
 /* On-chip Peripheral Drivers */
 
 #define BSP_USING_UART
-#define BSP_USING_UART1
 #define BSP_USING_UART2
-#define BSP_USING_UART3
-#define BSP_USING_SPI
-#define BSP_USING_SPI1
-#define BSP_USING_SPI2
-#define BSP_USING_HWI2C
-#define BSP_USING_HWI2C1
-#define BSP_USING_HWI2C2
-#define BSP_USING_IWDT
-#define BSP_USING_RTC
-#define BSP_USING_RTC_LSI
 #define LSI_VALUE 40000
 
 /* Onboard Peripheral Drivers */