From dbe0ae2bffc79c8f0545abecbae8a16476585d52 Mon Sep 17 00:00:00 2001 From: Richard Barry Date: Tue, 16 Oct 2012 07:56:55 +0000 Subject: [PATCH] Add tickless idle support in Cortex-M ports. Change CCS R4 directory name. --- FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject | 4 ++-- .../.settings/org.eclipse.core.resources.prefs | 8 ++++++-- .../CreateProjectDirectoryStructure.bat | 4 ++-- FreeRTOS/Demo/Common/Minimal/death.c | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject index fb658f8985..432b1c89ff 100644 --- a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject +++ b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/.cproject @@ -42,7 +42,7 @@ - + @@ -121,7 +121,7 @@ - + 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 2547a08bb3..25fa244698 100644 --- 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 encoding//With_FPU/Library/subdir_rules.mk=UTF-8 encoding//With_FPU/Library/subdir_vars.mk=UTF-8 +encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8 +encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8 encoding//With_FPU/makefile=UTF-8 encoding//With_FPU/objects.mk=UTF-8 encoding//With_FPU/sources.mk=UTF-8 @@ -18,14 +20,16 @@ encoding//With_FPU/subdir_rules.mk=UTF-8 encoding//With_FPU/subdir_vars.mk=UTF-8 encoding//Without_FPU/Common-Demo-Source/subdir_rules.mk=UTF-8 encoding//Without_FPU/Common-Demo-Source/subdir_vars.mk=UTF-8 -encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570/subdir_rules.mk=UTF-8 -encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4_RM48_TMS570/subdir_vars.mk=UTF-8 +encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8 +encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8 encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8 encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8 encoding//Without_FPU/FreeRTOS/subdir_rules.mk=UTF-8 encoding//Without_FPU/FreeRTOS/subdir_vars.mk=UTF-8 encoding//Without_FPU/Library/subdir_rules.mk=UTF-8 encoding//Without_FPU/Library/subdir_vars.mk=UTF-8 +encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8 +encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8 encoding//Without_FPU/makefile=UTF-8 encoding//Without_FPU/objects.mk=UTF-8 encoding//Without_FPU/sources.mk=UTF-8 diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_R4_RM48_CCS5/CreateProjectDirectoryStructure.bat index 6ebfb449fc..2e37cbbae6 100644 --- 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 MD FreeRTOS\portable MD FreeRTOS\portable\CCS - MD FreeRTOS\portable\CCS\ARM_Cortex-R4_RM48_TMS570 + MD FreeRTOS\portable\CCS\ARM_Cortex-R4 MD FreeRTOS\portable\MemMang MD Common-Demo-Source MD Common-Demo-Source\include @@ -35,7 +35,7 @@ IF EXIST .\FreeRTOS_Source Goto END copy %FREERTOS_SOURCE%\include\*.* FreeRTOS\include REM Copy the portable layer files into the project directory - copy %FREERTOS_SOURCE%\portable\CCS\ARM_Cortex-R4_RM48_TMS570\*.* FreeRTOS\portable\CCS\ARM_Cortex-R4_RM48_TMS570 + copy %FREERTOS_SOURCE%\portable\CCS\ARM_Cortex-R4\*.* FreeRTOS\portable\CCS\ARM_Cortex-R4 REM Copy the memory allocation files into the project directory copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c FreeRTOS\portable\MemMang diff --git a/FreeRTOS/Demo/Common/Minimal/death.c b/FreeRTOS/Demo/Common/Minimal/death.c index 16929059ce..3eceb6114a 100644 --- 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 not get much processing time, so it would be legitimate for several tasks to remain undeleted for a short period. */ -static const unsigned portBASE_TYPE uxMaxNumberOfExtraTasksRunning = 2; +static const unsigned portBASE_TYPE uxMaxNumberOfExtraTasksRunning = 3; /* Used to store a handle to the task that should be killed by a suicidal task, before it kills itself. */