diff options
| author | hathach <[email protected]> | 2014-04-25 15:24:01 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-04-25 15:24:01 +0700 |
| commit | f901b4fe78551061550adf2105962299a589956e (patch) | |
| tree | ef03cb2b9faadf63286af2d2a47bc55a7c6d4b33 | |
| parent | d00655f598905f7855a2c54081373843c918fa1e (diff) | |
update IAR & Keil project for freertos
| -rw-r--r-- | demos/device/device_freertos/device_freertos.ewp | 2 | ||||
| -rw-r--r-- | demos/device/device_freertos/device_freertos.uvopt | 24 | ||||
| -rw-r--r-- | demos/device/device_freertos/device_freertos.uvproj | 48 | ||||
| -rw-r--r-- | demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt | 4 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.ewp | 2 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvopt | 52 | ||||
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvproj | 40 |
7 files changed, 86 insertions, 86 deletions
diff --git a/demos/device/device_freertos/device_freertos.ewp b/demos/device/device_freertos/device_freertos.ewp index 7259f10b3..cbb734e78 100644 --- a/demos/device/device_freertos/device_freertos.ewp +++ b/demos/device/device_freertos/device_freertos.ewp @@ -5663,7 +5663,7 @@ <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\croutine.c</name> </file> <file> - <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</name> + <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos_hook.c</name> </file> <file> <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</name> diff --git a/demos/device/device_freertos/device_freertos.uvopt b/demos/device/device_freertos/device_freertos.uvopt index 00d1f0f97..4e4bffc67 100644 --- a/demos/device/device_freertos/device_freertos.uvopt +++ b/demos/device/device_freertos/device_freertos.uvopt @@ -937,7 +937,7 @@ <Focus>0</Focus> <ColumnNumber>15</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>68</TopLine> + <TopLine>69</TopLine> <CurrentLine>86</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> @@ -1449,7 +1449,7 @@ <Focus>0</Focus> <ColumnNumber>27</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>57</TopLine> + <TopLine>58</TopLine> <CurrentLine>64</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\boards\board.c</PathWithFileName> @@ -1993,7 +1993,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>138</TopLine> + <TopLine>139</TopLine> <CurrentLine>156</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName> @@ -2063,10 +2063,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>51</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>1653</TopLine> - <CurrentLine>1673</CurrentLine> + <TopLine>1654</TopLine> + <CurrentLine>1665</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\tasks.c</PathWithFileName> <FilenameWithoutPath>tasks.c</FilenameWithoutPath> @@ -2145,11 +2145,11 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>1</TopLine> - <CurrentLine>1</CurrentLine> + <TopLine>0</TopLine> + <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName> - <FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</PathWithFileName> + <FilenameWithoutPath>heap_4.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -2164,8 +2164,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</PathWithFileName> - <FilenameWithoutPath>heap_4.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos_hook.c</PathWithFileName> + <FilenameWithoutPath>freertos_hook.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> diff --git a/demos/device/device_freertos/device_freertos.uvproj b/demos/device/device_freertos/device_freertos.uvproj index 4661f93f7..46efaf304 100644 --- a/demos/device/device_freertos/device_freertos.uvproj +++ b/demos/device/device_freertos/device_freertos.uvproj @@ -1035,14 +1035,14 @@ <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c</FilePath> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> @@ -2077,14 +2077,14 @@ </FileOption> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> @@ -3119,14 +3119,14 @@ </FileOption> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> @@ -4201,14 +4201,14 @@ </FileOption> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> @@ -5243,14 +5243,14 @@ <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c</FilePath> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> @@ -6325,14 +6325,14 @@ </FileOption> </File> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> + <FileName>heap_4.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> </File> <File> - <FileName>heap_4.c</FileName> + <FileName>freertos_hook.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</FilePath> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> </File> </Files> </Group> diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt index 37550088c..f6e54ac58 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt @@ -640,7 +640,7 @@ <Focus>0</Focus> <ColumnNumber>27</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>96</TopLine> + <TopLine>97</TopLine> <CurrentLine>98</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> @@ -1528,7 +1528,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>146</TopLine> + <TopLine>147</TopLine> <CurrentLine>151</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName> diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp index 16a42e5ee..e7af4211c 100644 --- a/demos/host/host_freertos/host_freertos.ewp +++ b/demos/host/host_freertos/host_freertos.ewp @@ -3798,7 +3798,7 @@ <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\croutine.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</name>
+ <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos_hook.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</name>
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index 4779f0ced..828de8253 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -504,7 +504,7 @@ <LExpSel>0</LExpSel> </OPTXL> <OPTFL> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> @@ -606,10 +606,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>27</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>97</TopLine> - <CurrentLine>98</CurrentLine> + <CurrentLine>102</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> @@ -1038,13 +1038,13 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>5</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName> - <FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\croutine.c</PathWithFileName> + <FilenameWithoutPath>croutine.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1059,8 +1059,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\croutine.c</PathWithFileName> - <FilenameWithoutPath>croutine.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\list.c</PathWithFileName> + <FilenameWithoutPath>list.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1075,8 +1075,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\list.c</PathWithFileName> - <FilenameWithoutPath>list.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\queue.c</PathWithFileName> + <FilenameWithoutPath>queue.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1091,8 +1091,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\queue.c</PathWithFileName> - <FilenameWithoutPath>queue.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\tasks.c</PathWithFileName> + <FilenameWithoutPath>tasks.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1107,8 +1107,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\tasks.c</PathWithFileName> - <FilenameWithoutPath>tasks.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\timers.c</PathWithFileName> + <FilenameWithoutPath>timers.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1123,8 +1123,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\timers.c</PathWithFileName> - <FilenameWithoutPath>timers.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</PathWithFileName> + <FilenameWithoutPath>heap_4.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1134,13 +1134,13 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>0</ColumnNumber> + <ColumnNumber>1</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c</PathWithFileName> - <FilenameWithoutPath>heap_4.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c</PathWithFileName> + <FilenameWithoutPath>port_cm4f.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1150,13 +1150,13 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>1</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c</PathWithFileName> - <FilenameWithoutPath>port_cm4f.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c</PathWithFileName> + <FilenameWithoutPath>port_cm3.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1171,8 +1171,8 @@ <TopLine>0</TopLine> <CurrentLine>0</CurrentLine> <bDave2>0</bDave2> - <PathWithFileName>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c</PathWithFileName> - <FilenameWithoutPath>port_cm3.c</FilenameWithoutPath> + <PathWithFileName>..\..\..\vendor\freertos\freertos_hook.c</PathWithFileName> + <FilenameWithoutPath>freertos_hook.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1248,7 +1248,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>95</TopLine> + <TopLine>82</TopLine> <CurrentLine>103</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\boards\board.c</PathWithFileName> @@ -1416,7 +1416,7 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>151</TopLine> + <TopLine>152</TopLine> <CurrentLine>154</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName> diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj index 1377065ab..9d683f3cd 100644 --- a/demos/host/host_freertos/host_freertos.uvproj +++ b/demos/host/host_freertos/host_freertos.uvproj @@ -532,11 +532,6 @@ <GroupName>freertos</GroupName> <Files> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> - </File> - <File> <FileName>croutine.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\vendor\freertos\freertos\Source\croutine.c</FilePath> @@ -616,6 +611,11 @@ </FileArmAds> </FileOption> </File> + <File> + <FileName>freertos_hook.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> + </File> </Files> </Group> <Group> @@ -1352,11 +1352,6 @@ <GroupName>freertos</GroupName> <Files> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> - </File> - <File> <FileName>croutine.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\vendor\freertos\freertos\Source\croutine.c</FilePath> @@ -1436,6 +1431,11 @@ <FileType>1</FileType> <FilePath>..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c</FilePath> </File> + <File> + <FileName>freertos_hook.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> + </File> </Files> </Group> <Group> @@ -2172,11 +2172,6 @@ <GroupName>freertos</GroupName> <Files> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> - </File> - <File> <FileName>croutine.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\vendor\freertos\freertos\Source\croutine.c</FilePath> @@ -2256,6 +2251,11 @@ </FileArmAds> </FileOption> </File> + <File> + <FileName>freertos_hook.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> + </File> </Files> </Group> <Group> @@ -2992,11 +2992,6 @@ <GroupName>freertos</GroupName> <Files> <File> - <FileName>FreeRTOSCommonHooks.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</FilePath> - </File> - <File> <FileName>croutine.c</FileName> <FileType>1</FileType> <FilePath>..\..\..\vendor\freertos\freertos\Source\croutine.c</FilePath> @@ -3076,6 +3071,11 @@ </FileArmAds> </FileOption> </File> + <File> + <FileName>freertos_hook.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\..\vendor\freertos\freertos_hook.c</FilePath> + </File> </Files> </Group> <Group> |
