diff options
Diffstat (limited to 'bsp/apm32')
24 files changed, 2321 insertions, 1001 deletions
diff --git a/bsp/apm32/apm32e103ze-evalboard/project.ewp b/bsp/apm32/apm32e103ze-evalboard/project.ewp index a6157909c1..6a9c39d2fc 100644 --- a/bsp/apm32/apm32e103ze-evalboard/project.ewp +++ b/bsp/apm32/apm32e103ze-evalboard/project.ewp @@ -352,27 +352,29 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1452,27 +1454,29 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,9 +2318,6 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
@@ -2319,6 +2326,9 @@ <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ </file>
</group>
<group>
<name>Kernel</name>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <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>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2392,19 +2420,19 @@ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</name>
@@ -2413,4 +2441,10 @@ <group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32e103ze-evalboard/project.uvprojx b/bsp/apm32/apm32e103ze-evalboard/project.uvprojx index 7d7d60d64f..182032637e 100644 --- a/bsp/apm32/apm32e103ze-evalboard/project.uvprojx +++ b/bsp/apm32/apm32e103ze-evalboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, APM32E10X_HD, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC</Define> + <Define>__CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, USE_STDPERIPH_DRIVER, APM32E10X_HD, RT_USING_ARMLIBC, __RTTHREAD__, __STDC_LIMIT_MACROS</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;board;..\..\..\libcpu\arm\cortex-m3;applications;..\..\..\components\libc\compilers\common\include;..\libraries\Drivers\config;..\..\..\components\finsh;..\libraries\Drivers;.;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\libraries\APM32E10x_Library\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc;..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include;board\ports;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\Drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;applications;..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include;..\..\..\components\finsh;..\..\..\libcpu\arm\common;..\..\..\components\drivers\phy;board;..\..\..\components\libc\posix\io\epoll;..\..\..\include;..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc;..\libraries\Drivers\config;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\APM32E10x_Library\CMSIS\Include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;.</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,6 +719,13 @@ <GroupName>Finsh</GroupName> <Files> <File> + <FileName>cmd.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + </File> + </Files> + <Files> + <File> <FileName>shell.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\components\finsh\shell.c</FilePath> @@ -700,13 +745,6 @@ <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> - <Files> - <File> - <FileName>cmd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> - </File> - </Files> </Group> <Group> <GroupName>Kernel</GroupName> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <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> + <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> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1038,51 +1114,51 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32e10x_eint.c</FileName> + <FileName>apm32e10x_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_misc.c</FileName> + <FileName>apm32e10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_gpio.c</FileName> + <FileName>apm32e10x_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_apm32e10x.c</FileName> + <FileName>apm32e10x_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_usart.c</FileName> + <FileName>system_apm32e10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_rcm.c</FileName> + <FileName>apm32e10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_dma.c</FileName> + <FileName>apm32e10x_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32e103ze-tinyboard/project.ewp b/bsp/apm32/apm32e103ze-tinyboard/project.ewp index a6157909c1..6589e7b943 100644 --- a/bsp/apm32/apm32e103ze-tinyboard/project.ewp +++ b/bsp/apm32/apm32e103ze-tinyboard/project.ewp @@ -353,26 +353,28 @@ <name>CCIncludePath2</name>
<state />
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1453,26 +1455,28 @@ <name>CCIncludePath2</name>
<state />
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
<state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,16 +2318,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\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2392,25 +2420,31 @@ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_misc.c</name>
+ </file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32e103ze-tinyboard/project.uvprojx b/bsp/apm32/apm32e103ze-tinyboard/project.uvprojx index 9ede640564..9a20d7db48 100644 --- a/bsp/apm32/apm32e103ze-tinyboard/project.uvprojx +++ b/bsp/apm32/apm32e103ze-tinyboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, APM32E10X_HD, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC</Define> + <Define>__RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, APM32E10X_HD, __STDC_LIMIT_MACROS, RT_USING_LIBC, USE_STDPERIPH_DRIVER, RT_USING_ARMLIBC</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;board\ports;..\libraries\Drivers;.;..\..\..\components\libc\compilers\common\include;board;..\libraries\Drivers\config;..\..\..\components\finsh;applications;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\libraries\APM32E10x_Library\CMSIS\Include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc;..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>board\ports;..\..\..\components\drivers\include;..\libraries\Drivers\config;..\..\..\components\libc\compilers\common\extension;..\..\..\libcpu\arm\cortex-m3;..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\drivers\phy;.;..\..\..\components\finsh;..\libraries\APM32E10x_Library\CMSIS\Include;..\..\..\components\libc\posix\ipc;..\..\..\libcpu\arm\common;applications;board;..\libraries\Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\inc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,30 +719,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </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> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,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>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.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>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1038,9 +1114,9 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32e10x_eint.c</FileName> + <FileName>apm32e10x_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</FilePath> </File> </Files> <Files> @@ -1052,37 +1128,37 @@ </Files> <Files> <File> - <FileName>apm32e10x_gpio.c</FileName> + <FileName>apm32e10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_apm32e10x.c</FileName> + <FileName>apm32e10x_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_usart.c</FileName> + <FileName>system_apm32e10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_usart.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\Device\Geehy\APM32E10x\Source\system_apm32e10x.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_rcm.c</FileName> + <FileName>apm32e10x_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_rcm.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32e10x_dma.c</FileName> + <FileName>apm32e10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_dma.c</FilePath> + <FilePath>..\libraries\APM32E10x_Library\APM32E10x_StdPeriphDriver\src\apm32e10x_gpio.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f030r8-miniboard/project.ewp b/bsp/apm32/apm32f030r8-miniboard/project.ewp index e0d213ce2e..0a6ded35d4 100644 --- a/bsp/apm32/apm32f030r8-miniboard/project.ewp +++ b/bsp/apm32/apm32f030r8-miniboard/project.ewp @@ -356,26 +356,28 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1455,26 +1457,28 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2258,7 +2262,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>
@@ -2279,10 +2289,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>
@@ -2306,16 +2316,16 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2327,19 +2337,19 @@ <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>
@@ -2367,6 +2377,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\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
@@ -2387,25 +2415,31 @@ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f030r8-miniboard/project.uvprojx b/bsp/apm32/apm32f030r8-miniboard/project.uvprojx index c4dd4234e5..5507f5b75d 100644 --- a/bsp/apm32/apm32f030r8-miniboard/project.uvprojx +++ b/bsp/apm32/apm32f030r8-miniboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, APM32F030x8</Define> + <Define>APM32F030x8, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS, USE_STDPERIPH_DRIVER</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m0;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board;..\..\..\components\libc\compilers\common\include;.;..\libraries\Drivers\config;..\..\..\components\finsh;..\libraries\Drivers;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;applications;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\posix\io\poll;..\..\..\include;..\..\..\components\drivers\include;.;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\phy;..\libraries\Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers\config;applications;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\finsh;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\libcpu\arm\common;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;board</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,30 +719,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> </Group> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.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> + <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> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1031,9 +1107,9 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f0xx_eint.c</FileName> + <FileName>apm32f0xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> </File> </Files> <Files> @@ -1045,9 +1121,9 @@ </Files> <Files> <File> - <FileName>apm32f0xx_gpio.c</FileName> + <FileName>apm32f0xx_syscfg.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> </File> </Files> <Files> @@ -1066,9 +1142,9 @@ </Files> <Files> <File> - <FileName>apm32f0xx_syscfg.c</FileName> + <FileName>apm32f0xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> </File> </Files> <Files> diff --git a/bsp/apm32/apm32f051r8-evalboard/project.ewp b/bsp/apm32/apm32f051r8-evalboard/project.ewp index a84fcdf51e..dcdfe4998b 100644 --- a/bsp/apm32/apm32f051r8-evalboard/project.ewp +++ b/bsp/apm32/apm32f051r8-evalboard/project.ewp @@ -356,27 +356,29 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1456,27 +1458,29 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,16 +2318,16 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
@@ -2386,28 +2414,34 @@ <group>
<name>Libraries</name>
<file>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
</file>
- <file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
- </file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f051r8-evalboard/project.uvprojx b/bsp/apm32/apm32f051r8-evalboard/project.uvprojx index 122ed96918..c3422143af 100644 --- a/bsp/apm32/apm32f051r8-evalboard/project.uvprojx +++ b/bsp/apm32/apm32f051r8-evalboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, APM32F051x8, __RTTHREAD__</Define> + <Define>APM32F051x8, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, __RTTHREAD__, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, USE_STDPERIPH_DRIVER</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m0;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;..\libraries\Drivers\config;applications;.;board;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\libcpu\arm\common;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\phy;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;applications;..\..\..\components\libc\posix\io\poll;..\libraries\Drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\APM32F0xx_Library\CMSIS\Include;board\ports;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;..\..\..\libcpu\arm\cortex-m0;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\..\..\components\libc\posix\io\epoll;board;..\libraries\Drivers\config;.;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,16 +719,16 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> @@ -702,9 +740,9 @@ </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> </Group> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <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>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> @@ -1031,51 +1107,51 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f0xx_eint.c</FileName> + <FileName>apm32f0xx_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_misc.c</FileName> + <FileName>apm32f0xx_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_gpio.c</FileName> + <FileName>apm32f0xx_syscfg.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_apm32f0xx.c</FileName> + <FileName>apm32f0xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_usart.c</FileName> + <FileName>system_apm32f0xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_syscfg.c</FileName> + <FileName>apm32f0xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_rcm.c</FileName> + <FileName>apm32f0xx_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f072vb-miniboard/project.ewp b/bsp/apm32/apm32f072vb-miniboard/project.ewp index d45cf9a48e..e5057b4d41 100644 --- a/bsp/apm32/apm32f072vb-miniboard/project.ewp +++ b/bsp/apm32/apm32f072vb-miniboard/project.ewp @@ -356,27 +356,29 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1456,27 +1458,29 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,15 +2318,15 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
</group>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
@@ -2386,28 +2414,34 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f072vb-miniboard/project.uvprojx b/bsp/apm32/apm32f072vb-miniboard/project.uvprojx index b244010ae1..270b8d8613 100644 --- a/bsp/apm32/apm32f072vb-miniboard/project.uvprojx +++ b/bsp/apm32/apm32f072vb-miniboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, APM32F072xB</Define> + <Define>USE_STDPERIPH_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, APM32F072xB, __STDC_LIMIT_MACROS, __RTTHREAD__</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m0;.;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;..\libraries\Drivers\config;board\ports;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;applications;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;board;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\smp_call;board\ports;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\include;applications;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\include;board;..\..\..\libcpu\arm\common;..\libraries\Drivers\config;..\..\..\components\finsh;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\components\libc\posix\io\epoll;.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers;..\..\..\libcpu\arm\cortex-m0;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\..\..\components\drivers\phy;..\..\..\components\drivers\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,13 +719,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> @@ -707,6 +738,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> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,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>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> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.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> @@ -1031,13 +1107,6 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f0xx_eint.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>apm32f0xx_misc.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</FilePath> @@ -1045,9 +1114,9 @@ </Files> <Files> <File> - <FileName>apm32f0xx_gpio.c</FileName> + <FileName>apm32f0xx_syscfg.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> </File> </Files> <Files> @@ -1066,16 +1135,23 @@ </Files> <Files> <File> - <FileName>apm32f0xx_syscfg.c</FileName> + <FileName>apm32f0xx_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_rcm.c</FileName> + <FileName>apm32f0xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>apm32f0xx_gpio.c</FileName> + <FileType>1</FileType> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f091vc-miniboard/project.ewp b/bsp/apm32/apm32f091vc-miniboard/project.ewp index 8b0f72946e..029de07f17 100644 --- a/bsp/apm32/apm32f091vc-miniboard/project.ewp +++ b/bsp/apm32/apm32f091vc-miniboard/project.ewp @@ -356,27 +356,29 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1456,27 +1458,29 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
- <state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,16 +2318,16 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,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\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
@@ -2389,25 +2417,31 @@ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f091vc-miniboard/project.uvprojx b/bsp/apm32/apm32f091vc-miniboard/project.uvprojx index 8a995d6160..9d85f01bbc 100644 --- a/bsp/apm32/apm32f091vc-miniboard/project.uvprojx +++ b/bsp/apm32/apm32f091vc-miniboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, APM32F091xC, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>APM32F091xC, USE_STDPERIPH_DRIVER, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_LIBC, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m0;..\libraries\APM32F0xx_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;board;..\libraries\Drivers\config;.;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;applications;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include;board\ports;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>applications;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;board\ports;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension;..\libraries\APM32F0xx_Library\CMSIS\Include;..\libraries\Drivers\config;.;..\..\..\components\drivers\phy;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;board;..\libraries\Drivers;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\poll;..\..\..\components\finsh;..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\inc;..\..\..\components\drivers\include;..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Include</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,16 +719,16 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.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> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.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>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1031,51 +1107,51 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f0xx_eint.c</FileName> + <FileName>apm32f0xx_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_misc.c</FileName> + <FileName>apm32f0xx_syscfg.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_gpio.c</FileName> + <FileName>system_apm32f0xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_apm32f0xx.c</FileName> + <FileName>apm32f0xx_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\Device\Geehy\APM32F0xx\Source\system_apm32f0xx.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_usart.c</FileName> + <FileName>apm32f0xx_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_usart.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_syscfg.c</FileName> + <FileName>apm32f0xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_syscfg.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f0xx_rcm.c</FileName> + <FileName>apm32f0xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_rcm.c</FilePath> + <FilePath>..\libraries\APM32F0xx_Library\APM32F0xx_StdPeriphDriver\src\apm32f0xx_gpio.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f103vb-miniboard/project.ewp b/bsp/apm32/apm32f103vb-miniboard/project.ewp index 5cec65a487..f490892f34 100644 --- a/bsp/apm32/apm32f103vb-miniboard/project.ewp +++ b/bsp/apm32/apm32f103vb-miniboard/project.ewp @@ -352,28 +352,30 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\board</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$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1453,28 +1455,30 @@ <option>
<name>CCIncludePath2</name>
<state />
+ <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\board</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$\board\ports</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2262,7 +2266,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>
@@ -2283,10 +2293,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>
@@ -2313,14 +2323,14 @@ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ </file>
</group>
<group>
<name>Kernel</name>
@@ -2331,19 +2341,19 @@ <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>
@@ -2371,6 +2381,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2391,28 +2419,34 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f103vb-miniboard/project.uvprojx b/bsp/apm32/apm32f103vb-miniboard/project.uvprojx index d8a76eaa29..16dbd48d7b 100644 --- a/bsp/apm32/apm32f103vb-miniboard/project.uvprojx +++ b/bsp/apm32/apm32f103vb-miniboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, APM32F10X_HD</Define> + <Define>USE_STDPERIPH_DRIVER, APM32F10X_HD, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;board\ports;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;..\libraries\APM32F10x_Library\CMSIS\Include;..\libraries\Drivers;board;.;..\libraries\Drivers\config;applications;..\..\..\components\finsh;..\..\..\components\drivers\include;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\drivers\phy;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\Drivers;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\APM32F10x_Library\CMSIS\Include;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc;..\..\..\components\drivers\smp_call;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;..\..\..\components\libc\posix\io\eventfd;..\libraries\Drivers\config;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\finsh;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;.;..\..\..\components\drivers\include;board\ports;..\..\..\components\libc\posix\ipc;board;..\..\..\components\libc\compilers\common\include;..\..\..\include;applications</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,30 +719,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> </Group> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,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>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.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>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> @@ -1038,23 +1114,23 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>system_apm32f10x.c</FileName> + <FileName>apm32f10x_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_rcm.c</FileName> + <FileName>apm32f10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_misc.c</FileName> + <FileName>apm32f10x_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</FilePath> </File> </Files> <Files> @@ -1066,23 +1142,23 @@ </Files> <Files> <File> - <FileName>apm32f10x_eint.c</FileName> + <FileName>system_apm32f10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_gpio.c</FileName> + <FileName>apm32f10x_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_dma.c</FileName> + <FileName>apm32f10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f103xe-minibroard/project.ewp b/bsp/apm32/apm32f103xe-minibroard/project.ewp index 80f623ea5e..5a84214de3 100644 --- a/bsp/apm32/apm32f103xe-minibroard/project.ewp +++ b/bsp/apm32/apm32f103xe-minibroard/project.ewp @@ -354,28 +354,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1440,28 +1442,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2232,7 +2236,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>
@@ -2253,10 +2263,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>
@@ -2280,10 +2290,10 @@ <group>
<name>Finsh</name>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.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>
@@ -2301,19 +2311,19 @@ <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>
@@ -2341,6 +2351,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2361,28 +2389,34 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f103xe-minibroard/project.uvprojx b/bsp/apm32/apm32f103xe-minibroard/project.uvprojx index 2c27db8579..fe9aecadb9 100644 --- a/bsp/apm32/apm32f103xe-minibroard/project.uvprojx +++ b/bsp/apm32/apm32f103xe-minibroard/project.uvprojx @@ -333,9 +333,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, APM32F10X_HD</Define> + <Define>__RTTHREAD__, RT_USING_ARMLIBC, RT_USING_LIBC, __STDC_LIMIT_MACROS, APM32F10X_HD, USE_STDPERIPH_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\APM32F10x_Library\CMSIS\Include;..\libraries\Drivers;board\ports;..\..\..\components\libc\compilers\common\include;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;..\libraries\Drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;.;board;..\..\..\components\drivers\include;applications;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\finsh;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\posix\io\epoll;board\ports;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;board;.;..\libraries\Drivers;..\libraries\Drivers\config;..\libraries\APM32F10x_Library\CMSIS\Include;..\..\..\include;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;applications;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\include;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</IncludePath> </VariousControls> </Cads> <Aads> @@ -468,9 +468,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> @@ -601,9 +639,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> @@ -620,9 +658,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> @@ -680,6 +718,13 @@ <GroupName>Finsh</GroupName> <Files> <File> + <FileName>cmd.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + </File> + </Files> + <Files> + <File> <FileName>shell.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\components\finsh\shell.c</FilePath> @@ -699,13 +744,6 @@ <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> - <Files> - <File> - <FileName>cmd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> - </File> - </Files> </Group> <Group> <GroupName>Kernel</GroupName> @@ -749,9 +787,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> @@ -768,9 +806,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> @@ -787,9 +825,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> @@ -806,9 +844,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> @@ -825,9 +863,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> @@ -996,6 +1034,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <Files> + <File> + <FileName>rt_vsscanf.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsscanf.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_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> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1037,51 +1113,51 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>system_apm32f10x.c</FileName> + <FileName>apm32f10x_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_rcm.c</FileName> + <FileName>apm32f10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_misc.c</FileName> + <FileName>system_apm32f10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_usart.c</FileName> + <FileName>apm32f10x_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_eint.c</FileName> + <FileName>apm32f10x_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_gpio.c</FileName> + <FileName>apm32f10x_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_dma.c</FileName> + <FileName>apm32f10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f107vc-evalboard/project.ewp b/bsp/apm32/apm32f107vc-evalboard/project.ewp index b6df615df8..a02284ca35 100644 --- a/bsp/apm32/apm32f107vc-evalboard/project.ewp +++ b/bsp/apm32/apm32f107vc-evalboard/project.ewp @@ -352,28 +352,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\board</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$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1453,28 +1455,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc</state>
<state>$PROJ_DIR$\board</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$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\libraries\APM32F10x_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2262,7 +2266,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>
@@ -2283,10 +2293,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>
@@ -2331,19 +2341,19 @@ <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>
@@ -2371,6 +2381,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2391,28 +2419,34 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_rcm.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f107vc-evalboard/project.uvprojx b/bsp/apm32/apm32f107vc-evalboard/project.uvprojx index a523336e8d..925dc155e7 100644 --- a/bsp/apm32/apm32f107vc-evalboard/project.uvprojx +++ b/bsp/apm32/apm32f107vc-evalboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>APM32F10X_CL, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>__RTTHREAD__, USE_STDPERIPH_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS, APM32F10X_CL, RT_USING_LIBC, RT_USING_ARMLIBC</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;board\ports;..\libraries\APM32F10x_Library\CMSIS\Include;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;board;..\libraries\Drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;.;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;applications;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>applications;..\..\..\components\finsh;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\include;.;..\libraries\Drivers;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\drivers\phy;..\..\..\components\libc\posix\io\eventfd;..\libraries\APM32F10x_Library\CMSIS\Include;..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\common;board;..\libraries\APM32F10x_Library\APM32F10x_ETH_Driver\inc;..\libraries\Drivers\config;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;board\ports;..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\inc;..\..\..\components\libc\posix\ipc</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,30 +719,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </Files> <Files> <File> - <FileName>msh_parse.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.c</FilePath> </File> </Files> <Files> <File> - <FileName>cmd.c</FileName> + <FileName>shell.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\cmd.c</FilePath> + <FilePath>..\..\..\components\finsh\shell.c</FilePath> </File> </Files> </Group> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,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>rt_vsnprintf_tiny.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kstdio.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstdio.c</FilePath> + </File> + </Files> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1038,9 +1114,9 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>system_apm32f10x.c</FileName> + <FileName>apm32f10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> </File> </Files> <Files> @@ -1052,37 +1128,37 @@ </Files> <Files> <File> - <FileName>apm32f10x_misc.c</FileName> + <FileName>apm32f10x_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_usart.c</FileName> + <FileName>apm32f10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_usart.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_eint.c</FileName> + <FileName>apm32f10x_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_eint.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_gpio.c</FileName> + <FileName>apm32f10x_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f10x_dma.c</FileName> + <FileName>system_apm32f10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F10x_Library\APM32F10x_StdPeriphDriver\src\apm32f10x_dma.c</FilePath> + <FilePath>..\libraries\APM32F10x_Library\Device\Geehy\APM32F10x\Source\system_apm32f10x.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f407ig-minibroard/project.ewp b/bsp/apm32/apm32f407ig-minibroard/project.ewp index b01f024fbb..dfe98f5131 100644 --- a/bsp/apm32/apm32f407ig-minibroard/project.ewp +++ b/bsp/apm32/apm32f407ig-minibroard/project.ewp @@ -354,27 +354,29 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\.</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1439,27 +1441,29 @@ <option>
<name>CCIncludePath2</name>
<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\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
- <state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
<state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\applications</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\.</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2230,7 +2234,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>
@@ -2251,10 +2261,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>
@@ -2281,13 +2291,13 @@ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
</group>
<group>
@@ -2299,19 +2309,19 @@ <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>
@@ -2339,6 +2349,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstring.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.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>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2359,31 +2387,37 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_syscfg.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</name>
+ </file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f407ig-minibroard/project.uvprojx b/bsp/apm32/apm32f407ig-minibroard/project.uvprojx index 5cee83c6ec..a776e4bc60 100644 --- a/bsp/apm32/apm32f407ig-minibroard/project.uvprojx +++ b/bsp/apm32/apm32f407ig-minibroard/project.uvprojx @@ -333,9 +333,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, APM32F40X, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>USE_STDPERIPH_DRIVER, __CLK_TCK=RT_TICK_PER_SECOND, APM32F40X, RT_USING_LIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, RT_USING_ARMLIBC</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include;..\libraries\Drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\CMSIS\Include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;applications;.;board</IncludePath> + <IncludePath>..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;applications;board;..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc;..\..\..\components\libc\posix\ipc;..\libraries\Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;..\..\..\components\drivers\phy;.;..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include;..\..\..\components\libc\posix\io\poll;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc;..\libraries\Drivers\config;..\..\..\components\libc\posix\io\eventfd;..\libraries\APM32F4xx_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\include;..\..\..\components\finsh;..\..\..\components\drivers\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -468,9 +468,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> @@ -601,9 +639,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> @@ -620,9 +658,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> @@ -680,16 +718,16 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh.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> @@ -749,9 +787,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> @@ -768,9 +806,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> @@ -787,9 +825,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> @@ -806,9 +844,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> @@ -825,9 +863,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> @@ -996,6 +1034,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <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> + <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> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1037,58 +1113,58 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f4xx_usart.c</FileName> + <FileName>apm32f4xx_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_misc.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_syscfg.c</FileName> + <FileName>apm32f4xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_syscfg.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_rcm.c</FileName> + <FileName>apm32f4xx_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_dma.c</FileName> + <FileName>apm32f4xx_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_eint.c</FileName> + <FileName>apm32f4xx_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_misc.c</FileName> + <FileName>system_apm32f4xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_misc.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_gpio.c</FileName> + <FileName>apm32f4xx_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>system_apm32f4xx.c</FileName> + <FileName>apm32f4xx_syscfg.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_syscfg.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32f407zg-evalboard/project.ewp b/bsp/apm32/apm32f407zg-evalboard/project.ewp index 9aee2032ca..053f283d0b 100644 --- a/bsp/apm32/apm32f407zg-evalboard/project.ewp +++ b/bsp/apm32/apm32f407zg-evalboard/project.ewp @@ -352,28 +352,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</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$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1453,28 +1455,30 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
<state>$PROJ_DIR$\.</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</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$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\board\ports</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc</state>
<state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
- <state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2262,7 +2266,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>
@@ -2283,10 +2293,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>
@@ -2310,16 +2320,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\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2331,19 +2341,19 @@ <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>
@@ -2371,6 +2381,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_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsnprintf_tiny.c</name>
+ </file>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2394,28 +2422,34 @@ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_syscfg.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_syscfg.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32f407zg-evalboard/project.uvprojx b/bsp/apm32/apm32f407zg-evalboard/project.uvprojx index ed82a3ed30..7f5ddc2911 100644 --- a/bsp/apm32/apm32f407zg-evalboard/project.uvprojx +++ b/bsp/apm32/apm32f407zg-evalboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, APM32F40X, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define> + <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC, APM32F40X, USE_STDPERIPH_DRIVER, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define> <Undefine /> - <IncludePath>..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc;.;..\libraries\Drivers;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\libraries\Drivers\config;board\ports;..\..\..\components\finsh;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;applications;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc;board;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\APM32F4xx_Library\CMSIS\Include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc</IncludePath> + <IncludePath>..\..\..\components\libc\posix\ipc;..\libraries\APM32F4xx_Library\APM32F4xx_ETH_Driver\inc;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\drivers\smp_call;applications;..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\inc;..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Include;..\..\..\components\drivers\include;..\libraries\Drivers\config;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;.;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\libraries\Drivers;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;board;..\..\..\components\libc\compilers\common\include;..\libraries\APM32F4xx_Library\CMSIS\Include;..\..\..\components\drivers\include;..\..\..\include</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,30 +719,30 @@ <GroupName>Finsh</GroupName> <Files> <File> - <FileName>shell.c</FileName> + <FileName>msh_parse.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\shell.c</FilePath> + <FilePath>..\..\..\components\finsh\msh_parse.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> <File> - <FileName>msh_parse.c</FileName> + <FileName>cmd.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\finsh\msh_parse.c</FilePath> + <FilePath>..\..\..\components\finsh\cmd.c</FilePath> </File> </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> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <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> + <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> + </Group> + <Group> <GroupName>libcpu</GroupName> <Files> <File> @@ -1038,9 +1114,9 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32f4xx_usart.c</FileName> + <FileName>apm32f4xx_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</FilePath> </File> </Files> <Files> @@ -1059,16 +1135,16 @@ </Files> <Files> <File> - <FileName>apm32f4xx_dma.c</FileName> + <FileName>system_apm32f4xx.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32f4xx_eint.c</FileName> + <FileName>apm32f4xx_dma.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_eint.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_dma.c</FilePath> </File> </Files> <Files> @@ -1087,9 +1163,9 @@ </Files> <Files> <File> - <FileName>system_apm32f4xx.c</FileName> + <FileName>apm32f4xx_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32F4xx_Library\Device\Geehy\APM32F4xx\Source\system_apm32f4xx.c</FilePath> + <FilePath>..\libraries\APM32F4xx_Library\APM32F4xx_StdPeriphDriver\src\apm32f4xx_usart.c</FilePath> </File> </Files> </Group> diff --git a/bsp/apm32/apm32s103vb-miniboard/project.ewp b/bsp/apm32/apm32s103vb-miniboard/project.ewp index 04d7a144cd..e7766424a0 100644 --- a/bsp/apm32/apm32s103vb-miniboard/project.ewp +++ b/bsp/apm32/apm32s103vb-miniboard/project.ewp @@ -352,27 +352,29 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc</state>
<state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -1452,27 +1454,29 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
- <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
- <state>$PROJ_DIR$\..\..\..\components\finsh</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
<state>$PROJ_DIR$\..\..\..\components\libc\posix\ipc</state>
- <state>$PROJ_DIR$\board\ports</state>
- <state>$PROJ_DIR$\..\libraries\Drivers</state>
- <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\include</state>
+ <state>$PROJ_DIR$\..\..\..\components\finsh</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
<state>$PROJ_DIR$\..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\eventfd</state>
<state>$PROJ_DIR$\.</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\epoll</state>
+ <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\CMSIS\Include</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\smp_call</state>
+ <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\applications</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\posix\io\poll</state>
- <state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers\config</state>
+ <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension\fcntl\octal</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\phy</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
+ <state>$PROJ_DIR$\..\libraries\Drivers</state>
+ <state>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc</state>
<state>$PROJ_DIR$\..\..\..\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\extension</state>
+ <state>$PROJ_DIR$\board</state>
+ <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
</option>
<option>
<name>CCStdIncCheck</name>
@@ -2260,7 +2264,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>
@@ -2281,10 +2291,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>
@@ -2308,16 +2318,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\cmd.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_parse.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
</group>
<group>
@@ -2329,19 +2339,19 @@ <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>
@@ -2369,6 +2379,24 @@ </file>
</group>
<group>
+ <name>klibc</name>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kstdio.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\rt_vsscanf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\src\klibc\kerrno.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>
+ </group>
+ <group>
<name>libcpu</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\atomic_arm.c</name>
@@ -2389,28 +2417,34 @@ <group>
<name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_misc.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Source\system_apm32s10x.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_eint.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_rcm.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_usart.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Source\system_apm32s10x.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_misc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_rcm.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_eint.c</name>
+ <name>$PROJ_DIR$\..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_gpio.c</name>
</file>
</group>
<group>
<name>POSIX</name>
</group>
+ <group>
+ <name>smp</name>
+ </group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/apm32/apm32s103vb-miniboard/project.uvprojx b/bsp/apm32/apm32s103vb-miniboard/project.uvprojx index b4cd951fe2..b5d7980be1 100644 --- a/bsp/apm32/apm32s103vb-miniboard/project.uvprojx +++ b/bsp/apm32/apm32s103vb-miniboard/project.uvprojx @@ -334,9 +334,9 @@ <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls /> - <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_STDPERIPH_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, APM32S10X_MD</Define> + <Define>__CLK_TCK=RT_TICK_PER_SECOND, USE_STDPERIPH_DRIVER, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, APM32S10X_MD, RT_USING_LIBC</Define> <Undefine /> - <IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\APM32S10x_Library\CMSIS\Include;..\..\..\components\libc\posix\io\poll;board\ports;..\libraries\Drivers;..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc;..\..\..\components\libc\compilers\common\include;..\libraries\Drivers\config;..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Include;board;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;.;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc;applications</IncludePath> + <IncludePath>..\libraries\APM32S10x_Library\CMSIS\Include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\libraries\Drivers\config;..\..\..\components\libc\compilers\common\include;applications;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;board;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\common;..\libraries\Drivers;board\ports;..\..\..\components\finsh;..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\ipc;..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\inc;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m3;.</IncludePath> </VariousControls> </Cads> <Aads> @@ -469,9 +469,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> @@ -602,9 +640,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> @@ -621,9 +659,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> @@ -681,13 +719,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> @@ -707,6 +738,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> @@ -750,9 +788,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> @@ -769,9 +807,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> @@ -788,9 +826,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> @@ -807,9 +845,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> @@ -826,9 +864,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> @@ -997,6 +1035,44 @@ </Files> </Group> <Group> + <GroupName>klibc</GroupName> + <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> + <Files> + <File> + <FileName>kstring.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kstring.c</FilePath> + </File> + </Files> + <Files> + <File> + <FileName>kerrno.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\src\klibc\kerrno.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> @@ -1038,23 +1114,23 @@ <GroupName>Libraries</GroupName> <Files> <File> - <FileName>apm32s10x_misc.c</FileName> + <FileName>apm32s10x_eint.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_misc.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_eint.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32s10x_gpio.c</FileName> + <FileName>apm32s10x_rcm.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_gpio.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_rcm.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32s10x_rcm.c</FileName> + <FileName>apm32s10x_misc.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_rcm.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_misc.c</FilePath> </File> </Files> <Files> @@ -1066,23 +1142,23 @@ </Files> <Files> <File> - <FileName>system_apm32s10x.c</FileName> + <FileName>apm32s10x_usart.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Source\system_apm32s10x.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_usart.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32s10x_usart.c</FileName> + <FileName>apm32s10x_gpio.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_usart.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_gpio.c</FilePath> </File> </Files> <Files> <File> - <FileName>apm32s10x_eint.c</FileName> + <FileName>system_apm32s10x.c</FileName> <FileType>1</FileType> - <FilePath>..\libraries\APM32S10x_Library\APM32S10x_StdPeriphDriver\src\apm32s10x_eint.c</FilePath> + <FilePath>..\libraries\APM32S10x_Library\Device\Geehy\APM32S10x\Source\system_apm32s10x.c</FilePath> </File> </Files> </Group> |