Add tickless idle support in Cortex-M ports.

Change CCS R4 directory name.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1796 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject
index fb658f8985154028b18a14eb49835d63c3ecd0ca..432b1c89ff27a0ff5c82e283be1fcfd605f16c2b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject
@@ -42,7 +42,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Library}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Common-Demo-Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/include}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/portable/CCS/ARM_Cortex-R4}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/startup}&quot;"/>\r
@@ -121,7 +121,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Common-Demo-Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Library}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/include}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/portable/CCS/ARM_Cortex-R4}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/startup}&quot;"/>\r

diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.settings/org.eclipse.core.resources.prefs b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.settings/org.eclipse.core.resources.prefs
index 2547a08bb3d57521961c5b883eb4840562f7dfa0..25fa24469854bbe3259792cb7cf98d8422342fe2 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.settings/org.eclipse.core.resources.prefs
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.settings/org.eclipse.core.resources.prefs
@@ -9,6 +9,8 @@ encoding//With_FPU/FreeRTOS/subdir_rules.mk=UTF-8
 encoding//With_FPU/FreeRTOS/subdir_vars.mk=UTF-8\r
 encoding//With_FPU/Library/subdir_rules.mk=UTF-8\r
 encoding//With_FPU/Library/subdir_vars.mk=UTF-8\r
+encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8\r
+encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8\r
 encoding//With_FPU/makefile=UTF-8\r
 encoding//With_FPU/objects.mk=UTF-8\r
 encoding//With_FPU/sources.mk=UTF-8\r
@@ -18,14 +20,16 @@ encoding//With_FPU/subdir_rules.mk=UTF-8
 encoding//With_FPU/subdir_vars.mk=UTF-8\r
 encoding//Without_FPU/Common-Demo-Source/subdir_rules.mk=UTF-8\r
 encoding//Without_FPU/Common-Demo-Source/subdir_vars.mk=UTF-8\r
-encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570/subdir_rules.mk=UTF-8\r
-encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570/subdir_vars.mk=UTF-8\r
+encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8\r
+encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8\r
 encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8\r
 encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8\r
 encoding//Without_FPU/FreeRTOS/subdir_rules.mk=UTF-8\r
 encoding//Without_FPU/FreeRTOS/subdir_vars.mk=UTF-8\r
 encoding//Without_FPU/Library/subdir_rules.mk=UTF-8\r
 encoding//Without_FPU/Library/subdir_vars.mk=UTF-8\r
+encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8\r
+encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8\r
 encoding//Without_FPU/makefile=UTF-8\r
 encoding//Without_FPU/objects.mk=UTF-8\r
 encoding//Without_FPU/sources.mk=UTF-8\r

diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat
index 6ebfb449fc522cf9b7db47b180b34ba045ca6ec0..2e37cbbae63bfaecadd875fc062fa61240ff24cd 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat
@@ -20,7 +20,7 @@ IF EXIST .\FreeRTOS_Source Goto END
     MD FreeRTOS\include\r
     MD FreeRTOS\portable\r
     MD FreeRTOS\portable\CCS\r
-    MD FreeRTOS\portable\CCS\ARM_Cortex-R4_RM48_TMS570\r
+    MD FreeRTOS\portable\CCS\ARM_Cortex-R4\r
     MD FreeRTOS\portable\MemMang    \r
        MD Common-Demo-Source\r
     MD Common-Demo-Source\include\r
@@ -35,7 +35,7 @@ IF EXIST .\FreeRTOS_Source Goto END
     copy %FREERTOS_SOURCE%\include\*.* FreeRTOS\include\r
     \r
     REM Copy the portable layer files into the project directory\r
-    copy %FREERTOS_SOURCE%\portable\CCS\ARM_Cortex-R4_RM48_TMS570\*.* FreeRTOS\portable\CCS\ARM_Cortex-R4_RM48_TMS570\r
+    copy %FREERTOS_SOURCE%\portable\CCS\ARM_Cortex-R4\*.* FreeRTOS\portable\CCS\ARM_Cortex-R4\r
     \r
     REM Copy the memory allocation files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c FreeRTOS\portable\MemMang\r

diff --git a/FreeRTOS/Demo/Common/Minimal/death.c b/FreeRTOS/Demo/Common/Minimal/death.c
index 16929059cebdf9ae86ba8a895ad99b1dbc190d5d..3eceb6114a4d2090ad4bc5b0e3190474d121e850 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/death.c
+++ b/FreeRTOS/Demo/Common/Minimal/death.c
@@ -127,7 +127,7 @@ static volatile unsigned portBASE_TYPE uxTasksRunningAtStart = 0;
 /* Tasks are deleted by the idle task.  Under heavy load the idle task might\r
 not get much processing time, so it would be legitimate for several tasks to\r
 remain undeleted for a short period. */\r
-static const unsigned portBASE_TYPE uxMaxNumberOfExtraTasksRunning = 2;\r
+static const unsigned portBASE_TYPE uxMaxNumberOfExtraTasksRunning = 3;\r
 \r
 /* Used to store a handle to the task that should be killed by a suicidal task,\r
 before it kills itself. */\r