From f901b4fe78551061550adf2105962299a589956e Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 25 Apr 2014 15:24:01 +0700 Subject: update IAR & Keil project for freertos --- demos/device/device_freertos/device_freertos.ewp | 2 +- demos/device/device_freertos/device_freertos.uvopt | 24 +++++----- .../device/device_freertos/device_freertos.uvproj | 48 ++++++++++---------- demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt | 4 +- demos/host/host_freertos/host_freertos.ewp | 2 +- demos/host/host_freertos/host_freertos.uvopt | 52 +++++++++++----------- 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 @@ $PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\croutine.c - $PROJ_DIR$\..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + $PROJ_DIR$\..\..\..\vendor\freertos\freertos_hook.c $PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c 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 @@ 0 15 0 - 68 + 69 86 0 ..\src\main.c @@ -1449,7 +1449,7 @@ 0 27 0 - 57 + 58 64 0 ..\..\..\boards\board.c @@ -1993,7 +1993,7 @@ 0 0 0 - 138 + 139 156 0 ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -2063,10 +2063,10 @@ 1 0 0 - 51 + 0 0 - 1653 - 1673 + 1654 + 1665 0 ..\..\..\vendor\freertos\freertos\Source\tasks.c tasks.c @@ -2145,11 +2145,11 @@ 0 0 0 - 1 - 1 + 0 + 0 0 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + heap_4.c 0 0 @@ -2164,8 +2164,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c + freertos_hook.c 0 0 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 @@ ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c @@ -2077,14 +2077,14 @@ - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c @@ -3119,14 +3119,14 @@ - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c @@ -4201,14 +4201,14 @@ - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c @@ -5243,14 +5243,14 @@ ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c @@ -6325,14 +6325,14 @@ - FreeRTOSCommonHooks.c + heap_4.c 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + freertos_hook.c 1 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + ..\..\..\vendor\freertos\freertos_hook.c 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 @@ 0 27 0 - 96 + 97 98 0 ..\src\main.c @@ -1528,7 +1528,7 @@ 0 0 0 - 146 + 147 151 0 ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s 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 @@ $PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\croutine.c - $PROJ_DIR$\..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c + $PROJ_DIR$\..\..\..\vendor\freertos\freertos_hook.c $PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c 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 @@ 0 - 0 + 1 0 1 @@ -606,10 +606,10 @@ 1 0 0 - 27 + 0 0 97 - 98 + 102 0 ..\src\main.c main.c @@ -1038,13 +1038,13 @@ 1 0 0 - 5 + 0 0 0 0 0 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - FreeRTOSCommonHooks.c + ..\..\..\vendor\freertos\freertos\Source\croutine.c + croutine.c 0 0 @@ -1059,8 +1059,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\croutine.c - croutine.c + ..\..\..\vendor\freertos\freertos\Source\list.c + list.c 0 0 @@ -1075,8 +1075,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\list.c - list.c + ..\..\..\vendor\freertos\freertos\Source\queue.c + queue.c 0 0 @@ -1091,8 +1091,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\queue.c - queue.c + ..\..\..\vendor\freertos\freertos\Source\tasks.c + tasks.c 0 0 @@ -1107,8 +1107,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\tasks.c - tasks.c + ..\..\..\vendor\freertos\freertos\Source\timers.c + timers.c 0 0 @@ -1123,8 +1123,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\timers.c - timers.c + ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c + heap_4.c 0 0 @@ -1134,13 +1134,13 @@ 1 0 0 - 0 + 1 0 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\portable\MemMang\heap_4.c - heap_4.c + ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c + port_cm4f.c 0 0 @@ -1150,13 +1150,13 @@ 1 0 0 - 1 + 0 0 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM4F\port_cm4f.c - port_cm4f.c + ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c + port_cm3.c 0 0 @@ -1171,8 +1171,8 @@ 0 0 0 - ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c - port_cm3.c + ..\..\..\vendor\freertos\freertos_hook.c + freertos_hook.c 0 0 @@ -1248,7 +1248,7 @@ 0 0 0 - 95 + 82 103 0 ..\..\..\boards\board.c @@ -1416,7 +1416,7 @@ 0 0 0 - 151 + 152 154 0 ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s 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 @@ -531,11 +531,6 @@ freertos - - FreeRTOSCommonHooks.c - 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - croutine.c 1 @@ -616,6 +611,11 @@ + + freertos_hook.c + 1 + ..\..\..\vendor\freertos\freertos_hook.c + @@ -1351,11 +1351,6 @@ freertos - - FreeRTOSCommonHooks.c - 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - croutine.c 1 @@ -1436,6 +1431,11 @@ 1 ..\..\..\vendor\freertos\freertos\Source\portable\RVDS\ARM_CM3\port_cm3.c + + freertos_hook.c + 1 + ..\..\..\vendor\freertos\freertos_hook.c + @@ -2171,11 +2171,6 @@ freertos - - FreeRTOSCommonHooks.c - 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - croutine.c 1 @@ -2256,6 +2251,11 @@ + + freertos_hook.c + 1 + ..\..\..\vendor\freertos\freertos_hook.c + @@ -2991,11 +2991,6 @@ freertos - - FreeRTOSCommonHooks.c - 1 - ..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c - croutine.c 1 @@ -3076,6 +3071,11 @@ + + freertos_hook.c + 1 + ..\..\..\vendor\freertos\freertos_hook.c + -- cgit v1.3.1