diff --git a/bsp/gd32450z-eval/drivers/drv_spi.c b/bsp/gd32450z-eval/drivers/drv_spi.c index 4f116d7d680028303dc340359ffd0b2aff157303..f4e56e1a8c2b677d77272d8385de23c48506c9c8 100644 --- a/bsp/gd32450z-eval/drivers/drv_spi.c +++ b/bsp/gd32450z-eval/drivers/drv_spi.c @@ -130,7 +130,7 @@ static rt_err_t configure(struct rt_spi_device* device, } } /* baudrate */ - switch(configuration->mode) + switch(configuration->mode & RT_SPI_MODE_3) { case RT_SPI_MODE_0: spi_init_struct.clock_polarity_phase = SPI_CK_PL_LOW_PH_1EDGE; diff --git a/bsp/lpc176x/project.ewp b/bsp/lpc176x/project.ewp index 5b6109ab5fa93f2f94a001d7ad0cd0f50d5e5e56..cc30279eaefd8c36fcf05ab635550381728c7615 100644 --- a/bsp/lpc176x/project.ewp +++ b/bsp/lpc176x/project.ewp @@ -155,6 +155,7 @@ @@ -2069,60 +2071,57 @@ - Kernel - - $PROJ_DIR$\..\..\..\src\clock.c - - - $PROJ_DIR$\..\..\..\src\components.c - + Applications - $PROJ_DIR$\..\..\..\src\cpu.c + $PROJ_DIR$\applications\main.c + + + CPU - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + + + DeviceDrivers - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\src\memheap.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2147,63 +2146,63 @@ - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\object.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\scheduler.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\thread.c + + + $PROJ_DIR$\..\..\..\src\timer.c @@ -2211,9 +2210,6 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - dlib $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2249,7 +2245,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c @@ -2277,9 +2273,6 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj index 035380edc583b0b0c689f9eb92bd87f5b9ea3fa7..a232cd71f06dcd202c374d1dd14a8a18dd0c079d 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvproj @@ -357,9 +357,9 @@ 0 - USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F103xE + USE_HAL_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\include;..\..\..\libcpu\arm\cortex-m3;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -392,7 +392,7 @@ .\board\linker_scripts\link.sct - --keep *.o(.rti_fn.*) --keep *.o(FSymTab) + @@ -410,167 +410,28 @@ - Drivers - - - board.c - 1 - board\board.c - - - - - stm32f1xx_hal_msp.c - 1 - board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - - - - - startup_stm32f103xe.s - 2 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - - - - - drv_gpio.c - 1 - ..\libraries\HAL_Drivers\drv_gpio.c - - - - - drv_usart.c - 1 - ..\libraries\HAL_Drivers\drv_usart.c - - - - - drv_common.c - 1 - ..\libraries\HAL_Drivers\drv_common.c - - - - - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - - - - components.c - 1 - ..\..\..\src\components.c - - - - - cpu.c - 1 - ..\..\..\src\cpu.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 - - - - - memheap.c - 1 - ..\..\..\src\memheap.c - - - - - mempool.c - 1 - ..\..\..\src\mempool.c - - - - - object.c - 1 - ..\..\..\src\object.c - - - - - scheduler.c - 1 - ..\..\..\src\scheduler.c - - + CPU - signal.c + backtrace.c 1 - ..\..\..\src\signal.c + ..\..\..\libcpu\arm\common\backtrace.c - thread.c + div0.c 1 - ..\..\..\src\thread.c + ..\..\..\libcpu\arm\common\div0.c - timer.c + showmem.c 1 - ..\..\..\src\timer.c + ..\..\..\libcpu\arm\common\showmem.c - - - CORTEX-M3 cpuport.c @@ -585,27 +446,6 @@ ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - - - - div0.c - 1 - ..\..\..\libcpu\arm\common\div0.c - - - - - showmem.c - 1 - ..\..\..\libcpu\arm\common\showmem.c - - DeviceDrivers @@ -674,270 +514,262 @@ - finsh + Drivers - shell.c + board.c 1 - ..\..\..\components\finsh\shell.c + board\board.c - symbol.c + stm32f1xx_hal_msp.c 1 - ..\..\..\components\finsh\symbol.c + board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - cmd.c - 1 - ..\..\..\components\finsh\cmd.c + startup_stm32f103xe.s + 2 + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - msh.c + drv_gpio.c 1 - ..\..\..\components\finsh\msh.c + ..\libraries\HAL_Drivers\drv_gpio.c - msh_cmd.c + drv_usart.c 1 - ..\..\..\components\finsh\msh_cmd.c + ..\libraries\HAL_Drivers\drv_usart.c - msh_file.c + drv_common.c 1 - ..\..\..\components\finsh\msh_file.c + ..\libraries\HAL_Drivers\drv_common.c - libc - - - libc.c - 1 - ..\..\..\components\libc\compilers\armlibc\libc.c - - - - - mem_std.c - 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c - - + finsh - stubs.c + shell.c 1 - ..\..\..\components\libc\compilers\armlibc\stubs.c + ..\..\..\components\finsh\shell.c - time.c + cmd.c 1 - ..\..\..\components\libc\compilers\armlibc\time.c + ..\..\..\components\finsh\cmd.c - gmtime_r.c + msh.c 1 - ..\..\..\components\libc\compilers\common\gmtime_r.c + ..\..\..\components\finsh\msh.c - STM32_HAL + Kernel - system_stm32f1xx.c + clock.c 1 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c + ..\..\..\src\clock.c - stm32f1xx_hal_adc.c + components.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c + ..\..\..\src\components.c - stm32f1xx_hal_adc_ex.c + device.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c + ..\..\..\src\device.c - stm32f1xx_hal_gpio.c + idle.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + ..\..\..\src\idle.c - stm32f1xx_hal_gpio_ex.c + ipc.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c + ..\..\..\src\ipc.c - stm32f1xx_hal_flash.c + irq.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c + ..\..\..\src\irq.c - stm32f1xx_hal_flash_ex.c + kservice.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c + ..\..\..\src\kservice.c - stm32f1xx_hal_dma.c + mem.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c + ..\..\..\src\mem.c - stm32f1xx_hal_cortex.c + memheap.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c + ..\..\..\src\memheap.c - stm32f1xx_hal_crc.c + mempool.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c + ..\..\..\src\mempool.c - stm32f1xx_hal_i2c.c + object.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c + ..\..\..\src\object.c - stm32f1xx_hal_irda.c + scheduler.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_irda.c + ..\..\..\src\scheduler.c - stm32f1xx_hal_iwdg.c + signal.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_iwdg.c + ..\..\..\src\signal.c - stm32f1xx_hal_pwr.c + thread.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c + ..\..\..\src\thread.c - stm32f1xx_hal_rcc.c + timer.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c + ..\..\..\src\timer.c + + + libc - stm32f1xx_hal_rcc_ex.c + libc.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c + ..\..\..\components\libc\compilers\armlibc\libc.c - stm32f1xx_hal_rtc.c + mem_std.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc.c + ..\..\..\components\libc\compilers\armlibc\mem_std.c - stm32f1xx_hal_rtc_ex.c + stubs.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc_ex.c + ..\..\..\components\libc\compilers\armlibc\stubs.c - stm32f1xx_hal_smartcard.c + time.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_smartcard.c + ..\..\..\components\libc\compilers\common\time.c + + + Libraries - stm32f1xx_hal_spi.c + system_stm32f1xx.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c + ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c - stm32f1xx_hal_spi_ex.c + stm32f1xx_hal_dma.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi_ex.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c - stm32f1xx_hal_tim.c + stm32f1xx_hal_cortex.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c - stm32f1xx_hal_tim_ex.c + stm32f1xx_hal_crc.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c - stm32f1xx_hal_uart.c + stm32f1xx_hal_pwr.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c - stm32f1xx_hal_usart.c + stm32f1xx_hal_rcc.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c - stm32f1xx_hal_wwdg.c + stm32f1xx_hal_rcc_ex.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_wwdg.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c @@ -947,125 +779,6 @@ ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c - - - stm32f1xx_ll_adc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_adc.c - - - - - stm32f1xx_ll_crc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_crc.c - - - - - stm32f1xx_ll_dac.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dac.c - - - - - stm32f1xx_ll_dma.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dma.c - - - - - stm32f1xx_ll_exti.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_exti.c - - - - - stm32f1xx_ll_fsmc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_fsmc.c - - - - - stm32f1xx_ll_gpio.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_gpio.c - - - - - stm32f1xx_ll_i2c.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_i2c.c - - - - - stm32f1xx_ll_pwr.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_pwr.c - - - - - stm32f1xx_ll_rcc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rcc.c - - - - - stm32f1xx_ll_rtc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rtc.c - - - - - stm32f1xx_ll_sdmmc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_sdmmc.c - - - - - stm32f1xx_ll_spi.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_spi.c - - - - - stm32f1xx_ll_tim.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_tim.c - - - - - stm32f1xx_ll_usart.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usart.c - - - - - stm32f1xx_ll_usb.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usb.c - - - - - stm32f1xx_ll_utils.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_utils.c - - stm32f1xx_hal_cec.c @@ -1075,100 +788,30 @@ - stm32f1xx_hal_can.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_can.c - - - - - stm32f1xx_hal_dac.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dac.c - - - - - stm32f1xx_hal_dac_ex.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dac_ex.c - - - - - stm32f1xx_hal_eth.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_eth.c - - - - - stm32f1xx_hal_hcd.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_hcd.c - - - - - stm32f1xx_hal_i2s.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2s.c - - - - - stm32f1xx_hal_mmc.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_mmc.c - - - - - stm32f1xx_hal_sd.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sd.c - - - - - stm32f1xx_hal_nand.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_nand.c - - - - - stm32f1xx_hal_pccard.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pccard.c - - - - - stm32f1xx_hal_nor.c + stm32f1xx_hal_gpio.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_nor.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c - stm32f1xx_hal_sram.c + stm32f1xx_hal_gpio_ex.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c - stm32f1xx_hal_pcd.c + stm32f1xx_hal_uart.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c - stm32f1xx_hal_pcd_ex.c + stm32f1xx_hal_usart.c 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd_ex.c + ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c diff --git a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx index 12b0122716de83c15c0defdb72f8dd24ae6ae07d..ea093faa8732b4435798a08037dc3d9ac84e93cf 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx +++ b/bsp/stm32/stm32f103-fire-arbitrary/project.uvprojx @@ -332,9 +332,9 @@ 0 - USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F103xE + USE_HAL_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -376,127 +376,116 @@ - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - - - - components.c - 1 - ..\..\..\src\components.c - - + Applications - cpu.c + main.c 1 - ..\..\..\src\cpu.c + applications\main.c + + + CPU - device.c + backtrace.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\backtrace.c - idle.c + div0.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\div0.c - ipc.c + showmem.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\common\showmem.c - irq.c + cpuport.c 1 - ..\..\..\src\irq.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - kservice.c - 1 - ..\..\..\src\kservice.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + DeviceDrivers - mem.c + pin.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\misc\pin.c - memheap.c + serial.c 1 - ..\..\..\src\memheap.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -546,130 +535,134 @@ - cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + Kernel - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\src\clock.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + memheap.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\memheap.c - waitqueue.c + mempool.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\mempool.c - workqueue.c + object.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\object.c - - - finsh - shell.c + scheduler.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\scheduler.c - cmd.c + signal.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\signal.c - msh.c + thread.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\thread.c + + + + + timer.c + 1 + ..\..\..\src\timer.c @@ -705,7 +698,7 @@ - STM32_HAL + Libraries system_stm32f1xx.c @@ -769,13 +762,6 @@ ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - - stm32f1xx_hal_sram.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - - stm32f1xx_hal_gpio.c diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp b/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp index 5f761c6ca5dac66e239856b5d76b551447270911..3fccb364fc56aeb6a3558feb4ce4607e5702ded4 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.ewp @@ -225,6 +225,7 @@ CCDefines STM32F103xB + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c - libc - - - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c @@ -2271,9 +2265,6 @@ $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - $PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvopt b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvopt index 59340ab9ed9388e4a3669585e29cc7957fb376d2..42b682251164a8d9a4b2f2ee461f6d63e10d51e3 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvopt +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvopt @@ -71,7 +71,7 @@ 0 - 1 + 0 0 1 @@ -113,7 +113,7 @@ 0 1 1 - 1 + 0 0 0 6 @@ -168,7 +168,7 @@ 0 0 0 - 0 + 1 0 @@ -176,956 +176,4 @@ - - Kernel - 0 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 1 - 2 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 1 - 3 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\cpu.c - cpu.c - 0 - 0 - - - 1 - 4 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 1 - 5 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 1 - 6 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 1 - 7 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 1 - 8 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 1 - 9 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 1 - 10 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 1 - 11 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 1 - 12 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 1 - 13 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\signal.c - signal.c - 0 - 0 - - - 1 - 14 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 1 - 15 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - - - Applications - 0 - 0 - 0 - 0 - - 2 - 16 - 1 - 0 - 1 - 0 - 0 - 1 - 1 - 0 - applications\main.c - main.c - 0 - 0 - - - - - Drivers - 0 - 0 - 0 - 0 - - 3 - 17 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - board\board.c - board.c - 0 - 0 - - - 3 - 18 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - stm32f1xx_hal_msp.c - 0 - 0 - - - 3 - 19 - 2 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s - startup_stm32f103xb.s - 0 - 0 - - - 3 - 20 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 3 - 21 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 3 - 22 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - cpu - 0 - 0 - 0 - 0 - - 4 - 23 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 4 - 24 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 4 - 25 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 4 - 26 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - cpuport.c - 0 - 0 - - - 4 - 27 - 2 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 5 - 28 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 5 - 29 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 5 - 30 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 5 - 31 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 5 - 32 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 5 - 33 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 5 - 34 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 5 - 35 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 5 - 36 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - finsh - 0 - 0 - 0 - 0 - - 6 - 37 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\symbol.c - symbol.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - 6 - 40 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - 6 - 41 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\msh_cmd.c - msh_cmd.c - 0 - 0 - - - 6 - 42 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\..\..\components\finsh\msh_file.c - msh_file.c - 0 - 0 - - - - - STM32_HAL - 0 - 0 - 0 - 0 - - 7 - 43 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c - system_stm32f1xx.c - 0 - 0 - - - 7 - 44 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c - stm32f1xx_hal_dma.c - 0 - 0 - - - 7 - 45 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c - stm32f1xx_hal_cortex.c - 0 - 0 - - - 7 - 46 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c - stm32f1xx_hal_crc.c - 0 - 0 - - - 7 - 47 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c - stm32f1xx_hal_pwr.c - 0 - 0 - - - 7 - 48 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c - stm32f1xx_hal_rcc.c - 0 - 0 - - - 7 - 49 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c - stm32f1xx_hal_rcc_ex.c - 0 - 0 - - - 7 - 50 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c - stm32f1xx_hal.c - 0 - 0 - - - 7 - 51 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - stm32f1xx_hal_cec.c - 0 - 0 - - - 7 - 52 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - stm32f1xx_hal_sram.c - 0 - 0 - - - 7 - 53 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c - stm32f1xx_hal_gpio.c - 0 - 0 - - - 7 - 54 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c - stm32f1xx_hal_gpio_ex.c - 0 - 0 - - - 7 - 55 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c - stm32f1xx_hal_uart.c - 0 - 0 - - - 7 - 56 - 1 - 0 - 1 - 3019404 - 0 - 0 - 5 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c - stm32f1xx_hal_usart.c - 0 - 0 - - - diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj index 17a0bbf9d8863ecd1dec18fd2bf10252e3003a05..f744e8df76d838e44b7755c8387e0a5363e399b1 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvproj @@ -1,10 +1,7 @@ - 1.1 -
### uVision Project, (C) Keil Software
- rt-thread @@ -15,26 +12,26 @@ STM32F103C8 STMicroelectronics IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") - + "STARTUP\ST\STM32F10x\startup_stm32f10x_md.s" ("STM32 Medium Density Line Startup Code") UL2CM3(-O14 -S0 -C0 -N00("ARM Cortex-M3") -D00(1BA00477) -L00(4) -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128 -FS08000000 -FL010000) 4235 stm32f10x.h - - - - - - - - - + + + + + + + + + SFD\ST\STM32F1xx\STM32F103xx.sfrSVD=SFD\ST\STM32F1xx\STM32F103xx.sfr 0 0 - - - + + + ST\STM32F10x\ ST\STM32F10x\ @@ -58,8 +55,8 @@ 0 0 - - + + 0 0 0 @@ -68,8 +65,8 @@ 0 0 - - + + 0 0 @@ -77,12 +74,12 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 - + 0 @@ -96,17 +93,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DARMSTM.DLL -pSTM32F103C8 SARMCM3.DLL - + TARMSTM.DLL -pSTM32F103C8 @@ -141,23 +138,23 @@ 1 0 1 - 1 + 0 0 6 - - - - - + + + + + - - - - - + + + + + Segger\JL2CM3.dll @@ -172,11 +169,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -209,7 +206,7 @@ 0 0 "Cortex-M3" - + 0 0 0 @@ -340,7 +337,7 @@ 0x0 - + 1 @@ -359,10 +356,10 @@ 1 0 - - STM32F103xB, USE_HAL_DRIVER - - .;..\..\..\include;applications;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + + STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__ + + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -376,10 +373,10 @@ 0 0 - - - - + + + + @@ -391,104 +388,128 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + - Kernel + Applications - clock.c - 1 - ..\..\..\src\clock.c - - - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + + CPU + - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c + + - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c + + - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c + + - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + + DeviceDrivers + - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c + + - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c + + - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c + + - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c + + - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c + + - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c + + - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c + + - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -500,26 +521,36 @@ 1 board\board.c + + stm32f1xx_hal_msp.c 1 board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + + startup_stm32f103xb.s 2 ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c + + drv_common.c 1 @@ -528,188 +559,217 @@
- cpu + finsh - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - - div0.c + shell.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\shell.c + + - showmem.c + cmd.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\cmd.c + + - cpuport.c + msh.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + ..\..\..\components\finsh\msh.c - DeviceDrivers + Kernel - pin.c - 1 - ..\..\..\components\drivers\misc\pin.c - - - serial.c + clock.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\clock.c + + - completion.c + components.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\components.c + + - dataqueue.c + device.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\device.c + + - pipe.c + idle.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\idle.c + + - ringblk_buf.c + ipc.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\ipc.c + + - ringbuffer.c + irq.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\irq.c + + - waitqueue.c + kservice.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\kservice.c + + - workqueue.c + mem.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\mem.c - - - finsh - shell.c + mempool.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\mempool.c + + - symbol.c + object.c 1 - ..\..\..\components\finsh\symbol.c + ..\..\..\src\object.c + + - cmd.c + scheduler.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\scheduler.c + + - msh.c + signal.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\signal.c + + - msh_cmd.c + thread.c 1 - ..\..\..\components\finsh\msh_cmd.c + ..\..\..\src\thread.c + + - msh_file.c + timer.c 1 - ..\..\..\components\finsh\msh_file.c + ..\..\..\src\timer.c - STM32_HAL + Libraries system_stm32f1xx.c 1 ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c + + stm32f1xx_hal_dma.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c + + stm32f1xx_hal_cortex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c + + stm32f1xx_hal_crc.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c + + stm32f1xx_hal_pwr.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c + + stm32f1xx_hal_rcc.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c + + stm32f1xx_hal_rcc_ex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c + + stm32f1xx_hal.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c + + stm32f1xx_hal_cec.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - stm32f1xx_hal_sram.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - + + stm32f1xx_hal_gpio.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + stm32f1xx_hal_gpio_ex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c + + stm32f1xx_hal_uart.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c + + stm32f1xx_hal_usart.c 1 @@ -720,5 +780,4 @@
- diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx index 45218d944561c9c23e7470ac90c026067faae3a0..08f1c38a27ebe6e7a93818434e128c00e881d9ea 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/project.uvprojx @@ -333,9 +333,9 @@ 0 - STM32F103xB, USE_HAL_DRIVER + STM32F103xB, USE_HAL_DRIVER, __RTTHREAD__ - .;..\..\..\include;applications;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -377,113 +377,116 @@ - Kernel + Applications - clock.c + main.c 1 - ..\..\..\src\clock.c + applications\main.c + + + CPU - components.c + backtrace.c 1 - ..\..\..\src\components.c + ..\..\..\libcpu\arm\common\backtrace.c - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + DeviceDrivers - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -533,135 +536,132 @@ - cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + Kernel - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\src\clock.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c - STM32_HAL + Libraries system_stm32f1xx.c diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.ewp b/bsp/stm32/stm32f103-hw100k-ibox/project.ewp index 9581c92094f67be5f008d321e81a48d28cc5cd41..69bdf58abd9bd18627422ad7481aa194cc26702a 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.ewp +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.ewp @@ -225,6 +225,7 @@ CCDefines STM32F103xE + __RTTHREAD__ RT_USING_DLIBC USE_HAL_DRIVER @@ -1296,6 +1297,7 @@ CCDefines STM32F103xE + __RTTHREAD__ RT_USING_DLIBC USE_HAL_DRIVER @@ -2143,54 +2145,57 @@ - Kernel + Applications - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\applications\main.c + + + CPU - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + + + DeviceDrivers - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2215,63 +2220,60 @@ - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2279,9 +2281,6 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - dlib $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2317,7 +2316,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.uvoptx b/bsp/stm32/stm32f103-hw100k-ibox/project.uvoptx index 95a31f060f427566cfa483e57c87efc62136f6ac..eccd61de784dcfb1620639f9df47b04cd43d07c5 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.uvoptx +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.uvoptx @@ -77,7 +77,7 @@ 0 1 - 18 + 255 0 1 @@ -181,799 +181,11 @@ - Kernel + Source Group 1 0 0 0 0 - - 1 - 1 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 1 - 2 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 1 - 3 - 1 - 0 - 0 - 0 - ..\..\..\src\cpu.c - cpu.c - 0 - 0 - - - 1 - 4 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 1 - 5 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 1 - 6 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 1 - 7 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 1 - 8 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 1 - 9 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 1 - 10 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 1 - 11 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 1 - 12 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 1 - 13 - 1 - 0 - 0 - 0 - ..\..\..\src\signal.c - signal.c - 0 - 0 - - - 1 - 14 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 1 - 15 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - - - Applications - 0 - 0 - 0 - 0 - - 2 - 16 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - Drivers - 1 - 0 - 0 - 0 - - 3 - 17 - 1 - 1 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 3 - 18 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32f1xx_hal_msp.c - stm32f1xx_hal_msp.c - 0 - 0 - - - 3 - 19 - 2 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s - startup_stm32f103xe.s - 0 - 0 - - - 3 - 20 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 3 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 3 - 22 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - cpu - 0 - 0 - 0 - 0 - - 4 - 23 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 4 - 24 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 4 - 25 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 4 - 26 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - cpuport.c - 0 - 0 - - - 4 - 27 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S - context_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 5 - 28 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 5 - 29 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 5 - 30 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 5 - 31 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 5 - 32 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 5 - 33 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 5 - 34 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 5 - 35 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 5 - 36 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - finsh - 0 - 0 - 0 - 0 - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\symbol.c - symbol.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - 6 - 40 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - 6 - 41 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh_cmd.c - msh_cmd.c - 0 - 0 - - - 6 - 42 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh_file.c - msh_file.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 7 - 43 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\libc.c - libc.c - 0 - 0 - - - 7 - 44 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\mem_std.c - mem_std.c - 0 - 0 - - - 7 - 45 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\stubs.c - stubs.c - 0 - 0 - - - 7 - 46 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\time.c - time.c - 0 - 0 - - - 7 - 47 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\gmtime_r.c - gmtime_r.c - 0 - 0 - - - - - STM32_HAL - 0 - 0 - 0 - 0 - - 8 - 48 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c - system_stm32f1xx.c - 0 - 0 - - - 8 - 49 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c - stm32f1xx_hal_dma.c - 0 - 0 - - - 8 - 50 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c - stm32f1xx_hal_cortex.c - 0 - 0 - - - 8 - 51 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c - stm32f1xx_hal_crc.c - 0 - 0 - - - 8 - 52 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c - stm32f1xx_hal_pwr.c - 0 - 0 - - - 8 - 53 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c - stm32f1xx_hal_rcc.c - 0 - 0 - - - 8 - 54 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c - stm32f1xx_hal_rcc_ex.c - 0 - 0 - - - 8 - 55 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c - stm32f1xx_hal.c - 0 - 0 - - - 8 - 56 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - stm32f1xx_hal_cec.c - 0 - 0 - - - 8 - 57 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - stm32f1xx_hal_sram.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c - stm32f1xx_hal_gpio.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c - stm32f1xx_hal_gpio_ex.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c - stm32f1xx_hal_uart.c - 0 - 0 - - - 8 - 61 - 1 - 0 - 0 - 0 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c - stm32f1xx_hal_usart.c - 0 - 0 - diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj b/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj index 51a11268e3ff91b692823f6273816f5ae449d493..c28c5f2b74ad2ea8527f71202ad5ca9275ad4690 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.uvproj @@ -370,9 +370,9 @@ 0 - USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F103xE + USE_HAL_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE - .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -406,7 +406,7 @@ .\board\linker_scripts\link.sct - --keep *.o(.rti_fn.*) --keep *.o(FSymTab) + @@ -414,120 +414,116 @@ - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - + Applications - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + CPU - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + DeviceDrivers - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -577,151 +573,127 @@ - cpu - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - + finsh - div0.c + shell.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\shell.c - showmem.c + cmd.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\cmd.c - cpuport.c + msh.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c - - - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + ..\..\..\components\finsh\msh.c - DeviceDrivers - - - pin.c - 1 - ..\..\..\components\drivers\misc\pin.c - - + Kernel - serial.c + clock.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\clock.c - completion.c + components.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\components.c - dataqueue.c + device.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\device.c - pipe.c + idle.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\idle.c - ringblk_buf.c + ipc.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\ipc.c - ringbuffer.c + irq.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\irq.c - waitqueue.c + kservice.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\kservice.c - workqueue.c + mem.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\mem.c - - - finsh - shell.c + mempool.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\mempool.c - symbol.c + object.c 1 - ..\..\..\components\finsh\symbol.c + ..\..\..\src\object.c - cmd.c + scheduler.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\scheduler.c - msh.c + signal.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\signal.c - msh_cmd.c + thread.c 1 - ..\..\..\components\finsh\msh_cmd.c + ..\..\..\src\thread.c - msh_file.c + timer.c 1 - ..\..\..\components\finsh\msh_file.c + ..\..\..\src\timer.c @@ -752,19 +724,12 @@ time.c 1 - ..\..\..\components\libc\compilers\armlibc\time.c - - - - - gmtime_r.c - 1 - ..\..\..\components\libc\compilers\common\gmtime_r.c + ..\..\..\components\libc\compilers\common\time.c - STM32_HAL + Libraries system_stm32f1xx.c @@ -828,13 +793,6 @@ ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - - stm32f1xx_hal_sram.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - - stm32f1xx_hal_gpio.c diff --git a/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx b/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx index 8c7ad6afae3e1d58d5e21bde01236131e75aef91..49c07c3b1c38d6b3add1b012231b848d0eff4dbd 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx +++ b/bsp/stm32/stm32f103-hw100k-ibox/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt-thread @@ -19,28 +16,28 @@ Keil.STM32F1xx_DFP.2.2.0 http://www.keil.com/pack/ IRAM(0x20000000,0x10000) IROM(0x08000000,0x80000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103ZE$Flash\STM32F10x_512.FLM)) 4216 $$Device:STM32F103ZE$Device\Include\stm32f10x.h - - - - - - - - - + + + + + + + + + $$Device:STM32F103ZE$SVD\STM32F103xx.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -104,17 +101,17 @@ 0 0 3 - - + + 1 SARMCM3.DLL - + DARMSTM.DLL -pSTM32F103ZE SARMCM3.DLL - + TARMSTM.DLL -pSTM32F103ZE @@ -138,11 +135,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M3" - + 0 0 0 @@ -307,7 +304,7 @@ 0x0 - + 1 @@ -334,10 +331,10 @@ 0 0 - - USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F103xE - - .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include + + USE_HAL_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, STM32F103xE + + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include @@ -352,10 +349,10 @@ 0 0 - - - - + + + + @@ -367,104 +364,128 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + - Kernel + Applications - clock.c - 1 - ..\..\..\src\clock.c - - - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + + CPU + - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c + + - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c + + - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c + + - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m3\cpuport.c + + - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + + + + DeviceDrivers + - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c + + - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c + + - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c + + - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c + + - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c + + - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c + + - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c + + - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -476,26 +497,36 @@ 1 board\board.c
+
+ stm32f1xx_hal_msp.c 1 board\CubeMX_Config\Src\stm32f1xx_hal_msp.c + + startup_stm32f103xe.s 2 ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xe.s + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c + + drv_common.c 1 @@ -504,102 +535,127 @@
- cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c + + - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c + + - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + + Kernel + - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m3\cpuport.c + ..\..\..\src\clock.c + + - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m3\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c + + - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c + + - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c + + - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c + + - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c + + - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c + + - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c + + - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c + + - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c + + - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c + + - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c @@ -611,16 +667,22 @@ 1 ..\..\..\components\libc\compilers\armlibc\libc.c + + mem_std.c 1 ..\..\..\components\libc\compilers\armlibc\mem_std.c + + stubs.c 1 ..\..\..\components\libc\compilers\armlibc\stubs.c + + time.c 1 @@ -629,73 +691,92 @@ - STM32_HAL + Libraries system_stm32f1xx.c 1 ..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c + + stm32f1xx_hal_dma.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c + + stm32f1xx_hal_cortex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c + + stm32f1xx_hal_crc.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c + + stm32f1xx_hal_pwr.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c + + stm32f1xx_hal_rcc.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c + + stm32f1xx_hal_rcc_ex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c + + stm32f1xx_hal.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c + + stm32f1xx_hal_cec.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c - - stm32f1xx_hal_sram.c - 1 - ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c - + + stm32f1xx_hal_gpio.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + + stm32f1xx_hal_gpio_ex.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c + + stm32f1xx_hal_uart.c 1 ..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c + + stm32f1xx_hal_usart.c 1 @@ -706,11 +787,9 @@
- - - - + + + - diff --git a/bsp/stm32/stm32f103-mini-system/project.ewp b/bsp/stm32/stm32f103-mini-system/project.ewp index 2f50c19183e5c353bcb981857ed6f732d55dbaae..2a43f432a0ca354b9630dd94f5aa8fa09c613001 100644 --- a/bsp/stm32/stm32f103-mini-system/project.ewp +++ b/bsp/stm32/stm32f103-mini-system/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32F103xB + __RTTHREAD__ USE_HAL_DRIVER @@ -1248,6 +1249,7 @@ @@ -2066,57 +2068,63 @@ - Kernel + Applications - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\applications\main.c + + + CPU - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\src\cpu.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + + + DeviceDrivers - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c @@ -2141,69 +2149,60 @@ - cpu - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\components\finsh\msh.c - DeviceDrivers + Kernel - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2211,9 +2210,6 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - dlib $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2249,7 +2245,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l432-st-nucleo/project.uvprojx b/bsp/stm32/stm32l432-st-nucleo/project.uvprojx index a48bfd2ab68f932c467ced8af36373c24c9131ac..64b18c66e362d71f0dffc53aa98c86ad37ca5e7a 100644 --- a/bsp/stm32/stm32l432-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l432-st-nucleo/project.uvprojx @@ -333,7 +333,7 @@ 0 - USE_HAL_DRIVER, STM32L432xx, RT_USING_ARM_LIBC + RT_USING_ARM_LIBC, USE_HAL_DRIVER, STM32L432xx, __RTTHREAD__ .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -387,7 +387,7 @@ - cpu + CPU backtrace.c @@ -706,7 +706,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l433-st-nucleo/project.ewp b/bsp/stm32/stm32l433-st-nucleo/project.ewp index 4e1733711f3fb78fb1952e6bbb519cb83d8e47bb..821744a46649d14d04712a87d7ca307854bebcd7 100644 --- a/bsp/stm32/stm32l433-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l433-st-nucleo/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L433xx + __RTTHREAD__ RT_USING_DLIBC USE_HAL_DRIVER @@ -1248,6 +1249,7 @@ @@ -2066,57 +2068,57 @@ - Kernel - - $PROJ_DIR$\..\..\..\src\clock.c - + Applications - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\applications\main.c + + + CPU - $PROJ_DIR$\..\..\..\src\cpu.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + + + DeviceDrivers - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c - - - Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2128,7 +2130,7 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l432xx.s + $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\iar\startup_stm32l433xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2141,69 +2143,60 @@ - cpu - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\components\finsh\msh.c - DeviceDrivers + Kernel - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\watchdog\watchdog.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2211,9 +2204,6 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - dlib $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2249,7 +2239,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c @@ -2313,17 +2303,5 @@ $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart_ex.c - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rtc.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rtc_ex.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_iwdg.c - - - $PROJ_DIR$\..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_wwdg.c - diff --git a/bsp/stm32/stm32l433-st-nucleo/project.uvprojx b/bsp/stm32/stm32l433-st-nucleo/project.uvprojx index dc49c9882e9682bb85f1e327f889b2e2dc6febe2..79a61a56ff30170e73db42321503c85675c52564 100644 --- a/bsp/stm32/stm32l433-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l433-st-nucleo/project.uvprojx @@ -333,7 +333,7 @@ 0 - USE_HAL_DRIVER, STM32L433xx, RT_USING_ARM_LIBC + USE_HAL_DRIVER, STM32L433xx, RT_USING_ARM_LIBC, __RTTHREAD__ .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -387,7 +387,7 @@ - cpu + CPU backtrace.c @@ -692,7 +692,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l452-st-nucleo/project.ewp b/bsp/stm32/stm32l452-st-nucleo/project.ewp index 88b91c0816403c3208b13b5dd4fc1ee0aa9054a9..fc884f2d39f549782cb04ee23baa5399c6c5ab45 100644 --- a/bsp/stm32/stm32l452-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l452-st-nucleo/project.ewp @@ -225,6 +225,7 @@ CCDefines STM32L452xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c - libc - - - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l452-st-nucleo/project.uvprojx b/bsp/stm32/stm32l452-st-nucleo/project.uvprojx index 84257090b7660a08c03d78674fed16e7281aaba6..f7e98b1dede36f773a5ac631d2dc2c9180d59f54 100644 --- a/bsp/stm32/stm32l452-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l452-st-nucleo/project.uvprojx @@ -333,9 +333,9 @@ 0 - USE_HAL_DRIVER, STM32L452xx + USE_HAL_DRIVER, __RTTHREAD__, STM32L452xx - .;..\..\..\include;applications;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -377,120 +377,116 @@ - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - + Applications - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + CPU - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + DeviceDrivers - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -540,135 +536,132 @@ - cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + Kernel - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\src\clock.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l475-atk-pandora/project.ewp b/bsp/stm32/stm32l475-atk-pandora/project.ewp index 576d14d3aaddffdd6deab8b36f6170fe167f34ef..fea00f63c7c6e4c7bf6df19b1a53da10d42ba261 100644 --- a/bsp/stm32/stm32l475-atk-pandora/project.ewp +++ b/bsp/stm32/stm32l475-atk-pandora/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L475xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2205,7 +2204,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l475-atk-pandora/project.uvprojx b/bsp/stm32/stm32l475-atk-pandora/project.uvprojx index 5c96c99cb1ceb632f4ab9eab70f32937ab9e38ae..1a187748bd2983ad408fb6f41aa1da96a7e2e348 100644 --- a/bsp/stm32/stm32l475-atk-pandora/project.uvprojx +++ b/bsp/stm32/stm32l475-atk-pandora/project.uvprojx @@ -332,9 +332,9 @@ 0 - USE_HAL_DRIVER, STM32L475xx + USE_HAL_DRIVER, __RTTHREAD__, STM32L475xx - .;..\..\..\include;.;applications;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -376,120 +376,116 @@ - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - + Applications - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + CPU - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + DeviceDrivers - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -539,130 +535,127 @@ - cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + Kernel - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\src\clock.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c @@ -677,7 +670,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l475-st-discovery/project.ewp b/bsp/stm32/stm32l475-st-discovery/project.ewp index 399e4d0bc2dcc92b6e6f4f75198ac0dd636b62fd..5be1ba44292350a3230f877957181a9edb85daaa 100644 --- a/bsp/stm32/stm32l475-st-discovery/project.ewp +++ b/bsp/stm32/stm32l475-st-discovery/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L475xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c - libc - - - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l475-st-discovery/project.uvprojx b/bsp/stm32/stm32l475-st-discovery/project.uvprojx index 71798fd0e5cdda05f69c094caa810f56dbe8118a..7eba0896a8b4d542e5eac180e5573b4e4acaed7e 100644 --- a/bsp/stm32/stm32l475-st-discovery/project.uvprojx +++ b/bsp/stm32/stm32l475-st-discovery/project.uvprojx @@ -333,7 +333,7 @@ 0 - USE_HAL_DRIVER, STM32L475xx + USE_HAL_DRIVER, __RTTHREAD__, STM32L475xx applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -387,7 +387,7 @@ - cpu + CPU backtrace.c @@ -661,7 +661,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l476-st-nucleo/project.ewp b/bsp/stm32/stm32l476-st-nucleo/project.ewp index f15de0ab015a5080bcee13ea4f5751dd420a1136..d3bee9a0a5f3519c46f87b057dd0d43caf82fe27 100644 --- a/bsp/stm32/stm32l476-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l476-st-nucleo/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L476xx + __RTTHREAD__ RT_USING_DLIBC USE_HAL_DRIVER @@ -1249,6 +1250,7 @@ @@ -2068,57 +2070,63 @@ - Kernel + Applications - $PROJ_DIR$\..\..\..\src\clock.c + $PROJ_DIR$\applications\main.c + + + CPU - $PROJ_DIR$\..\..\..\src\components.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - $PROJ_DIR$\..\..\..\src\cpu.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - $PROJ_DIR$\..\..\..\src\device.c + $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c - $PROJ_DIR$\..\..\..\src\idle.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c - $PROJ_DIR$\..\..\..\src\ipc.c + $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + + + DeviceDrivers - $PROJ_DIR$\..\..\..\src\irq.c + $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c - $PROJ_DIR$\..\..\..\src\kservice.c + $PROJ_DIR$\..\..\..\components\drivers\pm\pm.c - $PROJ_DIR$\..\..\..\src\mem.c + $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c - $PROJ_DIR$\..\..\..\src\mempool.c + $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c - $PROJ_DIR$\..\..\..\src\object.c + $PROJ_DIR$\..\..\..\components\drivers\src\completion.c - $PROJ_DIR$\..\..\..\src\scheduler.c + $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c - $PROJ_DIR$\..\..\..\src\signal.c + $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c - $PROJ_DIR$\..\..\..\src\thread.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c - $PROJ_DIR$\..\..\..\src\timer.c + $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c - - - Applications - $PROJ_DIR$\applications\main.c + $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + + + $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c @@ -2149,69 +2157,60 @@ - cpu - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\components\finsh\msh.c - DeviceDrivers + Kernel - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\components\drivers\pm\pm.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\components\drivers\rtc\rtc.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2219,9 +2218,6 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - - - dlib $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c @@ -2257,7 +2253,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l476-st-nucleo/project.uvprojx b/bsp/stm32/stm32l476-st-nucleo/project.uvprojx index 3d4a3e4dcb079a847b11f31a62ad019b4bc784cc..bdbb353d3c2aa34f4c8eae50e0fde7bd7acc5f65 100644 --- a/bsp/stm32/stm32l476-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l476-st-nucleo/project.uvprojx @@ -333,9 +333,9 @@ 0 - USE_HAL_DRIVER, STM32L476xx, RT_USING_ARM_LIBC + RT_USING_ARM_LIBC, USE_HAL_DRIVER, STM32L476xx, __RTTHREAD__ - .;..\..\..\include;applications;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include + applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -377,120 +377,130 @@ - Kernel + Applications - clock.c + main.c 1 - ..\..\..\src\clock.c + applications\main.c + + + CPU - components.c + backtrace.c 1 - ..\..\..\src\components.c + ..\..\..\libcpu\arm\common\backtrace.c - cpu.c + div0.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\div0.c - device.c + showmem.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\showmem.c - idle.c + cpuport.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - ipc.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + + + DeviceDrivers + + + pin.c 1 - ..\..\..\src\ipc.c + ..\..\..\components\drivers\misc\pin.c - irq.c + pm.c 1 - ..\..\..\src\irq.c + ..\..\..\components\drivers\pm\pm.c - kservice.c + rtc.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\rtc\rtc.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -554,144 +564,127 @@ - cpu - - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - - + finsh - div0.c + shell.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\shell.c - showmem.c + cmd.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\cmd.c - cpuport.c + msh.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - - - - - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + ..\..\..\components\finsh\msh.c - DeviceDrivers + Kernel - pin.c + clock.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\clock.c - pm.c + components.c 1 - ..\..\..\components\drivers\pm\pm.c + ..\..\..\src\components.c - rtc.c + device.c 1 - ..\..\..\components\drivers\rtc\rtc.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c @@ -727,7 +720,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l496-ali-developer/project.ewp b/bsp/stm32/stm32l496-ali-developer/project.ewp index c9bf80c35b0db82f435fdae04abfc125a9f76b75..c7e1e15f51c2a0b327aae0e73a54df425f04e1cc 100644 --- a/bsp/stm32/stm32l496-ali-developer/project.ewp +++ b/bsp/stm32/stm32l496-ali-developer/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L496xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c - libc - - - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l496-ali-developer/project.uvprojx b/bsp/stm32/stm32l496-ali-developer/project.uvprojx index a8166d6e2301b27871cc6981ad60f4b13a16693f..4701472009e92954033fde6838cfcb2a7ee8d061 100644 --- a/bsp/stm32/stm32l496-ali-developer/project.uvprojx +++ b/bsp/stm32/stm32l496-ali-developer/project.uvprojx @@ -332,9 +332,9 @@ 0 - USE_HAL_DRIVER, STM32L496xx + USE_HAL_DRIVER, __RTTHREAD__, STM32L496xx - .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -376,120 +376,116 @@ - Kernel - - - clock.c - 1 - ..\..\..\src\clock.c - - + Applications - components.c + main.c 1 - ..\..\..\src\components.c + applications\main.c + + + CPU - cpu.c + backtrace.c 1 - ..\..\..\src\cpu.c + ..\..\..\libcpu\arm\common\backtrace.c - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + DeviceDrivers - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -539,135 +535,132 @@ - cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + Kernel - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\src\clock.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l496-st-nucleo/project.ewp b/bsp/stm32/stm32l496-st-nucleo/project.ewp index 43fb7fb816d6229ac50a4ed5bf43e1eff777f68d..4210390b9aaa0cc2c7c2f57730eb97b7c41f0626 100644 --- a/bsp/stm32/stm32l496-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l496-st-nucleo/project.ewp @@ -216,6 +216,7 @@ CCDefines STM32L496xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\msh.c + + + Kernel - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\src\components.c - - - DeviceDrivers - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\mem.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c @@ -2202,7 +2204,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l496-st-nucleo/project.uvoptx b/bsp/stm32/stm32l496-st-nucleo/project.uvoptx index 0a41991b75eb22ebca6cf2f0dbbbc1cd76573375..1a6a4989337d4cdf2362066b8ff3027bb9bd8016 100644 --- a/bsp/stm32/stm32l496-st-nucleo/project.uvoptx +++ b/bsp/stm32/stm32l496-st-nucleo/project.uvoptx @@ -182,787 +182,11 @@ - Kernel - 1 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 1 - 2 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 1 - 3 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 1 - 4 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 1 - 5 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 1 - 6 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 1 - 7 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 1 - 8 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 1 - 9 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 1 - 10 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 1 - 11 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 1 - 12 - 1 - 0 - 0 - 0 - ..\..\..\src\signal.c - signal.c - 0 - 0 - - - 1 - 13 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 1 - 14 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - - - Applications - 1 - 0 - 0 - 0 - - 2 - 15 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - Drivers - 1 - 0 - 0 - 0 - - 3 - 16 - 1 - 0 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 3 - 17 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32l4xx_hal_msp.c - stm32l4xx_hal_msp.c - 0 - 0 - - - 3 - 18 - 2 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l496xx.s - startup_stm32l496xx.s - 0 - 0 - - - 3 - 19 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 3 - 20 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 3 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - cpu - 0 - 0 - 0 - 0 - - 4 - 22 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 4 - 23 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 4 - 24 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 4 - 25 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 0 - 0 - - - 4 - 26 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 5 - 27 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 5 - 28 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 5 - 29 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 5 - 30 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 5 - 31 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 5 - 32 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 5 - 33 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 5 - 34 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 5 - 35 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - finsh - 0 - 0 - 0 - 0 - - 6 - 36 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 7 - 39 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c - 0 - 0 - - - - - STM32_HAL + Source Group 1 0 0 0 0 - - 8 - 40 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c - system_stm32l4xx.c - 0 - 0 - - - 8 - 41 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c - stm32l4xx_hal.c - 0 - 0 - - - 8 - 42 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_comp.c - stm32l4xx_hal_comp.c - 0 - 0 - - - 8 - 43 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c - stm32l4xx_hal_cortex.c - 0 - 0 - - - 8 - 44 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc.c - stm32l4xx_hal_crc.c - 0 - 0 - - - 8 - 45 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc_ex.c - stm32l4xx_hal_crc_ex.c - 0 - 0 - - - 8 - 46 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp.c - stm32l4xx_hal_cryp.c - 0 - 0 - - - 8 - 47 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c - stm32l4xx_hal_cryp_ex.c - 0 - 0 - - - 8 - 48 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c - stm32l4xx_hal_dma.c - 0 - 0 - - - 8 - 49 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c - stm32l4xx_hal_dma_ex.c - 0 - 0 - - - 8 - 50 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c - stm32l4xx_hal_exti.c - 0 - 0 - - - 8 - 51 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c - stm32l4xx_hal_pwr.c - 0 - 0 - - - 8 - 52 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c - stm32l4xx_hal_pwr_ex.c - 0 - 0 - - - 8 - 53 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c - stm32l4xx_hal_rcc.c - 0 - 0 - - - 8 - 54 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c - stm32l4xx_hal_rcc_ex.c - 0 - 0 - - - 8 - 55 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rng.c - stm32l4xx_hal_rng.c - 0 - 0 - - - 8 - 56 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c - stm32l4xx_hal_gpio.c - 0 - 0 - - - 8 - 57 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c - stm32l4xx_hal_uart.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c - stm32l4xx_hal_uart_ex.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart.c - stm32l4xx_hal_usart.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart_ex.c - stm32l4xx_hal_usart_ex.c - 0 - 0 - diff --git a/bsp/stm32/stm32l496-st-nucleo/project.uvprojx b/bsp/stm32/stm32l496-st-nucleo/project.uvprojx index b3d82eece323e6d83fb5bb79733aee80ebbd15db..340eb9824dd5d405c00665e1a972f23704c2e98e 100644 --- a/bsp/stm32/stm32l496-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l496-st-nucleo/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt-thread @@ -19,28 +16,28 @@ Keil.STM32L4xx_DFP.2.2.0 http://www.keil.com/pack IRAM(0x20000000,0x00040000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32L4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32L496ZGTx$CMSIS\Flash\STM32L4xx_1024.FLM)) 0 $$Device:STM32L496ZGTx$Drivers\CMSIS\Device\ST\STM32L4xx\Include\stm32l4xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32L496ZGTx$CMSIS\SVD\STM32L4x6.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 1 @@ -139,10 +136,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -308,7 +305,7 @@ 0x10000 - + 1 @@ -335,10 +332,10 @@ 0 0 - - USE_HAL_DRIVER, STM32L496xx - - .;..\..\..\include;.;applications;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include + + USE_HAL_DRIVER, __RTTHREAD__, STM32L496xx + + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -353,10 +350,10 @@ 0 0 - - - - + + + + @@ -368,99 +365,128 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + - Kernel + Applications - clock.c + main.c 1 - ..\..\..\src\clock.c + applications\main.c + + + + CPU + - components.c + backtrace.c 1 - ..\..\..\src\components.c + ..\..\..\libcpu\arm\common\backtrace.c + + - device.c + div0.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\div0.c + + - idle.c + showmem.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\showmem.c + + - ipc.c + cpuport.c 1 - ..\..\..\src\ipc.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + - irq.c - 1 - ..\..\..\src\irq.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + + + + DeviceDrivers + - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c + + - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c + + - mempool.c + completion.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\completion.c + + - object.c + dataqueue.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\dataqueue.c + + - scheduler.c + pipe.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\pipe.c + + - signal.c + ringblk_buf.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\ringblk_buf.c + + - thread.c + ringbuffer.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\ringbuffer.c + + - timer.c + waitqueue.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\waitqueue.c - - - Applications - main.c + workqueue.c 1 - applications\main.c + ..\..\..\components\drivers\src\workqueue.c @@ -472,26 +498,36 @@ 1 board\board.c + + stm32l4xx_hal_msp.c 1 board\CubeMX_Config\Src\stm32l4xx_hal_msp.c + + startup_stm32l496xx.s 2 ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\arm\startup_stm32l496xx.s + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c + + drv_common.c 1 @@ -500,102 +536,127 @@
- cpu + finsh - backtrace.c + shell.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\components\finsh\shell.c + + - div0.c + cmd.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\components\finsh\cmd.c + + - showmem.c + msh.c 1 - ..\..\..\libcpu\arm\common\showmem.c + ..\..\..\components\finsh\msh.c + + + + Kernel + - cpuport.c + clock.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + ..\..\..\src\clock.c + + - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + components.c + 1 + ..\..\..\src\components.c - - - DeviceDrivers - pin.c + device.c 1 - ..\..\..\components\drivers\misc\pin.c + ..\..\..\src\device.c + + - serial.c + idle.c 1 - ..\..\..\components\drivers\serial\serial.c + ..\..\..\src\idle.c + + - completion.c + ipc.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\src\ipc.c + + - dataqueue.c + irq.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\src\irq.c + + - pipe.c + kservice.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\src\kservice.c + + - ringblk_buf.c + mem.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\src\mem.c + + - ringbuffer.c + mempool.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\src\mempool.c + + - waitqueue.c + object.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\src\object.c + + - workqueue.c + scheduler.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\src\scheduler.c - - - finsh - shell.c + signal.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\src\signal.c + + - cmd.c + thread.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\src\thread.c + + - msh.c + timer.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\src\timer.c @@ -610,108 +671,148 @@ - STM32_HAL + Libraries system_stm32l4xx.c 1 ..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c + + stm32l4xx_hal.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c + + stm32l4xx_hal_comp.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_comp.c + + stm32l4xx_hal_cortex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c + + stm32l4xx_hal_crc.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc.c + + stm32l4xx_hal_crc_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_crc_ex.c + + stm32l4xx_hal_cryp.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp.c + + stm32l4xx_hal_cryp_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cryp_ex.c + + stm32l4xx_hal_dma.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c + + stm32l4xx_hal_dma_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c + + stm32l4xx_hal_exti.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c + + stm32l4xx_hal_pwr.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c + + stm32l4xx_hal_pwr_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c + + stm32l4xx_hal_rcc.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c + + stm32l4xx_hal_rcc_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c + + stm32l4xx_hal_rng.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rng.c + + stm32l4xx_hal_gpio.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c + + stm32l4xx_hal_uart.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c + + stm32l4xx_hal_uart_ex.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + + stm32l4xx_hal_usart.c 1 ..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_usart.c + + stm32l4xx_hal_usart_ex.c 1 @@ -722,11 +823,9 @@ - - - - + + + - diff --git a/bsp/stm32/stm32l4r5-st-nucleo/project.ewp b/bsp/stm32/stm32l4r5-st-nucleo/project.ewp index 0343c802b1b0ee4feb207268d347313244d6489e..42c09f00726eb9fe60f719b473d0cb094975ebfa 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/project.ewp +++ b/bsp/stm32/stm32l4r5-st-nucleo/project.ewp @@ -225,6 +225,7 @@ CCDefines STM32L4R5xx + __RTTHREAD__ USE_HAL_DRIVER - cpu + CPU $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c @@ -2267,7 +2269,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx b/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx index a21983548d6aae086b40b7c9d25860627e6b5ed0..0e2018b87237e46dc768a3c0a2909a800e6f7502 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32l4r5-st-nucleo/project.uvprojx @@ -333,7 +333,7 @@ 0 - STM32L4R5xx, USE_HAL_DRIVER + STM32L4R5xx, USE_HAL_DRIVER, __RTTHREAD__ applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -387,7 +387,7 @@ - cpu + CPU backtrace.c @@ -661,7 +661,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32l4r9-st-eval/project.ewp b/bsp/stm32/stm32l4r9-st-eval/project.ewp index f9385f740b195136fd31b3cab9fe1c20fc79b2bf..a00f6192b58eb1afd49c7e0daeba0c67b33ab029 100644 --- a/bsp/stm32/stm32l4r9-st-eval/project.ewp +++ b/bsp/stm32/stm32l4r9-st-eval/project.ewp @@ -225,6 +225,7 @@ CCDefines STM32L4R9xx + __RTTHREAD__ USE_HAL_DRIVER - cpu - - $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c - - - $PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c - + finsh - $PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c + $PROJ_DIR$\..\..\..\components\finsh\shell.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c + $PROJ_DIR$\..\..\..\components\finsh\cmd.c - $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\context_iar.S + $PROJ_DIR$\..\..\..\components\finsh\msh.c - DeviceDrivers - - $PROJ_DIR$\..\..\..\components\drivers\i2c\i2c_core.c - + Kernel - $PROJ_DIR$\..\..\..\components\drivers\i2c\i2c_dev.c + $PROJ_DIR$\..\..\..\src\clock.c - $PROJ_DIR$\..\..\..\components\drivers\i2c\i2c-bit-ops.c + $PROJ_DIR$\..\..\..\src\components.c - $PROJ_DIR$\..\..\..\components\drivers\misc\pin.c + $PROJ_DIR$\..\..\..\src\device.c - $PROJ_DIR$\..\..\..\components\drivers\serial\serial.c + $PROJ_DIR$\..\..\..\src\idle.c - $PROJ_DIR$\..\..\..\components\drivers\src\completion.c + $PROJ_DIR$\..\..\..\src\ipc.c - $PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c + $PROJ_DIR$\..\..\..\src\irq.c - $PROJ_DIR$\..\..\..\components\drivers\src\pipe.c + $PROJ_DIR$\..\..\..\src\kservice.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c + $PROJ_DIR$\..\..\..\src\memheap.c - $PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c + $PROJ_DIR$\..\..\..\src\mempool.c - $PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c + $PROJ_DIR$\..\..\..\src\object.c - $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c + $PROJ_DIR$\..\..\..\src\scheduler.c - - - finsh - $PROJ_DIR$\..\..\..\components\finsh\shell.c + $PROJ_DIR$\..\..\..\src\signal.c - $PROJ_DIR$\..\..\..\components\finsh\cmd.c + $PROJ_DIR$\..\..\..\src\thread.c - $PROJ_DIR$\..\..\..\components\finsh\msh.c + $PROJ_DIR$\..\..\..\src\timer.c - libc - - - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Source\Templates\system_stm32l4xx.c diff --git a/bsp/stm32/stm32l4r9-st-eval/project.uvprojx b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx index 64767097035438561749bd1cbdf03c56a9ee26ab..82e4839a8ee538980e6073432c0a759129541f61 100644 --- a/bsp/stm32/stm32l4r9-st-eval/project.uvprojx +++ b/bsp/stm32/stm32l4r9-st-eval/project.uvprojx @@ -333,7 +333,7 @@ 0 - USE_HAL_DRIVER, STM32L4R9xx + USE_HAL_DRIVER, STM32L4R9xx, __RTTHREAD__ applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32L4xx_HAL\STM32L4xx_HAL_Driver\Inc;..\libraries\STM32L4xx_HAL\CMSIS\Device\ST\STM32L4xx\Include;..\libraries\STM32L4xx_HAL\CMSIS\Include @@ -387,7 +387,7 @@ - cpu + CPU backtrace.c @@ -682,7 +682,7 @@ - STM32_HAL + Libraries system_stm32l4xx.c diff --git a/bsp/stm32/stm32mp157a-st-discovery/project.ewp b/bsp/stm32/stm32mp157a-st-discovery/project.ewp index 43d24dc2c86308bb65b8cd5de63f50dc6a0f7129..3547891da5df81c9555f93baa85397f6219b3985 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/project.ewp +++ b/bsp/stm32/stm32mp157a-st-discovery/project.ewp @@ -231,6 +231,7 @@ VIRTIO_SLAVE_ONLY STM32MP157Axx __LOG_TRACE_IO_ + __RTTHREAD__ USE_HAL_DRIVER - cpu + CPU $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c @@ -2316,7 +2320,7 @@ - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Src\stm32mp1xx_hal.c diff --git a/bsp/stm32/stm32mp157a-st-discovery/project.uvoptx b/bsp/stm32/stm32mp157a-st-discovery/project.uvoptx index cd7d5cc09b559dcd4fbcc5c9a5d3180d8c14c5b0..b43797349c93601d78c20ab313edee938499fabe 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/project.uvoptx +++ b/bsp/stm32/stm32mp157a-st-discovery/project.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -125,7 +125,7 @@ 0 ST-LINKIII-KEIL_SWO - -U066DFF343339415043182234 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10020000 -FC1000 -FN0 + -U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0 diff --git a/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx b/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx index 3dddb0d7dca079a73ac1094ac425326b55398884..29ab1201fc932936d071cf1ab18e2ac31fd82613 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx +++ b/bsp/stm32/stm32mp157a-st-discovery/project.uvprojx @@ -273,7 +273,7 @@ 1 0x10000000 - 0x20000 + 0x30000 1 @@ -297,8 +297,8 @@ 0 - 0x10020000 - 0x20000 + 0x10030000 + 0x10000 0 @@ -334,9 +334,9 @@ 0 - CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, STM32MP157Axx, METAL_INTERNAL, USE_HAL_DRIVER + CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, STM32MP157Axx, __RTTHREAD__, METAL_INTERNAL, USE_HAL_DRIVER - applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include + applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;board\ports\audio;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include @@ -388,7 +388,7 @@ - cpu + CPU backtrace.c @@ -739,7 +739,7 @@ - STM32_HAL + Libraries stm32mp1xx_hal.c @@ -921,11 +921,6 @@ <Project Info> - - - - - 0 1 diff --git a/bsp/stm32/stm32mp157a-st-ev1/project.ewp b/bsp/stm32/stm32mp157a-st-ev1/project.ewp index 2bb85bc33c8d54f8d4ec538c82e00ac54fa9ddd3..5320051f3959f1db627a58af16b7b386f6082e59 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/project.ewp +++ b/bsp/stm32/stm32mp157a-st-ev1/project.ewp @@ -224,7 +224,6 @@ - cpu + CPU $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c @@ -2210,49 +2212,13 @@ $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - - dlib - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - - Drivers - $PROJ_DIR$\board\CubeMX_Config\Common\System\system_stm32mp1xx.c + $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Source\Templates\iar\startup_stm32mp15xx.s - $PROJ_DIR$\..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Source\Templates\iar\startup_stm32mp15xx.s + $PROJ_DIR$\board\CubeMX_Config\Common\System\system_stm32mp1xx.c $PROJ_DIR$\board\CubeMX_Config\CM4\Src\stm32mp1xx_hal_msp.c @@ -2362,9 +2328,42 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c + - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Src\stm32mp1xx_hal.c diff --git a/bsp/stm32/stm32mp157a-st-ev1/project.uvoptx b/bsp/stm32/stm32mp157a-st-ev1/project.uvoptx index e3a94d45ec46ef7c2eca71b4f388ff96197a76b7..69cfe32b1407e692e6c91f04e28c7b40c5e70901 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/project.uvoptx +++ b/bsp/stm32/stm32mp157a-st-ev1/project.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -125,7 +125,7 @@ 0 ST-LINKIII-KEIL_SWO - -U066BFF343339415043223048 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10050000 -FC1000 -FN0 + -U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0 diff --git a/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx b/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx index 850fba2c45399a9d6f40460123b1ed7c62ae4054..732be2b3e1768c885b045fc518fde8d538c6d290 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx +++ b/bsp/stm32/stm32mp157a-st-ev1/project.uvprojx @@ -273,7 +273,7 @@ 1 0x10000000 - 0x40000 + 0x30000 1 @@ -297,13 +297,13 @@ 0 - 0x10050000 + 0x10030000 0x10000 0 - 0x0 - 0x0 + 0x10040000 + 0x20000 @@ -334,7 +334,7 @@ 0 - CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, STM32MP157Axx, METAL_INTERNAL, USE_HAL_DRIVER, RT_USING_ARM_LIBC + CORE_CM4, __LOG_TRACE_IO_, METAL_MAX_DEVICE_REGIONS=2, VIRTIO_SLAVE_ONLY, NO_ATOMIC_64_SUPPORT, STM32MP157Axx, __RTTHREAD__, METAL_INTERNAL, USE_HAL_DRIVER, RT_USING_ARM_LIBC applications;.;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\CM4\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32MPxx_HAL\STM32MP1xx_HAL_Driver\Inc;..\libraries\STM32MPxx_HAL\CMSIS\Device\ST\STM32MP1xx\Include;..\libraries\STM32MPxx_HAL\CMSIS\Core\Include;..\libraries\STM32MPxx_HAL\CMSIS\Include @@ -388,7 +388,7 @@ - cpu + CPU backtrace.c @@ -770,7 +770,7 @@ - STM32_HAL + Libraries stm32mp1xx_hal.c @@ -952,11 +952,6 @@ <Project Info> - - - - - 0 1 diff --git a/bsp/stm32/stm32wb55-st-nucleo/project.ewp b/bsp/stm32/stm32wb55-st-nucleo/project.ewp index c1935c48f58fbb4967e8dd3f5575075edb6756e0..ee3dbc45d58a1f02cd19d2053d2806e3fcf3766e 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/project.ewp +++ b/bsp/stm32/stm32wb55-st-nucleo/project.ewp @@ -215,9 +215,9 @@ - cpu + CPU $PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c @@ -2127,42 +2123,6 @@ $PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c - - dlib - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c - - - $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - - Drivers @@ -2184,30 +2144,6 @@ $PROJ_DIR$\..\libraries\HAL_Drivers\drv_common.c - - Filesystem - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_file.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_fs.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\dfs_posix.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\poll.c - - - $PROJ_DIR$\..\..\..\components\dfs\src\select.c - - - $PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs\devfs.c - - finsh @@ -2219,9 +2155,6 @@ $PROJ_DIR$\..\..\..\components\finsh\msh.c - - $PROJ_DIR$\..\..\..\components\finsh\msh_file.c - $PROJ_DIR$\..\..\..\components\finsh\finsh_compiler.c @@ -2304,73 +2237,103 @@ $PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c - $PROJ_DIR$\..\..\..\components\libc\compilers\common\unistd.c + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c + + + $PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c - STM32_HAL + Libraries $PROJ_DIR$\..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Source\Templates\system_stm32wbxx.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_comp.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_comp.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cortex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_crc.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_crc_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cryp.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cryp_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_exti.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rng.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_gpio.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_usart.c - $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart_ex.c + $PROJ_DIR$\..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_usart_ex.c diff --git a/bsp/stm32/stm32wb55-st-nucleo/project.uvoptx b/bsp/stm32/stm32wb55-st-nucleo/project.uvoptx index 35b07abc0660b74b507ce34e43c87f0090cf0a82..507c17fe34c11402488389a44d237c9941761db4 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/project.uvoptx +++ b/bsp/stm32/stm32wb55-st-nucleo/project.uvoptx @@ -175,1071 +175,11 @@ - Applications + Source Group 1 0 0 0 0 - - 1 - 1 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - cpu - 0 - 0 - 0 - 0 - - 2 - 2 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 2 - 4 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 2 - 5 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 0 - 0 - - - 2 - 6 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 3 - 7 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 3 - 8 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 3 - 9 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 3 - 10 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 3 - 12 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 3 - 13 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 3 - 14 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 3 - 15 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - Drivers - 0 - 0 - 0 - 0 - - 4 - 16 - 1 - 0 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 4 - 17 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32wbxx_hal_msp.c - stm32wbxx_hal_msp.c - 0 - 0 - - - 4 - 18 - 2 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Source\Templates\arm\startup_stm32wb55xx_cm4.s - startup_stm32wb55xx_cm4.s - 0 - 0 - - - 4 - 19 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 4 - 20 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 4 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - Filesystem - 0 - 0 - 0 - 0 - - 5 - 22 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\dfs.c - dfs.c - 0 - 0 - - - 5 - 23 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\dfs_file.c - dfs_file.c - 0 - 0 - - - 5 - 24 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\dfs_fs.c - dfs_fs.c - 0 - 0 - - - 5 - 25 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\dfs_posix.c - dfs_posix.c - 0 - 0 - - - 5 - 26 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\poll.c - poll.c - 0 - 0 - - - 5 - 27 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\src\select.c - select.c - 0 - 0 - - - 5 - 28 - 1 - 0 - 0 - 0 - ..\..\..\components\dfs\filesystems\devfs\devfs.c - devfs.c - 0 - 0 - - - - - finsh - 0 - 0 - 0 - 0 - - 6 - 29 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 6 - 30 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - 6 - 31 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - 6 - 32 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh_file.c - msh_file.c - 0 - 0 - - - 6 - 33 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_compiler.c - finsh_compiler.c - 0 - 0 - - - 6 - 34 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_error.c - finsh_error.c - 0 - 0 - - - 6 - 35 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_heap.c - finsh_heap.c - 0 - 0 - - - 6 - 36 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_init.c - finsh_init.c - 0 - 0 - - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_node.c - finsh_node.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_ops.c - finsh_ops.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_parser.c - finsh_parser.c - 0 - 0 - - - 6 - 40 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_var.c - finsh_var.c - 0 - 0 - - - 6 - 41 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_vm.c - finsh_vm.c - 0 - 0 - - - 6 - 42 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\finsh_token.c - finsh_token.c - 0 - 0 - - - - - Kernel - 0 - 0 - 0 - 0 - - 7 - 43 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 7 - 44 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 7 - 45 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 7 - 46 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 7 - 47 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 7 - 48 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 7 - 49 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 7 - 50 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 7 - 51 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 7 - 52 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 7 - 53 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 7 - 54 - 1 - 0 - 0 - 0 - ..\..\..\src\signal.c - signal.c - 0 - 0 - - - 7 - 55 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 7 - 56 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 8 - 57 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\libc.c - libc.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\mem_std.c - mem_std.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\stdio.c - stdio.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\stubs.c - stubs.c - 0 - 0 - - - 8 - 61 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c - 0 - 0 - - - 8 - 62 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\unistd.c - unistd.c - 0 - 0 - - - - - STM32_HAL - 0 - 0 - 0 - 0 - - 9 - 63 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Source\Templates\system_stm32wbxx.c - system_stm32wbxx.c - 0 - 0 - - - 9 - 64 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal.c - STM32wbxx_hal.c - 0 - 0 - - - 9 - 65 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_comp.c - STM32wbxx_hal_comp.c - 0 - 0 - - - 9 - 66 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cortex.c - STM32wbxx_hal_cortex.c - 0 - 0 - - - 9 - 67 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc.c - STM32wbxx_hal_crc.c - 0 - 0 - - - 9 - 68 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc_ex.c - STM32wbxx_hal_crc_ex.c - 0 - 0 - - - 9 - 69 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp.c - STM32wbxx_hal_cryp.c - 0 - 0 - - - 9 - 70 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp_ex.c - STM32wbxx_hal_cryp_ex.c - 0 - 0 - - - 9 - 71 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma.c - STM32wbxx_hal_dma.c - 0 - 0 - - - 9 - 72 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma_ex.c - STM32wbxx_hal_dma_ex.c - 0 - 0 - - - 9 - 73 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_exti.c - STM32wbxx_hal_exti.c - 0 - 0 - - - 9 - 74 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr.c - STM32wbxx_hal_pwr.c - 0 - 0 - - - 9 - 75 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr_ex.c - STM32wbxx_hal_pwr_ex.c - 0 - 0 - - - 9 - 76 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc.c - STM32wbxx_hal_rcc.c - 0 - 0 - - - 9 - 77 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc_ex.c - STM32wbxx_hal_rcc_ex.c - 0 - 0 - - - 9 - 78 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rng.c - STM32wbxx_hal_rng.c - 0 - 0 - - - 9 - 79 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_gpio.c - STM32wbxx_hal_gpio.c - 0 - 0 - - - 9 - 80 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart.c - STM32wbxx_hal_uart.c - 0 - 0 - - - 9 - 81 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart_ex.c - STM32wbxx_hal_uart_ex.c - 0 - 0 - - - 9 - 82 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart.c - STM32wbxx_hal_usart.c - 0 - 0 - - - 9 - 83 - 1 - 0 - 0 - 0 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart_ex.c - STM32wbxx_hal_usart_ex.c - 0 - 0 - diff --git a/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx b/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx index b51d2f6c585402a245fbd793d6b33c2797d514a5..59d0031ff289d923defb367d091841df2c381bd3 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32wb55-st-nucleo/project.uvprojx @@ -1,16 +1,13 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt-thread 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 @@ -19,28 +16,28 @@ Keil.STM32WBxx_DFP.1.1.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00040000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) 0 $$Device:STM32WB55RGVx$Drivers\CMSIS\Device\ST\STM32WBxx\Include\stm32wbxx.h - - - - - - - - - + + + + + + + + + $$Device:STM32WB55RGVx$CMSIS\SVD\STM32WB55_CM4.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 1 @@ -139,10 +136,10 @@ 1 STLink\ST-LINKIII-KEIL_SWO.dll "" () - - - - + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -309,7 +306,7 @@ 0x0 - + 1 @@ -336,10 +333,10 @@ 0 0 - - USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32WB55xx - - .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Inc;..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include;..\libraries\STM32WBxx_HAL\CMSIS\Include + + USE_HAL_DRIVER, RT_USING_ARM_LIBC, __RTTHREAD__, STM32WB55xx + + .;applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Inc;..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Include;..\libraries\STM32WBxx_HAL\CMSIS\Include @@ -354,10 +351,10 @@ 0 4 - - - - + + + + @@ -369,13 +366,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -391,28 +388,36 @@ - cpu + 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 + + cpuport.c 1 ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S 2 @@ -428,41 +433,57 @@ 1 ..\..\..\components\drivers\misc\pin.c + + serial.c 1 ..\..\..\components\drivers\serial\serial.c + + completion.c 1 ..\..\..\components\drivers\src\completion.c + + dataqueue.c 1 ..\..\..\components\drivers\src\dataqueue.c + + pipe.c 1 ..\..\..\components\drivers\src\pipe.c + + ringblk_buf.c 1 ..\..\..\components\drivers\src\ringblk_buf.c + + ringbuffer.c 1 ..\..\..\components\drivers\src\ringbuffer.c + + waitqueue.c 1 ..\..\..\components\drivers\src\waitqueue.c + + workqueue.c 1 @@ -478,70 +499,40 @@ 1 board\board.c + + stm32wbxx_hal_msp.c 1 board\CubeMX_Config\Src\stm32wbxx_hal_msp.c + + startup_stm32wb55xx_cm4.s 2 ..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Source\Templates\arm\startup_stm32wb55xx_cm4.s + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c - - drv_common.c - 1 - ..\libraries\HAL_Drivers\drv_common.c - - - - Filesystem - dfs.c - 1 - ..\..\..\components\dfs\src\dfs.c - - - dfs_file.c - 1 - ..\..\..\components\dfs\src\dfs_file.c - - - dfs_fs.c - 1 - ..\..\..\components\dfs\src\dfs_fs.c - - - dfs_posix.c - 1 - ..\..\..\components\dfs\src\dfs_posix.c - - - poll.c - 1 - ..\..\..\components\dfs\src\poll.c - - - select.c - 1 - ..\..\..\components\dfs\src\select.c - - - devfs.c + drv_common.c 1 - ..\..\..\components\dfs\filesystems\devfs\devfs.c + ..\libraries\HAL_Drivers\drv_common.c @@ -553,66 +544,85 @@ 1 ..\..\..\components\finsh\shell.c + + cmd.c 1 ..\..\..\components\finsh\cmd.c + + msh.c 1 ..\..\..\components\finsh\msh.c - - msh_file.c - 1 - ..\..\..\components\finsh\msh_file.c - + + finsh_compiler.c 1 ..\..\..\components\finsh\finsh_compiler.c + + finsh_error.c 1 ..\..\..\components\finsh\finsh_error.c + + finsh_heap.c 1 ..\..\..\components\finsh\finsh_heap.c + + finsh_init.c 1 ..\..\..\components\finsh\finsh_init.c + + finsh_node.c 1 ..\..\..\components\finsh\finsh_node.c + + finsh_ops.c 1 ..\..\..\components\finsh\finsh_ops.c + + finsh_parser.c 1 ..\..\..\components\finsh\finsh_parser.c + + finsh_var.c 1 ..\..\..\components\finsh\finsh_var.c + + finsh_vm.c 1 ..\..\..\components\finsh\finsh_vm.c + + finsh_token.c 1 @@ -628,66 +638,92 @@ 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 + + signal.c 1 ..\..\..\src\signal.c + + thread.c 1 ..\..\..\src\thread.c + + timer.c 1 @@ -703,166 +739,199 @@ 1 ..\..\..\components\libc\compilers\armlibc\libc.c + + mem_std.c 1 ..\..\..\components\libc\compilers\armlibc\mem_std.c - - stdio.c - 1 - ..\..\..\components\libc\compilers\armlibc\stdio.c - + + stubs.c 1 ..\..\..\components\libc\compilers\armlibc\stubs.c + + time.c 1 ..\..\..\components\libc\compilers\common\time.c - - unistd.c - 1 - ..\..\..\components\libc\compilers\common\unistd.c - - STM32_HAL + Libraries system_stm32wbxx.c 1 ..\libraries\STM32WBxx_HAL\CMSIS\Device\ST\STM32WBxx\Source\Templates\system_stm32wbxx.c + + - STM32wbxx_hal.c + stm32wbxx_hal.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + - STM32wbxx_hal_comp.c + stm32wbxx_hal_comp.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_comp.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_comp.c + + - STM32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cortex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + - STM32wbxx_hal_crc.c + stm32wbxx_hal_crc.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_crc.c + + - STM32wbxx_hal_crc_ex.c + stm32wbxx_hal_crc_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_crc_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_crc_ex.c + + - STM32wbxx_hal_cryp.c + stm32wbxx_hal_cryp.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cryp.c + + - STM32wbxx_hal_cryp_ex.c + stm32wbxx_hal_cryp_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_cryp_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cryp_ex.c + + - STM32wbxx_hal_dma.c + stm32wbxx_hal_dma.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + - STM32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_dma_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + - STM32wbxx_hal_exti.c + stm32wbxx_hal_exti.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_exti.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + - STM32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + - STM32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_pwr_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + - STM32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + - STM32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rcc_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + - STM32wbxx_hal_rng.c + stm32wbxx_hal_rng.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_rng.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c + + - STM32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_gpio.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + - STM32wbxx_hal_uart.c + stm32wbxx_hal_uart.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + - STM32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_uart_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + - STM32wbxx_hal_usart.c + stm32wbxx_hal_usart.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_usart.c + + - STM32wbxx_hal_usart_ex.c + stm32wbxx_hal_usart_ex.c 1 - ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\STM32wbxx_hal_usart_ex.c + ..\libraries\STM32WBxx_HAL\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_usart_ex.c - - - - + + + - <Project Info> - - - - - + + + + + 0 1 -
diff --git a/components/dfs/filesystems/jffs2/src/gcthread.c b/components/dfs/filesystems/jffs2/src/gcthread.c index 4005ec47884d7d27eabc59ba4e53d23e85ffa59e..ab66e1878e0a1140a02d2549db36f41a21931394 100644 --- a/components/dfs/filesystems/jffs2/src/gcthread.c +++ b/components/dfs/filesystems/jffs2/src/gcthread.c @@ -187,7 +187,8 @@ jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c) { struct super_block *sb=OFNI_BS_2SFFJ(c); cyg_mtab_entry *mte; - rt_uint32_t e; + rt_uint32_t e; + rt_err_t result; //RT_ASSERT(sb->s_gc_thread_handle); @@ -198,10 +199,20 @@ jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c) D1(printk("jffs2_stop_garbage_collect_thread wait\n")); - rt_event_recv(&sb->s_gc_thread_flags, + result = rt_event_recv(&sb->s_gc_thread_flags, GC_THREAD_FLAG_HAS_EXIT, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, RT_WAITING_FOREVER, &e); + if (result == -RT_ETIMEOUT) + { + LOG_E("wait completed timeout"); + return; + } + else if (result == -RT_ERROR) + { + LOG_E("event received error"); + return; + } // Kill and free the resources ... this is safe due to the flag // from the thread. @@ -218,15 +229,26 @@ jffs2_garbage_collect_thread(unsigned long data) struct super_block *sb=OFNI_BS_2SFFJ(c); cyg_mtab_entry *mte; rt_uint32_t flag = 0; + rt_err_t result; D1(printk("jffs2_garbage_collect_thread START\n")); while(1) { - rt_event_recv(&sb->s_gc_thread_flags, + result = rt_event_recv(&sb->s_gc_thread_flags, GC_THREAD_FLAG_TRIG | GC_THREAD_FLAG_STOP, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR, cyg_current_time() + CYGNUM_JFFS2_GS_THREAD_TICKS, &flag); + if (result == -RT_ETIMEOUT) + { + LOG_E("wait completed timeout"); + continue; + } + else if (result == -RT_ERROR) + { + LOG_E("event received error"); + continue; + } if (flag & GC_THREAD_FLAG_STOP) break; diff --git a/components/drivers/hwtimer/hwtimer.c b/components/drivers/hwtimer/hwtimer.c index 3953919fae33d53e9f626ad56abe5ec310fdd541..976d8bbf32cf2465830567a1accb706339eb5380 100644 --- a/components/drivers/hwtimer/hwtimer.c +++ b/components/drivers/hwtimer/hwtimer.c @@ -10,6 +10,7 @@ #include #include +#include rt_inline rt_uint32_t timeout_calc(rt_hwtimer_t *timer, rt_hwtimerval_t *tv) { @@ -144,19 +145,25 @@ static rt_size_t rt_hwtimer_read(struct rt_device *dev, rt_off_t pos, void *buff rt_hwtimer_t *timer; rt_hwtimerval_t tv; rt_uint32_t cnt; + rt_base_t level; + rt_int32_t overflow; float t; timer = (rt_hwtimer_t *)dev; if (timer->ops->count_get == RT_NULL) return 0; + level = rt_hw_interrupt_disable(); cnt = timer->ops->count_get(timer); + overflow = timer->overflow; + rt_hw_interrupt_enable(level); + if (timer->info->cntmode == HWTIMER_CNTMODE_DW) { cnt = (timer->freq * timer->period_sec) - cnt; } - t = timer->overflow * timer->period_sec + cnt/(float)timer->freq; + t = overflow * timer->period_sec + cnt/(float)timer->freq; tv.sec = t; tv.usec = (t - tv.sec) * 1000000; size = size > sizeof(tv)? sizeof(tv) : size; diff --git a/components/net/lwip-1.4.1/src/arch/sys_arch.c b/components/net/lwip-1.4.1/src/arch/sys_arch.c index 2392dde2fa6420374b2c7e808fdf51da1b9b0747..2f6dbb414371d177e98dc72995400c23b9ecab93 100644 --- a/components/net/lwip-1.4.1/src/arch/sys_arch.c +++ b/components/net/lwip-1.4.1/src/arch/sys_arch.c @@ -32,6 +32,7 @@ */ #include +#include #include "lwip/sys.h" #include "lwip/opt.h" @@ -617,7 +618,7 @@ u32_t sys_jiffies(void) u32_t sys_now(void) { - return rt_tick_get() * (1000 / RT_TICK_PER_SECOND); + return rt_tick_get_millisecond(); } #ifdef RT_LWIP_PPP diff --git a/components/net/lwip-2.0.2/src/arch/sys_arch.c b/components/net/lwip-2.0.2/src/arch/sys_arch.c index 40c79011ec612e762276212c16ae7aed10fe859d..fbf02cad0a1ade604fd6c671e42777d9a13ed01f 100644 --- a/components/net/lwip-2.0.2/src/arch/sys_arch.c +++ b/components/net/lwip-2.0.2/src/arch/sys_arch.c @@ -32,6 +32,7 @@ */ #include +#include #include "lwip/sys.h" #include "lwip/opt.h" @@ -627,7 +628,7 @@ u32_t sys_jiffies(void) u32_t sys_now(void) { - return rt_tick_get() * (1000 / RT_TICK_PER_SECOND); + return rt_tick_get_millisecond(); } diff --git a/components/net/lwip-2.1.2/src/arch/sys_arch.c b/components/net/lwip-2.1.2/src/arch/sys_arch.c index 0633501bb6376e2a42e71f568a5da565cb931fe0..a0eeed1073e88f9c8fc288f3ec2a1fae2254ff02 100644 --- a/components/net/lwip-2.1.2/src/arch/sys_arch.c +++ b/components/net/lwip-2.1.2/src/arch/sys_arch.c @@ -33,6 +33,7 @@ */ #include +#include #include "lwip/sys.h" #include "lwip/opt.h" @@ -641,7 +642,7 @@ u32_t sys_jiffies(void) u32_t sys_now(void) { - return rt_tick_get() * (1000 / RT_TICK_PER_SECOND); + return rt_tick_get_millisecond(); } #if MEM_OVERFLOW_CHECK || MEMP_OVERFLOW_CHECK diff --git a/include/rtthread.h b/include/rtthread.h index 27cfea19e09e7f049363bc394a928e15e78c2f4a..1e0094e73b1ed45f29deced20c0e50f2fee8c618 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -77,6 +77,7 @@ rt_tick_t rt_tick_get(void); void rt_tick_set(rt_tick_t tick); void rt_tick_increase(void); rt_tick_t rt_tick_from_millisecond(rt_int32_t ms); +rt_tick_t rt_tick_get_millisecond(void); void rt_system_timer_init(void); void rt_system_timer_thread_init(void); diff --git a/src/clock.c b/src/clock.c index 9fd276cf6f5bdca55bb098d72b21300f4e9820b1..66923e5c00c8eeb3562bcde05acb36535d06572f 100644 --- a/src/clock.c +++ b/src/clock.c @@ -13,6 +13,7 @@ * 2010-07-13 Bernard fix rt_tick_from_millisecond issue found by kuronca * 2011-06-26 Bernard add rt_tick_set function. * 2018-11-22 Jesven add per cpu tick + * 2020-12-29 Meco Man add function rt_tick_get_millisecond() */ #include @@ -116,5 +117,21 @@ rt_tick_t rt_tick_from_millisecond(rt_int32_t ms) } RTM_EXPORT(rt_tick_from_millisecond); +/** + * This function will provide the passed millisecond from boot. + * + * @return passed millisecond from boot + */ +RT_WEAK rt_tick_t rt_tick_get_millisecond(void) +{ +#if 1000 % RT_TICK_PER_SECOND == 0u + return rt_tick_get() * (1000u / RT_TICK_PER_SECOND); +#else + #warning "rt-thread cannot provide a correct 1ms-based tick any longer,\ + please redefine this function in another file by using a high-precision hard-timer." + return 0; +#endif +} + /**@}*/ diff --git a/src/ipc.c b/src/ipc.c index 454fcb5439bd26ae3534d4e6c7c66b22e31b1f89..4261f617b0fd81dbb671405f829ca671ea43992c 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -1764,8 +1764,12 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout) ++ mb->out_offset; if (mb->out_offset >= mb->size) mb->out_offset = 0; + /* decrease message entry */ - mb->entry --; + if(mb->entry > 0) + { + mb->entry --; + } /* resume suspended thread */ if (!rt_list_isempty(&(mb->suspend_sender_thread))) @@ -2439,7 +2443,10 @@ rt_err_t rt_mq_recv(rt_mq_t mq, mq->msg_queue_tail = RT_NULL; /* decrease message entry */ - mq->entry --; + if(mq->entry > 0) + { + mq->entry --; + } /* enable interrupt */ rt_hw_interrupt_enable(temp); diff --git a/src/memheap.c b/src/memheap.c index 0ff6925696bc9c5f0645f6868579983afd2fabbd..afa06fb9bf60280965089e170a0097e1815685e4 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -712,6 +712,20 @@ void *rt_calloc(rt_size_t count, rt_size_t size) } RTM_EXPORT(rt_calloc); +void rt_memory_info(rt_uint32_t *total, + rt_uint32_t *used, + rt_uint32_t *max_used) +{ + if (total != RT_NULL) + *total = _heap.pool_size; + + if (used != RT_NULL) + *used = _heap.pool_size - _heap.available_size; + + if (max_used != RT_NULL) + *max_used = _heap.max_used_size; +} + #endif #endif diff --git a/src/scheduler.c b/src/scheduler.c index 677be6cff776f4ee13c22a949bd62f088f5345b2..06f305ea0b0ba6a49c3200a07d49e5d68f4daf1f 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -43,7 +43,7 @@ rt_uint8_t rt_thread_ready_table[32]; #ifndef RT_USING_SMP extern volatile rt_uint8_t rt_interrupt_nest; static rt_int16_t rt_scheduler_lock_nest; -struct rt_thread *rt_current_thread; +struct rt_thread *rt_current_thread = RT_NULL; rt_uint8_t rt_current_priority; #endif /*RT_USING_SMP*/