diff options
Diffstat (limited to 'bsp/stm32/stm32f103-blue-pill')
| -rw-r--r-- | bsp/stm32/stm32f103-blue-pill/project.ewp | 146 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-blue-pill/project.uvproj | 176 | ||||
| -rw-r--r-- | bsp/stm32/stm32f103-blue-pill/project.uvprojx | 176 |
3 files changed, 342 insertions, 156 deletions
diff --git a/bsp/stm32/stm32f103-blue-pill/project.ewp b/bsp/stm32/stm32f103-blue-pill/project.ewp index 4d0af016a4..aebc107673 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.ewp +++ b/bsp/stm32/stm32f103-blue-pill/project.ewp @@ -349,28 +349,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
- <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1394,28 +1396,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
- <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\HAL_Drivers\drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\CMSIS\Include</state>
- <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2150,7 +2154,13 @@ <name>$PROJ_DIR$\..\..\..\components\drivers\core\device.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_comm.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\completion_up.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\condvar.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\ipc\dataqueue.c</name>
@@ -2171,10 +2181,10 @@ <name>$PROJ_DIR$\..\..\..\components\drivers\ipc\workqueue.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\pin\pin.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\pin\dev_pin.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\serial\dev_serial.c</name>
</file>
</group>
<group>
@@ -2201,16 +2211,16 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
</group>
<group>
@@ -2222,25 +2232,25 @@ <name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\cpu_up.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\defunct.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\mem.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
@@ -2262,6 +2272,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2282,46 +2310,52 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/stm32/stm32f103-blue-pill/project.uvproj b/bsp/stm32/stm32f103-blue-pill/project.uvproj index 90236ebc1a..9adf94e18b 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.uvproj +++ b/bsp/stm32/stm32f103-blue-pill/project.uvproj @@ -357,9 +357,9 @@ <useXO>0</useXO> <VariousControls> <MiscControls /> - <Define>STM32F103xB, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>USE_HAL_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, STM32F103xB</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers\CMSIS\Include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;board;applications;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;.;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;.;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\smp_call;..\..\..\components\finsh;board;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\drivers;board\CubeMX_Config\Inc;..\..\..\libcpu\arm\common;..\..\..\include;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;applications;..\libraries\HAL_Drivers\CMSIS\Include;..\..\..\components\drivers\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -491,9 +491,47 @@ </Files> <Files> <File> - <FileName>completion.c</FileName> + <FileName>completion_comm.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\ipc\completion.c</FilePath> + <FilePath>..\..\..\components\drivers\ipc\completion_comm.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>completion_up.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\completion_up.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>condvar.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\condvar.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -624,9 +662,9 @@ </Files> <Files> <File> - <FileName>pin.c</FileName> + <FileName>dev_pin.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\pin\pin.c</FilePath> + <FilePath>..\..\..\components\drivers\pin\dev_pin.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -643,9 +681,9 @@ </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>dev_serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\dev_serial.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -710,16 +748,16 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> <Files> @@ -731,9 +769,9 @@ </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> </Group> @@ -779,9 +817,9 @@ </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>cpu_up.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\src\cpu_up.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -798,9 +836,9 @@ </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>defunct.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\src\defunct.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -817,9 +855,9 @@ </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -836,9 +874,9 @@ </Files> <Files> <File> - <FileName>kstdio.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -855,9 +893,9 @@ </Files> <Files> <File> - <FileName>kstring.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -893,9 +931,9 @@ </Files> <Files> <File> - <FileName>mem.c</FileName> + <FileName>memheap.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\mem.c</FilePath> + <FilePath>..\..\..\src\memheap.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -1026,6 +1064,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1074,86 +1150,86 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_cortex.c</FileName> + <FileName>stm32f1xx_hal_crc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio_ex.c</FileName> + <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_rcc.c</FileName> + <FileName>stm32f1xx_hal_cortex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_pwr.c</FileName> + <FileName>stm32f1xx_hal_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_dma.c</FileName> + <FileName>stm32f1xx_hal_rcc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_crc.c</FileName> + <FileName>stm32f1xx_hal_uart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_stm32f1xx.c</FileName> + <FileName>stm32f1xx_hal.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_uart.c</FileName> + <FileName>system_stm32f1xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal.c</FileName> + <FileName>stm32f1xx_hal_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cec.c</FileName> + <FileName>stm32f1xx_hal_gpio_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_usart.c</FileName> + <FileName>stm32f1xx_hal_cec.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio.c</FileName> + <FileName>stm32f1xx_hal_pwr.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> </File> </Files> </Group> diff --git a/bsp/stm32/stm32f103-blue-pill/project.uvprojx b/bsp/stm32/stm32f103-blue-pill/project.uvprojx index 29c95ca829..5cea6f4ed1 100644 --- a/bsp/stm32/stm32f103-blue-pill/project.uvprojx +++ b/bsp/stm32/stm32f103-blue-pill/project.uvprojx @@ -331,9 +331,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>STM32F103xB, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>__RTTHREAD__, STM32F103xB, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, USE_HAL_DRIVER, RT_USING_LIBC</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers\CMSIS\Include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;board;applications;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;.;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\libraries\HAL_Drivers\CMSIS\Include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board\CubeMX_Config\Inc;..\..\..\libcpu\arm\cortex-m3;.;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\smp_call;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;board;applications;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\libcpu\arm\common;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd</IncludePath> </VariousControls> </Cads> <Aads> @@ -466,9 +466,47 @@ </Files> <Files> <File> - <FileName>completion.c</FileName> + <FileName>completion_comm.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\ipc\completion.c</FilePath> + <FilePath>..\..\..\components\drivers\ipc\completion_comm.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>completion_up.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\completion_up.c</FilePath> + <FileOption> + <FileArmAds> + <Cads> + <VariousControls> + <MiscControls> </MiscControls> + <Define>__RT_IPC_SOURCE__</Define> + <Undefine> </Undefine> + <IncludePath> </IncludePath> + </VariousControls> + </Cads> + </FileArmAds> + </FileOption> + </File> + </Files> + <Files> + <File> + <FileName>condvar.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\drivers\ipc\condvar.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -599,9 +637,9 @@ </Files> <Files> <File> - <FileName>pin.c</FileName> + <FileName>dev_pin.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\pin\pin.c</FilePath> + <FilePath>..\..\..\components\drivers\pin\dev_pin.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -618,9 +656,9 @@ </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>dev_serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\dev_serial.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -685,13 +723,6 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>msh.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\components\finsh\msh.c</FilePath> @@ -711,6 +742,13 @@ <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> + <Files> + <File> + <FileName>shell.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> + </File> + </Files> </Group> <Group> <GroupName>Kernel</GroupName> @@ -754,9 +792,9 @@ </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>cpu_up.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\src\cpu_up.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -773,9 +811,9 @@ </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>defunct.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\src\defunct.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -792,9 +830,9 @@ </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -811,9 +849,9 @@ </Files> <Files> <File> - <FileName>kstdio.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -830,9 +868,9 @@ </Files> <Files> <File> - <FileName>kstring.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -868,9 +906,9 @@ </Files> <Files> <File> - <FileName>mem.c</FileName> + <FileName>memheap.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\mem.c</FilePath> + <FilePath>..\..\..\src\memheap.c</FilePath> <FileOption> <FileArmAds> <Cads> @@ -1001,6 +1039,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1042,23 +1118,23 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>stm32f1xx_hal_rcc_ex.c</FileName> + <FileName>stm32f1xx_hal_crc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_cortex.c</FileName> + <FileName>stm32f1xx_hal_gpio_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio_ex.c</FileName> + <FileName>stm32f1xx_hal_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> </File> </Files> <Files> @@ -1070,6 +1146,13 @@ </Files> <Files> <File> + <FileName>stm32f1xx_hal_cec.c</FileName> + <FileType>1</FileType> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> + </File> + </Files> + <Files> + <File> <FileName>stm32f1xx_hal_pwr.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath> @@ -1077,16 +1160,16 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal_dma.c</FileName> + <FileName>stm32f1xx_hal_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_crc.c</FileName> + <FileName>stm32f1xx_hal_cortex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath> </File> </Files> <Files> @@ -1105,30 +1188,23 @@ </Files> <Files> <File> - <FileName>stm32f1xx_hal.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>stm32f1xx_hal_cec.c</FileName> + <FileName>stm32f1xx_hal_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_usart.c</FileName> + <FileName>stm32f1xx_hal.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath> </File> </Files> <Files> <File> - <FileName>stm32f1xx_hal_gpio.c</FileName> + <FileName>stm32f1xx_hal_rcc_ex.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath> + <FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath> </File> </Files> </Group> |