diff --git a/bsp/stm32f107/Libraries/SConscript b/bsp/stm32f107/Libraries/SConscript
index 44b213e68586b2e0bfa2e198adad0f935da50901..1b5fe11170ab9bea0ccdec23107981c005173527 100644
--- a/bsp/stm32f107/Libraries/SConscript
+++ b/bsp/stm32f107/Libraries/SConscript
@@ -7,7 +7,6 @@ cwd = GetCurrentDir()
# The set of source files associated with this SConscript file.
src = Split("""
-CMSIS/CM3/CoreSupport/core_cm3.c
CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
@@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]]
path = [cwd + '/STM32F10x_StdPeriph_Driver/inc',
- cwd + '/CMSIS/CM3/CoreSupport',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
+if GetDepend(['RT_USING_BSP_CMSIS']):
+ path += [cwd + '/CMSIS/CM3/CoreSupport']
+ src += [cwd + '/CMSIS/CM3/CoreSupport/core_cm3.c']
+elif GetDepend(['RT_USING_RTT_CMSIS']):
+ path += [RTT_ROOT + '/components/CMSIS/Include']
+
CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
diff --git a/bsp/stm32f107/project.ewp b/bsp/stm32f107/project.ewp
index d333667ec013f136e7c53a9d53fe67274e5a79a8..80adeb26d1bd8f008413a7069d2990caebba72ae 100644
--- a/bsp/stm32f107/project.ewp
+++ b/bsp/stm32f107/project.ewp
@@ -12,7 +12,7 @@
General
3
- 20
+ 21
1
1
+
+
ICCARM
2
- 26
+ 28
1
1
+
@@ -610,7 +622,7 @@
ILINK
0
- 11
+ 14
1
1
+
+
+
+
+
+
+
@@ -895,7 +935,7 @@
General
3
- 20
+ 21
1
0
+
+
@@ -1034,7 +1082,7 @@
ICCARM
2
- 26
+ 28
1
0
+
@@ -1493,7 +1545,7 @@
ILINK
0
- 11
+ 14
1
0
+
+
+
+
+
+
+
@@ -1768,6 +1848,24 @@
+
+ CORTEX-M3
+
+ $PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c
+
+
+ $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S
+
+
+ $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c
+
+
+ $PROJ_DIR$\..\..\libcpu\arm\common\div0.c
+
+
+ $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c
+
+
Filesystem
@@ -1857,21 +1955,12 @@
$PROJ_DIR$\..\..\src\mempool.c
-
- $PROJ_DIR$\..\..\src\module.c
-
$PROJ_DIR$\..\..\src\object.c
-
- $PROJ_DIR$\..\..\src\rtm.c
-
$PROJ_DIR$\..\..\src\scheduler.c
-
- $PROJ_DIR$\..\..\src\slab.c
-
$PROJ_DIR$\..\..\src\thread.c
@@ -2014,29 +2103,8 @@
$PROJ_DIR$\.\usart.c
-
- STM32
-
- $PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c
-
-
- $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S
-
-
- $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c
-
-
- $PROJ_DIR$\..\..\libcpu\arm\common\div0.c
-
-
- $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c
-
-
STM32_StdPeriph
-
- $PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport\core_cm3.c
-
$PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c
diff --git a/bsp/stm32f107/rtconfig.h b/bsp/stm32f107/rtconfig.h
index 871fde32bde6eb84fea04f911b25a75dfa47bdf5..3d907281a85935f9cbbac5d5c3ffd4b490f085b6 100644
--- a/bsp/stm32f107/rtconfig.h
+++ b/bsp/stm32f107/rtconfig.h
@@ -147,4 +147,11 @@
#define CHECKSUM_GEN_IP 0
#define CHECKSUM_GEN_UDP 0
+//
+// #define RT_USING_CMSIS_OS
+//
+#define RT_USING_RTT_CMSIS
+//
+// #define RT_USING_BSP_CMSIS
+
#endif
diff --git a/bsp/stm32f10x/Libraries/SConscript b/bsp/stm32f10x/Libraries/SConscript
index 44b213e68586b2e0bfa2e198adad0f935da50901..1b5fe11170ab9bea0ccdec23107981c005173527 100644
--- a/bsp/stm32f10x/Libraries/SConscript
+++ b/bsp/stm32f10x/Libraries/SConscript
@@ -7,7 +7,6 @@ cwd = GetCurrentDir()
# The set of source files associated with this SConscript file.
src = Split("""
-CMSIS/CM3/CoreSupport/core_cm3.c
CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
@@ -54,9 +53,14 @@ elif rtconfig.CROSS_TOOL == 'iar':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]]
path = [cwd + '/STM32F10x_StdPeriph_Driver/inc',
- cwd + '/CMSIS/CM3/CoreSupport',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
+if GetDepend(['RT_USING_BSP_CMSIS']):
+ path += [cwd + '/CMSIS/CM3/CoreSupport']
+ src += [cwd + '/CMSIS/CM3/CoreSupport/core_cm3.c']
+elif GetDepend(['RT_USING_RTT_CMSIS']):
+ path += [RTT_ROOT + '/components/CMSIS/Include']
+
CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
diff --git a/bsp/stm32f10x/project.ewd b/bsp/stm32f10x/project.ewd
deleted file mode 100644
index cefeb892c13d9debd17830649ff1ced7059668de..0000000000000000000000000000000000000000
--- a/bsp/stm32f10x/project.ewd
+++ /dev/null
@@ -1,1659 +0,0 @@
-
-
-
- 2
-
- Debug
-
- ARM
-
- 1
-
- C-SPY
- 2
-
- 22
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ARMSIM_ID
- 2
-
- 1
- 1
- 1
-
-
-
-
-
-
-
- ANGEL_ID
- 2
-
- 0
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
- GDBSERVER_ID
- 2
-
- 0
- 1
- 1
-
-
-
-
-
-
-
-
-
-
- IARROM_ID
- 2
-
- 1
- 1
- 1
-
-
-
-
-
-
-
-
- JLINK_ID
- 2
-
- 12
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LMIFTDI_ID
- 2
-
- 2
- 1
- 1
-
-
-
-
-
-
-
-
-
- MACRAIGOR_ID
- 2
-
- 3
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PEMICRO_ID
- 2
-
- 0
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- RDI_ID
- 2
-
- 1
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- STLINK_ID
- 2
-
- 1
- 1
- 1
-
-
-
-
-
-
- THIRDPARTY_ID
- 2
-
- 0
- 1
- 1
-
-
-
-
-
-
-
-
- $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\MQX\MQXRtosPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin
- 0
-
-
- $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin
- 1
-
-
- $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin
- 0
-
-
- $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin
- 1
-
-
- $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin
- 1
-
-
-
-
- Release
-
- ARM
-
- 0
-
- C-SPY
- 2
-
- 22
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ARMSIM_ID
- 2
-
- 1
- 1
- 0
-
-
-
-
-
-
-
- ANGEL_ID
- 2
-
- 0
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
- GDBSERVER_ID
- 2
-
- 0
- 1
- 0
-
-
-
-
-
-
-
-
-
-
- IARROM_ID
- 2
-
- 1
- 1
- 0
-
-
-
-
-
-
-
-
- JLINK_ID
- 2
-
- 12
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LMIFTDI_ID
- 2
-
- 2
- 1
- 0
-
-
-
-
-
-
-
-
-
- MACRAIGOR_ID
- 2
-
- 3
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PEMICRO_ID
- 2
-
- 0
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- RDI_ID
- 2
-
- 1
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- STLINK_ID
- 2
-
- 1
- 1
- 0
-
-
-
-
-
-
- THIRDPARTY_ID
- 2
-
- 0
- 1
- 0
-
-
-
-
-
-
-
-
- $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\MQX\MQXRtosPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin
- 0
-
-
- $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin
- 0
-
-
- $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin
- 1
-
-
- $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin
- 0
-
-
- $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin
- 1
-
-
- $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin
- 1
-
-
-
-
-
-
diff --git a/bsp/stm32f10x/project.ewp b/bsp/stm32f10x/project.ewp
index 0fc4a79bb4b028f29ddf4da067ad29307683ed96..1a8050a5c42e49ab4a5db2c4c1b48f45b4dddae9 100644
--- a/bsp/stm32f10x/project.ewp
+++ b/bsp/stm32f10x/project.ewp
@@ -1,5 +1,3 @@
-
-
2
@@ -12,7 +10,7 @@
General
3
- 20
+ 21
1
1
+
+
ICCARM
2
- 26
+ 28
1
1
@@ -201,15 +208,15 @@
+
@@ -422,15 +430,15 @@
@@ -568,7 +576,7 @@
@@ -890,7 +926,7 @@
General
3
- 20
+ 21
1
0
+
+
@@ -1029,12 +1073,14 @@
ICCARM
2
- 26
+ 28
1
0
+
@@ -1288,15 +1346,15 @@
@@ -1434,7 +1492,7 @@
- Filesystem
-
- $PROJ_DIR$\..\..\components\dfs\src\dfs.c
-
-
- $PROJ_DIR$\..\..\components\dfs\filesystems\elmfat\dfs_elm.c
-
-
- $PROJ_DIR$\..\..\components\dfs\src\dfs_file.c
-
-
- $PROJ_DIR$\..\..\components\dfs\src\dfs_fs.c
-
-
- $PROJ_DIR$\..\..\components\dfs\src\dfs_posix.c
-
-
- $PROJ_DIR$\..\..\components\dfs\filesystems\elmfat\ff.c
-
-
-
- finsh
-
- $PROJ_DIR$\..\..\components\finsh\cmd.c
-
-
- $PROJ_DIR$\..\..\components\finsh\finsh_compiler.c
-
-
- $PROJ_DIR$\..\..\components\finsh\finsh_error.c
-
+ Startup
- $PROJ_DIR$\..\..\components\finsh\finsh_heap.c
+ $PROJ_DIR$\.\application.c
- $PROJ_DIR$\..\..\components\finsh\finsh_init.c
+ $PROJ_DIR$\.\startup.c
- $PROJ_DIR$\..\..\components\finsh\finsh_node.c
+ $PROJ_DIR$\.\board.c
- $PROJ_DIR$\..\..\components\finsh\finsh_ops.c
+ $PROJ_DIR$\.\stm32f10x_it.c
- $PROJ_DIR$\..\..\components\finsh\finsh_parser.c
+ $PROJ_DIR$\.\rtc.c
- $PROJ_DIR$\..\..\components\finsh\finsh_token.c
+ $PROJ_DIR$\.\usart.c
- $PROJ_DIR$\..\..\components\finsh\finsh_var.c
+ $PROJ_DIR$\.\serial.c
- $PROJ_DIR$\..\..\components\finsh\finsh_vm.c
-
-
- $PROJ_DIR$\..\..\components\finsh\shell.c
-
-
- $PROJ_DIR$\..\..\components\finsh\symbol.c
+ $PROJ_DIR$\.\led.c
@@ -1841,9 +1891,6 @@
$PROJ_DIR$\..\..\src\scheduler.c
-
- $PROJ_DIR$\..\..\src\slab.c
-
$PROJ_DIR$\..\..\src\thread.c
@@ -1852,302 +1899,141 @@
- LwIP
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\api_lib.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\api_msg.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\asn1_dec.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\asn1_enc.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\auth.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\autoip.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\chap.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\chpms.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\def.c
-
+ CORTEX-M3
- $PROJ_DIR$\..\..\components\net\lwip\src\core\dhcp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\dns.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\err.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\etharp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ethernetif.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\fsm.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\icmp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\igmp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\inet.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\inet_chksum.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\init.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\ip.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\ip_addr.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\ipv4\ip_frag.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\ipcp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\lcp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\magic.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\md5.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\memp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\mib2.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\mib_structs.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\msg_in.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\snmp\msg_out.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\netbuf.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\netdb.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\netif.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\netifapi.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\pap.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\pbuf.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\ppp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\ppp_oe.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\randm.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\raw.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\slipif.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\api\sockets.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\stats.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\sys.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\arch\sys_arch.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\tcp.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\tcp_in.c
-
-
- $PROJ_DIR$\..\..\components\net\lwip\src\core\tcp_out.c
+ $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c
- $PROJ_DIR$\..\..\components\net\lwip\src\api\tcpip.c
+ $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S
- $PROJ_DIR$\..\..\components\net\lwip\src\core\timers.c
+ $PROJ_DIR$\..\..\libcpu\arm\common\backtrace.c
- $PROJ_DIR$\..\..\components\net\lwip\src\core\udp.c
+ $PROJ_DIR$\..\..\libcpu\arm\common\div0.c
- $PROJ_DIR$\..\..\components\net\lwip\src\netif\ppp\vj.c
+ $PROJ_DIR$\..\..\libcpu\arm\common\showmem.c
- Startup
-
- $PROJ_DIR$\application.c
-
+ finsh
- $PROJ_DIR$\board.c
+ $PROJ_DIR$\..\..\components\finsh\cmd.c
- $PROJ_DIR$\board.h
+ $PROJ_DIR$\..\..\components\finsh\finsh_compiler.c
- $PROJ_DIR$\dm9000a.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_error.c
- $PROJ_DIR$\enc28j60.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_heap.c
- $PROJ_DIR$\led.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_init.c
- $PROJ_DIR$\msd.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_node.c
- $PROJ_DIR$\rtc.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_ops.c
- $PROJ_DIR$\rtconfig.h
+ $PROJ_DIR$\..\..\components\finsh\finsh_parser.c
- $PROJ_DIR$\sdcard.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_token.c
- $PROJ_DIR$\serial.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_var.c
- $PROJ_DIR$\startup.c
+ $PROJ_DIR$\..\..\components\finsh\finsh_vm.c
- $PROJ_DIR$\stm32f10x_it.c
+ $PROJ_DIR$\..\..\components\finsh\shell.c
- $PROJ_DIR$\usart.c
+ $PROJ_DIR$\..\..\components\finsh\symbol.c
- StdPeriph_Driver
-
- $PROJ_DIR$\Libraries\CMSIS\CM3\CoreSupport\core_cm3.c
-
+ STM32_StdPeriph
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c
+ $PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c
- $PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_hd.s
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c
$PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c
-
-
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c
$PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c
- $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c
- $PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c
-
-
- STM32
- $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\context_iar.S
+ $PROJ_DIR$\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c
- $PROJ_DIR$\..\..\libcpu\arm\cortex-m3\cpuport.c
+ $PROJ_DIR$\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_hd.s
-
-
diff --git a/bsp/stm32f10x/rtconfig.h b/bsp/stm32f10x/rtconfig.h
index 805e212f88eb14c106892faa90408ed654950bce..aae96816ce048169199fbe9f816e2b700c702b08 100644
--- a/bsp/stm32f10x/rtconfig.h
+++ b/bsp/stm32f10x/rtconfig.h
@@ -169,4 +169,11 @@
/* #define RTGUI_IMAGE_XPM */
/* #define RTGUI_IMAGE_BMP */
+//
+// #define RT_USING_CMSIS_OS
+//
+#define RT_USING_RTT_CMSIS
+//
+// #define RT_USING_BSP_CMSIS
+
#endif
diff --git a/bsp/stm32f10x/template.ewp b/bsp/stm32f10x/template.ewp
new file mode 100644
index 0000000000000000000000000000000000000000..4316d40e4894d496852ab89fd701002c0a222dbe
--- /dev/null
+++ b/bsp/stm32f10x/template.ewp
@@ -0,0 +1,1819 @@
+
+
+
+ 2
+
+ Debug
+
+ ARM
+
+ 1
+
+ General
+ 3
+
+ 21
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ICCARM
+ 2
+
+ 28
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AARM
+ 2
+
+ 8
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OBJCOPY
+ 0
+
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+
+ CUSTOM
+ 3
+
+
+
+
+
+
+ BICOMP
+ 0
+
+
+
+ BUILDACTION
+ 1
+
+
+
+
+
+
+ ILINK
+ 0
+
+ 14
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IARCHIVE
+ 0
+
+ 0
+ 1
+ 1
+
+
+
+
+
+
+ BILINK
+ 0
+
+
+
+
+ Release
+
+ ARM
+
+ 0
+
+ General
+ 3
+
+ 21
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ICCARM
+ 2
+
+ 28
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AARM
+ 2
+
+ 8
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OBJCOPY
+ 0
+
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+ CUSTOM
+ 3
+
+
+
+
+
+
+ BICOMP
+ 0
+
+
+
+ BUILDACTION
+ 1
+
+
+
+
+
+
+ ILINK
+ 0
+
+ 14
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IARCHIVE
+ 0
+
+ 0
+ 1
+ 0
+
+
+
+
+
+
+ BILINK
+ 0
+
+
+
+
+
+