From e969e7166a4a2a25c81f35d90a1e725fe387f7b9 Mon Sep 17 00:00:00 2001 From: charlown Date: Fri, 28 Jan 2022 12:26:50 +0800 Subject: [PATCH] [bsp/wch/arm/ch32f103c8-core]:add BSP_USING_TIM to fix compile error if no select hwtimer. --- bsp/wch/arm/ch32f103c8-core/.config | 17 +-- bsp/wch/arm/ch32f103c8-core/board/board.c | 2 + bsp/wch/arm/ch32f103c8-core/project.uvprojx | 154 ++++++++------------ bsp/wch/arm/ch32f103c8-core/rtconfig.h | 11 -- 4 files changed, 71 insertions(+), 113 deletions(-) diff --git a/bsp/wch/arm/ch32f103c8-core/.config b/bsp/wch/arm/ch32f103c8-core/.config index 327fe0db7..8d19eb110 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 10104959e..f1d3773fa 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 b00c028f6..9153f0f16 100644 --- a/bsp/wch/arm/ch32f103c8-core/project.uvprojx +++ b/bsp/wch/arm/ch32f103c8-core/project.uvprojx @@ -533,16 +533,16 @@ Compiler - syscall_mem.c + syscalls.c 1 - ..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c + ..\..\..\..\components\libc\compilers\armlibc\syscalls.c - syscalls.c + syscall_mem.c 1 - ..\..\..\..\components\libc\compilers\armlibc\syscalls.c + ..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c @@ -562,6 +562,13 @@ CPU + + + showmem.c + 1 + ..\..\..\..\libcpu\arm\common\showmem.c + + div0.c @@ -578,9 +585,9 @@ - showmem.c - 1 - ..\..\..\..\libcpu\arm\common\showmem.c + context_rvds.S + 2 + ..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S @@ -590,13 +597,6 @@ ..\..\..\..\libcpu\arm\cortex-m3\cpuport.c - - - context_rvds.S - 2 - ..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - DeviceDrivers @@ -616,51 +616,51 @@ - ringblk_buf.c + waitqueue.c 1 - ..\..\..\..\components\drivers\ipc\ringblk_buf.c + ..\..\..\..\components\drivers\ipc\waitqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\..\components\drivers\ipc\workqueue.c + ..\..\..\..\components\drivers\ipc\ringblk_buf.c - completion.c + pipe.c 1 - ..\..\..\..\components\drivers\ipc\completion.c + ..\..\..\..\components\drivers\ipc\pipe.c - dataqueue.c + completion.c 1 - ..\..\..\..\components\drivers\ipc\dataqueue.c + ..\..\..\..\components\drivers\ipc\completion.c - pipe.c + ringbuffer.c 1 - ..\..\..\..\components\drivers\ipc\pipe.c + ..\..\..\..\components\drivers\ipc\ringbuffer.c - waitqueue.c + dataqueue.c 1 - ..\..\..\..\components\drivers\ipc\waitqueue.c + ..\..\..\..\components\drivers\ipc\dataqueue.c - ringbuffer.c + workqueue.c 1 - ..\..\..\..\components\drivers\ipc\ringbuffer.c + ..\..\..\..\components\drivers\ipc\workqueue.c @@ -720,13 +720,6 @@ Drivers - - - startup_ch32f10x.s - 2 - ..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Source\ARM\startup_ch32f10x.s - - system_ch32f10x.c @@ -736,37 +729,16 @@ - board.c - 1 - board\board.c - - - - - drv_rtc_ch32f10x.c - 1 - ..\Libraries\ch32_drivers\drv_rtc_ch32f10x.c - - - - - drv_hwi2c_ch32f10x.c - 1 - ..\Libraries\ch32_drivers\drv_hwi2c_ch32f10x.c - - - - - drv_gpio_ch32f10x.c - 1 - ..\Libraries\ch32_drivers\drv_gpio_ch32f10x.c + startup_ch32f10x.s + 2 + ..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Source\ARM\startup_ch32f10x.s - drv_spi_ch32f10x.c + board.c 1 - ..\Libraries\ch32_drivers\drv_spi_ch32f10x.c + board\board.c @@ -778,16 +750,16 @@ - drv_iwdt_ch32f10x.c + drv_common.c 1 - ..\Libraries\ch32_drivers\drv_iwdt_ch32f10x.c + ..\Libraries\ch32_drivers\drv_common.c - drv_common.c + drv_gpio_ch32f10x.c 1 - ..\Libraries\ch32_drivers\drv_common.c + ..\Libraries\ch32_drivers\drv_gpio_ch32f10x.c @@ -819,93 +791,93 @@ Kernel - thread.c + irq.c 1 - ..\..\..\..\src\thread.c + ..\..\..\..\src\irq.c - mem.c + scheduler.c 1 - ..\..\..\..\src\mem.c + ..\..\..\..\src\scheduler.c - idle.c + device.c 1 - ..\..\..\..\src\idle.c + ..\..\..\..\src\device.c - timer.c + components.c 1 - ..\..\..\..\src\timer.c + ..\..\..\..\src\components.c - clock.c + kservice.c 1 - ..\..\..\..\src\clock.c + ..\..\..\..\src\kservice.c - irq.c + clock.c 1 - ..\..\..\..\src\irq.c + ..\..\..\..\src\clock.c - components.c + mempool.c 1 - ..\..\..\..\src\components.c + ..\..\..\..\src\mempool.c - object.c + ipc.c 1 - ..\..\..\..\src\object.c + ..\..\..\..\src\ipc.c - mempool.c + object.c 1 - ..\..\..\..\src\mempool.c + ..\..\..\..\src\object.c - kservice.c + idle.c 1 - ..\..\..\..\src\kservice.c + ..\..\..\..\src\idle.c - device.c + mem.c 1 - ..\..\..\..\src\device.c + ..\..\..\..\src\mem.c - ipc.c + timer.c 1 - ..\..\..\..\src\ipc.c + ..\..\..\..\src\timer.c - scheduler.c + thread.c 1 - ..\..\..\..\src\scheduler.c + ..\..\..\..\src\thread.c diff --git a/bsp/wch/arm/ch32f103c8-core/rtconfig.h b/bsp/wch/arm/ch32f103c8-core/rtconfig.h index cc5ddae20..828514602 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 */ -- GitLab