From 95fea2f159633f0ad62f633b0970e09e0dec9044 Mon Sep 17 00:00:00 2001 From: charlown Date: Thu, 9 Mar 2023 11:52:07 +0800 Subject: [PATCH] =?UTF-8?q?[ch32]=E4=BF=AE=E6=AD=A3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=20(#7025)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ch32_drivers/drv_gpio_ch32f10x.c | 12 +- .../ch32_drivers/drv_gpio_ch32f20x.c | 76 +++--- .../Libraries/ch32_drivers/drv_rtc_ch32f10x.c | 4 +- .../Libraries/ch32_drivers/drv_rtc_ch32f20x.c | 4 +- .../Libraries/ch32_drivers/drv_spi_ch32f10x.c | 2 +- .../Libraries/ch32_drivers/drv_spi_ch32f20x.c | 2 +- bsp/wch/arm/ch32f103c8-core/project.uvprojx | 236 ++++------------ bsp/wch/arm/ch32f203r-evt/project.uvprojx | 256 ++++-------------- 8 files changed, 162 insertions(+), 430 deletions(-) diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f10x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f10x.c index c093bbb20e..02a460e6d5 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f10x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f10x.c @@ -269,7 +269,7 @@ static rt_err_t exti_line_irq_list_unbind(rt_int16_t pin) return ret; } -void ch32f1_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode) +void ch32f1_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode) { const struct pin_info *item; GPIO_InitTypeDef gpio_initstruct; @@ -309,7 +309,7 @@ void ch32f1_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode) GPIO_Init(item->gpio, &gpio_initstruct); } -void ch32f1_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value) +void ch32f1_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value) { const struct pin_info *item; @@ -323,7 +323,7 @@ void ch32f1_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value) GPIO_WriteBit(item->gpio, item->gpio_pin, (BitAction)value); } -int ch32f1_pin_read(rt_device_t dev, rt_base_t pin) +rt_int8_t ch32f1_pin_read(rt_device_t dev, rt_base_t pin) { const struct pin_info *item; @@ -337,7 +337,7 @@ int ch32f1_pin_read(rt_device_t dev, rt_base_t pin) return GPIO_ReadInputDataBit(item->gpio, item->gpio_pin); } -rt_err_t ch32f1_pin_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), +rt_err_t ch32f1_pin_attach_irq(struct rt_device *device, rt_base_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args) { struct rt_pin_irq_hdr bind_item; @@ -350,12 +350,12 @@ rt_err_t ch32f1_pin_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint return exti_line_irq_list_bind(&bind_item); } -rt_err_t ch32f1_pin_detach_irq(struct rt_device *device, rt_int32_t pin) +rt_err_t ch32f1_pin_detach_irq(struct rt_device *device, rt_base_t pin) { return exti_line_irq_list_unbind(pin); } -rt_err_t ch32f1_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled) +rt_err_t ch32f1_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled) { struct exti_line_irq *find; const struct pin_info *item; diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f20x.c index f356944c5b..3d92078129 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f20x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_gpio_ch32f20x.c @@ -30,10 +30,10 @@ struct pin_info }; /* -*pin: assign number, start 0 -*group: such GPIOA, use 'A' -*gpio_pin: such GPIO_PIN_0, use '0' -*/ + *pin: assign number, start 0 + *group: such GPIOA, use 'A' + *gpio_pin: such GPIO_PIN_0, use '0' + */ #define ASSIGN_PIN(pin, group, gpio_pin) \ { \ pin, GPIO_Pin_##gpio_pin, GPIO_PortSourceGPIO##group, GPIO_PinSource##gpio_pin, GPIO##group \ @@ -102,37 +102,37 @@ static const struct pin_info pin_info_list[] = { ASSIGN_PIN(48, D, 0), ASSIGN_PIN(49, D, 1), ASSIGN_PIN(50, D, 2), - ASSIGN_PIN(51, D, 3), - ASSIGN_PIN(52, D, 4), - ASSIGN_PIN(53, D, 5), - ASSIGN_PIN(54, D, 6), - ASSIGN_PIN(55, D, 7), - ASSIGN_PIN(56, D, 8), - ASSIGN_PIN(57, D, 9), - ASSIGN_PIN(58, D, 10), - ASSIGN_PIN(59, D, 11), - ASSIGN_PIN(60, D, 12), - ASSIGN_PIN(61, D, 13), - ASSIGN_PIN(62, D, 14), - ASSIGN_PIN(63, D, 15), + ASSIGN_PIN(51, D, 3), + ASSIGN_PIN(52, D, 4), + ASSIGN_PIN(53, D, 5), + ASSIGN_PIN(54, D, 6), + ASSIGN_PIN(55, D, 7), + ASSIGN_PIN(56, D, 8), + ASSIGN_PIN(57, D, 9), + ASSIGN_PIN(58, D, 10), + ASSIGN_PIN(59, D, 11), + ASSIGN_PIN(60, D, 12), + ASSIGN_PIN(61, D, 13), + ASSIGN_PIN(62, D, 14), + ASSIGN_PIN(63, D, 15), #endif #if defined(GPIOE) ASSIGN_PIN(64, E, 0), ASSIGN_PIN(65, E, 1), ASSIGN_PIN(66, E, 2), - ASSIGN_PIN(67, E, 3), - ASSIGN_PIN(68, E, 4), - ASSIGN_PIN(69, E, 5), - ASSIGN_PIN(70, E, 6), - ASSIGN_PIN(71, E, 7), - ASSIGN_PIN(72, E, 8), - ASSIGN_PIN(73, E, 9), - ASSIGN_PIN(74, E, 10), - ASSIGN_PIN(75, E, 11), - ASSIGN_PIN(76, E, 12), - ASSIGN_PIN(77, E, 13), - ASSIGN_PIN(78, E, 14), - ASSIGN_PIN(79, E, 15), + ASSIGN_PIN(67, E, 3), + ASSIGN_PIN(68, E, 4), + ASSIGN_PIN(69, E, 5), + ASSIGN_PIN(70, E, 6), + ASSIGN_PIN(71, E, 7), + ASSIGN_PIN(72, E, 8), + ASSIGN_PIN(73, E, 9), + ASSIGN_PIN(74, E, 10), + ASSIGN_PIN(75, E, 11), + ASSIGN_PIN(76, E, 12), + ASSIGN_PIN(77, E, 13), + ASSIGN_PIN(78, E, 14), + ASSIGN_PIN(79, E, 15), #endif }; @@ -167,8 +167,8 @@ static rt_base_t pin_info_list_find_pin(rt_uint16_t portsource, rt_uint16_t pins } /* -*use: 0 using the exti line, -1 do not using -*/ + *use: 0 using the exti line, -1 do not using + */ struct exti_line_irq { rt_uint16_t nvic_priority; @@ -300,7 +300,7 @@ static rt_err_t exti_line_irq_list_unbind(rt_int16_t pin) return ret; } -void ch32f2_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode) +void ch32f2_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode) { const struct pin_info *item; GPIO_InitTypeDef gpio_initstruct; @@ -340,7 +340,7 @@ void ch32f2_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode) GPIO_Init(item->gpio, &gpio_initstruct); } -void ch32f2_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value) +void ch32f2_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value) { const struct pin_info *item; @@ -354,7 +354,7 @@ void ch32f2_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value) GPIO_WriteBit(item->gpio, item->gpio_pin, (BitAction)value); } -int ch32f2_pin_read(rt_device_t dev, rt_base_t pin) +rt_int8_t ch32f2_pin_read(rt_device_t dev, rt_base_t pin) { const struct pin_info *item; @@ -368,7 +368,7 @@ int ch32f2_pin_read(rt_device_t dev, rt_base_t pin) return GPIO_ReadInputDataBit(item->gpio, item->gpio_pin); } -rt_err_t ch32f2_pin_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint32_t mode, void (*hdr)(void *args), +rt_err_t ch32f2_pin_attach_irq(struct rt_device *device, rt_base_t pin, rt_uint8_t mode, void (*hdr)(void *args), void *args) { struct rt_pin_irq_hdr bind_item; @@ -381,12 +381,12 @@ rt_err_t ch32f2_pin_attach_irq(struct rt_device *device, rt_int32_t pin, rt_uint return exti_line_irq_list_bind(&bind_item); } -rt_err_t ch32f2_pin_detach_irq(struct rt_device *device, rt_int32_t pin) +rt_err_t ch32f2_pin_detach_irq(struct rt_device *device, rt_base_t pin) { return exti_line_irq_list_unbind(pin); } -rt_err_t ch32f2_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled) +rt_err_t ch32f2_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled) { struct exti_line_irq *find; const struct pin_info *item; diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f10x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f10x.c index 173cdeb1ed..72c125acf0 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f10x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f10x.c @@ -76,7 +76,7 @@ static rt_err_t ch32f1_rt_rtc_init(void) return RT_EOK; } -static rt_err_t ch32f1_get_secs(void *args) +static rt_err_t ch32f1_get_secs(time_t *args) { *(rt_uint32_t *)args = RTC_GetCounter(); LOG_D("RTC: get rtc_time %x\n", *(rt_uint32_t *)args); @@ -84,7 +84,7 @@ static rt_err_t ch32f1_get_secs(void *args) return RT_EOK; } -static rt_err_t ch32f1_set_secs(void *args) +static rt_err_t ch32f1_set_secs(time_t *args) { /* Set the RTC counter value */ RTC_SetCounter(*(rt_uint32_t *)args); diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f20x.c index b1df196bd5..237d5305d4 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f20x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_rtc_ch32f20x.c @@ -76,7 +76,7 @@ static rt_err_t ch32f2_rt_rtc_init(void) return RT_EOK; } -static rt_err_t ch32f2_get_secs(void *args) +static rt_err_t ch32f2_get_secs(time_t *args) { *(rt_uint32_t *)args = RTC_GetCounter(); LOG_D("RTC: get rtc_time %x\n", *(rt_uint32_t *)args); @@ -84,7 +84,7 @@ static rt_err_t ch32f2_get_secs(void *args) return RT_EOK; } -static rt_err_t ch32f2_set_secs(void *args) +static rt_err_t ch32f2_set_secs(time_t *args) { /* Set the RTC counter value */ RTC_SetCounter(*(rt_uint32_t *)args); diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c index 6ed05b9905..db3ec7dec2 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c @@ -189,7 +189,7 @@ static rt_err_t ch32f1_spi_configure(struct rt_spi_device *device, struct rt_spi return RT_EOK; }; -static rt_uint32_t ch32f1_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message) +static rt_ssize_t ch32f1_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message) { struct rt_spi_bus *spi_bus; struct spi_bus_device *spi_bus_dev; diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c index 769b5c12b8..4d712065b6 100644 --- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c +++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c @@ -194,7 +194,7 @@ static rt_err_t ch32f2_spi_configure(struct rt_spi_device *device, struct rt_spi return RT_EOK; }; -static rt_uint32_t ch32f2_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message) +static rt_ssize_t ch32f2_spi_xfer(struct rt_spi_device *device, struct rt_spi_message *message) { struct rt_spi_bus *spi_bus; struct spi_bus_device *spi_bus_dev; diff --git a/bsp/wch/arm/ch32f103c8-core/project.uvprojx b/bsp/wch/arm/ch32f103c8-core/project.uvprojx index 630596773e..bb24bb1872 100644 --- a/bsp/wch/arm/ch32f103c8-core/project.uvprojx +++ b/bsp/wch/arm/ch32f103c8-core/project.uvprojx @@ -1,12 +1,16 @@ + 2.1 +
### uVision Project, (C) Keil Software
+ rtthread-ch32f103x 0x4 ARM-ADS + 5060960::V5.06 update 7 (build 960)::ARMCC 0 @@ -15,28 +19,28 @@ Keil.WCH32F1xx_DFP.1.0.1 http://www.wch.cn/ IRAM(0x20000000,0x5000) IROM(0x08000000,0x10000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0CH32F1xx -FS08000000 -FL010000 -FP0($$Device:CH32F103C8$Flash\CH32F1xx.FLM)) 0 $$Device:CH32F103C8$Device\Include\ch32f10x.h - - - - - - - - - + + + + + + + + + $$Device:CH32F103C8$SVD\CH32F103xx.svd 0 0 - - - - - + + + + + 0 0 @@ -58,8 +62,8 @@ 0 0 - - + + 0 0 0 @@ -68,8 +72,8 @@ 0 0 - - + + 0 0 0 @@ -79,14 +83,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -100,8 +104,8 @@ 0 0 3 - - + + 1 @@ -110,7 +114,7 @@ DCM.DLL -pCM3 SARMCM3.DLL - + TCM.DLL -pCM3 @@ -135,10 +139,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -171,7 +175,7 @@ 0 0 "Cortex-M3" - + 0 0 0 @@ -182,6 +186,7 @@ 0 0 0 + 0 0 0 8 @@ -305,7 +310,7 @@ 0x0 - + 1 @@ -332,10 +337,10 @@ 0 0 - - RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARM_LIBC, __CLK_TCK=RT_TICK_PER_SECOND - - applications;.;..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS;..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Include;..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\inc;..\..\..\..\components\libc\compilers\common\include;..\..\..\..\components\libc\compilers\common\extension;..\..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\..\libcpu\arm\common;..\..\..\..\libcpu\arm\cortex-m3;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\spi;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;board;..\Libraries\ch32_drivers;..\Libraries\ch32_drivers\config;..\..\..\..\components\finsh;.;..\..\..\..\include;..\..\..\..\components\libc\posix\io\poll;..\..\..\..\components\libc\posix\io\stdio;..\..\..\..\components\libc\posix\ipc + + RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + + board;.;..\..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\..\components\drivers\include;..\..\..\..\libcpu\arm\cortex-m3;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\libc\posix\io\poll;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\Libraries\ch32_drivers\config;..\..\..\..\components\drivers\include;..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\inc;..\..\..\..\components\libc\compilers\common\extension;..\Libraries\ch32_drivers;..\..\..\..\include;..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS;..\..\..\..\components\libc\posix\ipc;..\..\..\..\components\drivers\include;..\..\..\..\components\libc\compilers\common\include;applications;..\..\..\..\components\libc\posix\io\stdio;..\..\..\..\components\finsh;..\..\..\..\libcpu\arm\common;..\..\..\..\components\drivers\spi;..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Include @@ -350,10 +355,10 @@ 0 1 - - - - + + + + @@ -365,13 +370,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -394,134 +399,96 @@ 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_wwdg.c - - ch32f10x_pwr.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_pwr.c - - ch32f10x_i2c.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_i2c.c - - ch32f10x_usart.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_usart.c - - ch32f10x_iwdg.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_iwdg.c - - ch32f10x_tim.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_tim.c - - ch32f10x_dma.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_dma.c - - ch32f10x_dbgmcu.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_dbgmcu.c - - ch32f10x_spi.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_spi.c - - ch32f10x_bkp.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_bkp.c - - ch32f10x_rtc.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_rtc.c - - ch32f10x_can.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_can.c - - ch32f10x_misc.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_misc.c - - ch32f10x_dac.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_dac.c - - ch32f10x_exti.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_exti.c - - ch32f10x_crc.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_crc.c - - ch32f10x_adc.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_adc.c - - ch32f10x_flash.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_flash.c - - ch32f10x_gpio.c 1 ..\Libraries\CH32F10x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f10x_gpio.c - - ch32f10x_rcc.c 1 @@ -537,50 +504,36 @@ 1 ..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c - - syscalls.c 1 ..\..\..\..\components\libc\compilers\armlibc\syscalls.c - - cctype.c 1 ..\..\..\..\components\libc\compilers\common\cctype.c - - cstdio.c 1 ..\..\..\..\components\libc\compilers\common\cstdio.c - - cstdlib.c 1 ..\..\..\..\components\libc\compilers\common\cstdlib.c - - cstring.c 1 ..\..\..\..\components\libc\compilers\common\cstring.c - - ctime.c 1 ..\..\..\..\components\libc\compilers\common\ctime.c - - cwchar.c 1 @@ -590,35 +543,22 @@ CPU - - - backtrace.c - 1 - ..\..\..\..\libcpu\arm\common\backtrace.c - - div0.c 1 ..\..\..\..\libcpu\arm\common\div0.c - - showmem.c 1 ..\..\..\..\libcpu\arm\common\showmem.c - - context_rvds.S 2 ..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - cpuport.c 1 @@ -634,99 +574,71 @@ 1 ..\..\..\..\components\drivers\i2c\i2c_core.c - - i2c_dev.c 1 ..\..\..\..\components\drivers\i2c\i2c_dev.c - - completion.c 1 ..\..\..\..\components\drivers\ipc\completion.c - - dataqueue.c 1 ..\..\..\..\components\drivers\ipc\dataqueue.c - - pipe.c 1 ..\..\..\..\components\drivers\ipc\pipe.c - - ringblk_buf.c 1 ..\..\..\..\components\drivers\ipc\ringblk_buf.c - - ringbuffer.c 1 ..\..\..\..\components\drivers\ipc\ringbuffer.c - - waitqueue.c 1 ..\..\..\..\components\drivers\ipc\waitqueue.c - - workqueue.c 1 ..\..\..\..\components\drivers\ipc\workqueue.c - - pin.c 1 ..\..\..\..\components\drivers\misc\pin.c - - rtc.c 1 ..\..\..\..\components\drivers\rtc\rtc.c - - serial.c 1 ..\..\..\..\components\drivers\serial\serial.c - - spi_core.c 1 ..\..\..\..\components\drivers\spi\spi_core.c - - spi_dev.c 1 ..\..\..\..\components\drivers\spi\spi_dev.c - - watchdog.c 1 @@ -742,36 +654,26 @@ 2 ..\Libraries\CH32F10x_StdPeriph_Driver\CMSIS\WCH\CH32F10x\Source\ARM\startup_ch32f10x.s - - board.c 1 board\board.c - - system_ch32f10x.c 1 board\system_ch32f10x.c - - drv_common.c 1 ..\Libraries\ch32_drivers\drv_common.c - - drv_gpio_ch32f10x.c 1 ..\Libraries\ch32_drivers\drv_gpio_ch32f10x.c - - drv_uart_ch32f10x.c 1 @@ -787,22 +689,16 @@ 1 ..\..\..\..\components\finsh\shell.c - - msh.c 1 ..\..\..\..\components\finsh\msh.c - - msh_parse.c 1 ..\..\..\..\components\finsh\msh_parse.c - - cmd.c 1 @@ -818,85 +714,61 @@ 1 ..\..\..\..\src\clock.c - - components.c 1 ..\..\..\..\src\components.c - - device.c 1 ..\..\..\..\src\device.c - - idle.c 1 ..\..\..\..\src\idle.c - - ipc.c 1 ..\..\..\..\src\ipc.c - - irq.c 1 ..\..\..\..\src\irq.c - - kservice.c 1 ..\..\..\..\src\kservice.c - - mem.c 1 ..\..\..\..\src\mem.c - - mempool.c 1 ..\..\..\..\src\mempool.c - - object.c 1 ..\..\..\..\src\object.c - - scheduler.c 1 ..\..\..\..\src\scheduler.c - - thread.c 1 ..\..\..\..\src\thread.c - - timer.c 1 @@ -907,9 +779,11 @@ + - - - + + + + diff --git a/bsp/wch/arm/ch32f203r-evt/project.uvprojx b/bsp/wch/arm/ch32f203r-evt/project.uvprojx index 0b33a29338..1629135dff 100644 --- a/bsp/wch/arm/ch32f203r-evt/project.uvprojx +++ b/bsp/wch/arm/ch32f203r-evt/project.uvprojx @@ -1,42 +1,46 @@ + 2.1 +
### uVision Project, (C) Keil Software
+ rtthread-ch32f203x 0x4 ARM-ADS + 5060960::V5.06 update 7 (build 960)::ARMCC 0 CH32F203RC WCH - Keil.WCH32F2xx_DFP.1.0.0 + Keil.WCH32F2xx_DFP.1.0.2 http://www.wch.cn/ IRAM(0x20000000,0x8000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0CH32F2xx -FS08000000 -FL078000 -FP0($$Device:CH32F203RC$Flash\CH32F2xx.FLM)) 0 $$Device:CH32F203RC$Device\Include\ch32f20x.h - - - - - - - - - + + + + + + + + + $$Device:CH32F203RC$SVD\CH32F203xx.svd 0 0 - - - - - + + + + + 0 0 @@ -58,8 +62,8 @@ 0 0 - - + + 0 0 0 @@ -68,8 +72,8 @@ 0 0 - - + + 0 0 0 @@ -79,14 +83,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -100,8 +104,8 @@ 0 0 3 - - + + 1 @@ -110,7 +114,7 @@ DCM.DLL -pCM3 SARMCM3.DLL - + TCM.DLL -pCM3 @@ -134,11 +138,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -171,7 +175,7 @@ 0 0 "Cortex-M3" - + 0 0 0 @@ -182,6 +186,7 @@ 0 0 0 + 0 0 0 8 @@ -305,7 +310,7 @@ 0x0 - + 1 @@ -332,10 +337,10 @@ 0 0 - - RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARM_LIBC, __CLK_TCK=RT_TICK_PER_SECOND - - applications;.;..\Libraries\CH32F20x_StdPeriph_Driver\CMSIS;..\Libraries\CH32F20x_StdPeriph_Driver\CMSIS\WCH\CH32F20x\Include;..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\inc;..\..\..\..\components\libc\compilers\common\include;..\..\..\..\components\libc\compilers\common\extension;..\..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\..\libcpu\arm\common;..\..\..\..\libcpu\arm\cortex-m3;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\spi;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;board;..\Libraries\ch32_drivers;..\Libraries\ch32_drivers\config;..\..\..\..\components\finsh;.;..\..\..\..\include;..\..\..\..\components\libc\posix\io\poll;..\..\..\..\components\libc\posix\io\stdio;..\..\..\..\components\libc\posix\ipc + + RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + + applications;..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\inc;..\..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\..\components\drivers\include;..\..\..\..\components\drivers\include;..\..\..\..\components\libc\posix\io\stdio;..\..\..\..\components\drivers\include;..\..\..\..\components\libc\posix\io\poll;..\..\..\..\components\drivers\include;board;..\..\..\..\components\drivers\include;..\Libraries\ch32_drivers\config;..\..\..\..\components\drivers\include;.;..\..\..\..\components\libc\compilers\common\extension;..\Libraries\ch32_drivers;..\..\..\..\components\drivers\include;..\..\..\..\include;..\..\..\..\components\libc\posix\ipc;..\..\..\..\components\drivers\include;..\..\..\..\components\libc\compilers\common\include;..\..\..\..\libcpu\arm\cortex-m3;..\Libraries\CH32F20x_StdPeriph_Driver\CMSIS;..\Libraries\CH32F20x_StdPeriph_Driver\CMSIS\WCH\CH32F20x\Include;..\..\..\..\components\finsh;..\..\..\..\libcpu\arm\common;..\..\..\..\components\drivers\spi @@ -350,10 +355,10 @@ 0 1 - - - - + + + + @@ -365,13 +370,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -394,141 +399,101 @@ 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_flash.c - - ch32f20x_usart.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_usart.c - - startup_ch32f20x.s 2 ..\Libraries\CH32F20x_StdPeriph_Driver\CMSIS\WCH\CH32F20x\Source\ARM\startup_ch32f20x.s - - ch32f20x_dma.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_dma.c - - ch32f20x_dbgmcu.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_dbgmcu.c - - ch32f20x_crc.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_crc.c - - ch32f20x_misc.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_misc.c - - ch32f20x_gpio.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_gpio.c - - ch32f20x_can.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_can.c - - ch32f20x_rtc.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_rtc.c - - ch32f20x_iwdg.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_iwdg.c - - ch32f20x_i2c.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_i2c.c - - ch32f20x_dac.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_dac.c - - ch32f20x_bkp.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_bkp.c - - ch32f20x_wwdg.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_wwdg.c - - ch32f20x_tim.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_tim.c - - ch32f20x_rcc.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_rcc.c - - ch32f20x_exti.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_exti.c - - ch32f20x_spi.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_spi.c - - ch32f20x_pwr.c 1 ..\Libraries\CH32F20x_StdPeriph_Driver\StdPeriph_Driver\src\ch32f20x_pwr.c - - ch32f20x_adc.c 1 @@ -544,50 +509,36 @@ 1 ..\..\..\..\components\libc\compilers\armlibc\syscall_mem.c - - syscalls.c 1 ..\..\..\..\components\libc\compilers\armlibc\syscalls.c - - cctype.c 1 ..\..\..\..\components\libc\compilers\common\cctype.c - - cstdio.c 1 ..\..\..\..\components\libc\compilers\common\cstdio.c - - cstdlib.c 1 ..\..\..\..\components\libc\compilers\common\cstdlib.c - - cstring.c 1 ..\..\..\..\components\libc\compilers\common\cstring.c - - ctime.c 1 ..\..\..\..\components\libc\compilers\common\ctime.c - - cwchar.c 1 @@ -597,35 +548,22 @@ CPU - - - backtrace.c - 1 - ..\..\..\..\libcpu\arm\common\backtrace.c - - div0.c 1 ..\..\..\..\libcpu\arm\common\div0.c - - showmem.c 1 ..\..\..\..\libcpu\arm\common\showmem.c - - context_rvds.S 2 ..\..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - cpuport.c 1 @@ -641,120 +579,86 @@ 1 ..\..\..\..\components\drivers\hwtimer\hwtimer.c - - i2c-bit-ops.c 1 ..\..\..\..\components\drivers\i2c\i2c-bit-ops.c - - i2c_core.c 1 ..\..\..\..\components\drivers\i2c\i2c_core.c - - i2c_dev.c 1 ..\..\..\..\components\drivers\i2c\i2c_dev.c - - completion.c 1 ..\..\..\..\components\drivers\ipc\completion.c - - dataqueue.c 1 ..\..\..\..\components\drivers\ipc\dataqueue.c - - pipe.c 1 ..\..\..\..\components\drivers\ipc\pipe.c - - ringblk_buf.c 1 ..\..\..\..\components\drivers\ipc\ringblk_buf.c - - ringbuffer.c 1 ..\..\..\..\components\drivers\ipc\ringbuffer.c - - waitqueue.c 1 ..\..\..\..\components\drivers\ipc\waitqueue.c - - workqueue.c 1 ..\..\..\..\components\drivers\ipc\workqueue.c - - pin.c 1 ..\..\..\..\components\drivers\misc\pin.c - - rt_drv_pwm.c 1 ..\..\..\..\components\drivers\misc\rt_drv_pwm.c - - rtc.c 1 ..\..\..\..\components\drivers\rtc\rtc.c - - serial.c 1 ..\..\..\..\components\drivers\serial\serial.c - - spi_core.c 1 ..\..\..\..\components\drivers\spi\spi_core.c - - spi_dev.c 1 ..\..\..\..\components\drivers\spi\spi_dev.c - - watchdog.c 1 @@ -770,64 +674,46 @@ 1 board\board.c - - system_ch32f20x.c 1 board\system_ch32f20x.c - - drv_common.c 1 ..\Libraries\ch32_drivers\drv_common.c - - drv_gpio_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_gpio_ch32f20x.c - - drv_hwi2c_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_hwi2c_ch32f20x.c - - drv_hwtimer_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_hwtimer_ch32f20x.c - - drv_iwdt_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_iwdt_ch32f20x.c - - drv_rtc_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_rtc_ch32f20x.c - - drv_spi_ch32f20x.c 1 ..\Libraries\ch32_drivers\drv_spi_ch32f20x.c - - drv_uart_ch32f20x.c 1 @@ -843,22 +729,16 @@ 1 ..\..\..\..\components\finsh\shell.c - - msh.c 1 ..\..\..\..\components\finsh\msh.c - - msh_parse.c 1 ..\..\..\..\components\finsh\msh_parse.c - - cmd.c 1 @@ -874,85 +754,61 @@ 1 ..\..\..\..\src\clock.c - - components.c 1 ..\..\..\..\src\components.c - - device.c 1 ..\..\..\..\src\device.c - - idle.c 1 ..\..\..\..\src\idle.c - - ipc.c 1 ..\..\..\..\src\ipc.c - - irq.c 1 ..\..\..\..\src\irq.c - - kservice.c 1 ..\..\..\..\src\kservice.c - - mem.c 1 ..\..\..\..\src\mem.c - - mempool.c 1 ..\..\..\..\src\mempool.c - - object.c 1 ..\..\..\..\src\object.c - - scheduler.c 1 ..\..\..\..\src\scheduler.c - - thread.c 1 ..\..\..\..\src\thread.c - - timer.c 1 @@ -963,9 +819,11 @@ + - - - + + + +