Update comments in Atmel Studio CreateProjectDirectoryStructure.bat files to remove...

Update the tickless idle implementations that use up counters for tick interrupt generate to ensure they remain in low power mode for the desired time instead of one tick less than the desired time.

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

diff --git a/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat
index a744b23de3deb692056b5ed4e1d2e766812360b4..fb2f836681acc435820526e32a75d5ae1bd3985e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat
@@ -1,11 +1,6 @@
 REM This file should be executed from the command line prior to the first\r
-REM build.  It will be necessary to refresh the Eclipse project once the\r
-REM .bat file has been executed (normally just press F5 to refresh).\r
-\r
-REM Copies all the required files from their location within the standard\r
-REM FreeRTOS directory structure to under the Eclipse project directory.\r
-REM This permits the Eclipse project to be used in 'managed' mode and without\r
-REM having to setup any linked resources.\r
+REM build. Copies all the required files from their location within the standard\r
+REM FreeRTOS directory structure to under the Atmel Studio project directory.\r
 \r
 REM Standard paths\r
 SET FREERTOS_SOURCE=..\..\Source\r
@@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     MD src\asf\thirdparty\FreeRTOS\portable\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    MD src\asf\thirdparty\FreeRTOS\portable\MemMang    \r
+    MD src\asf\thirdparty\FreeRTOS\portable\MemMang\r
     MD src\Common-Demo-Source\include\r
-    \r
+\r
     REM Copy the core kernel files into the project directory\r
     copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS\r
     copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS\r
@@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
 \r
     REM Copy the common header files into the project directory\r
     copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include\r
-    \r
+\r
     REM Copy the portable layer files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    \r
+\r
     REM Copy the memory allocation files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang\r
 \r
@@ -51,8 +46,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     copy %COMMON_SOURCE%\recmutex.c        src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\countsem.c        src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\integer.c         src\Common-Demo-Source\r
-    \r
+\r
     REM Copy the common demo file headers.\r
     copy %COMMON_INCLUDE%\*.h              src\Common-Demo-Source\include\r
-    \r
+\r
 : END\r

diff --git a/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat
index a744b23de3deb692056b5ed4e1d2e766812360b4..fb2f836681acc435820526e32a75d5ae1bd3985e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat
@@ -1,11 +1,6 @@
 REM This file should be executed from the command line prior to the first\r
-REM build.  It will be necessary to refresh the Eclipse project once the\r
-REM .bat file has been executed (normally just press F5 to refresh).\r
-\r
-REM Copies all the required files from their location within the standard\r
-REM FreeRTOS directory structure to under the Eclipse project directory.\r
-REM This permits the Eclipse project to be used in 'managed' mode and without\r
-REM having to setup any linked resources.\r
+REM build. Copies all the required files from their location within the standard\r
+REM FreeRTOS directory structure to under the Atmel Studio project directory.\r
 \r
 REM Standard paths\r
 SET FREERTOS_SOURCE=..\..\Source\r
@@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     MD src\asf\thirdparty\FreeRTOS\portable\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    MD src\asf\thirdparty\FreeRTOS\portable\MemMang    \r
+    MD src\asf\thirdparty\FreeRTOS\portable\MemMang\r
     MD src\Common-Demo-Source\include\r
-    \r
+\r
     REM Copy the core kernel files into the project directory\r
     copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS\r
     copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS\r
@@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
 \r
     REM Copy the common header files into the project directory\r
     copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include\r
-    \r
+\r
     REM Copy the portable layer files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    \r
+\r
     REM Copy the memory allocation files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang\r
 \r
@@ -51,8 +46,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     copy %COMMON_SOURCE%\recmutex.c        src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\countsem.c        src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\integer.c         src\Common-Demo-Source\r
-    \r
+\r
     REM Copy the common demo file headers.\r
     copy %COMMON_INCLUDE%\*.h              src\Common-Demo-Source\include\r
-    \r
+\r
 : END\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
index b34a0f8b3741553f9c3733039e355bf80edce7fb..735cca62405a0d0c38bdae0da95d45e3753c827f 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
@@ -134,7 +134,7 @@ static volatile uint32_t ulTickFlag = pdFALSE;
 following variable offsets the AST counter alarm value by the number of AST\r
 counts that would typically be missed while the counter was stopped to compensate\r
 for the lost time.  _RB_ Value needs calculating correctly. */\r
-static uint32_t ulStoppedTimerCompensation = 10 / ( configCPU_CLOCK_HZ / configSYSTICK_CLOCK_HZ );\r
+static uint32_t ulStoppedTimerCompensation = 2 / ( configCPU_CLOCK_HZ / configSYSTICK_CLOCK_HZ );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -274,10 +274,8 @@ enum sleepmgr_mode xSleepMode;
        }\r
 \r
        /* Calculate the reload value required to wait xExpectedIdleTime tick\r
-       periods.  -1 is used because this code will execute part way through one of\r
-       the tick periods, and the fraction of a tick period is accounted for\r
-       later. */\r
-       ulAlarmValue = ( ulAlarmValueForOneTick * ( xExpectedIdleTime - 1UL ) );\r
+       periods. */\r
+       ulAlarmValue = ulAlarmValueForOneTick * xExpectedIdleTime;\r
        if( ulAlarmValue > ulStoppedTimerCompensation )\r
        {\r
                /* Compensate for the fact that the AST is going to be stopped\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat
index cf4d11ce018bcf8f751682d7c9e9775aca588d09..eec5266132bf49864365b5387c97176cbc1533e5 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat
@@ -1,11 +1,6 @@
 REM This file should be executed from the command line prior to the first\r
-REM build.  It will be necessary to refresh the Eclipse project once the\r
-REM .bat file has been executed (normally just press F5 to refresh).\r
-\r
-REM Copies all the required files from their location within the standard\r
-REM FreeRTOS directory structure to under the Eclipse project directory.\r
-REM This permits the Eclipse project to be used in 'managed' mode and without\r
-REM having to setup any linked resources.\r
+REM build. Copies all the required files from their location within the standard\r
+REM FreeRTOS directory structure to under the Atmel Studio project directory.\r
 \r
 REM Standard paths\r
 SET FREERTOS_SOURCE=..\..\Source\r
@@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     MD src\asf\thirdparty\FreeRTOS\portable\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\r
     MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    MD src\asf\thirdparty\FreeRTOS\portable\MemMang    \r
+    MD src\asf\thirdparty\FreeRTOS\portable\MemMang\r
     MD src\Common-Demo-Source\include\r
-    \r
+\r
     REM Copy the core kernel files into the project directory\r
     copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS\r
     copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS\r
@@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
 \r
     REM Copy the common header files into the project directory\r
     copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include\r
-    \r
+\r
     REM Copy the portable layer files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\r
-    \r
+\r
     REM Copy the memory allocation files into the project directory\r
     copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang\r
 \r
@@ -52,8 +47,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END
     copy %COMMON_SOURCE%\countsem.c        src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\integer.c         src\Common-Demo-Source\r
     copy %COMMON_SOURCE%\QueueSet.c        src\Common-Demo-Source\r
-    \r
+\r
     REM Copy the common demo file headers.\r
     copy %COMMON_INCLUDE%\*.h              src\Common-Demo-Source\include\r
-    \r
+\r
 : END\r

diff --git a/FreeRTOS/Source/portable/GCC/RX100/port.c b/FreeRTOS/Source/portable/GCC/RX100/port.c
index ece7e30f337e5771d97ce1d1f1a43a055a10835b..3180202fc43f909c6e484fb1b310c2a88f9e6792 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX100/port.c
+++ b/FreeRTOS/Source/portable/GCC/RX100/port.c
@@ -580,10 +580,8 @@ static void prvSetupTimerInterrupt( void )
                }\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime tick\r
-               periods.  -1 is used because this code will execute part way through\r
-               one of the tick periods, and the fraction of a tick period is accounted\r
-               for later. */\r
-               ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) );\r
+               periods. */\r
+               ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime;\r
                if( ulMatchValue > ulStoppedTimerCompensation )\r
                {\r
                        /* Compensate for the fact that the CMT is going to be stopped\r

diff --git a/FreeRTOS/Source/portable/IAR/RX100/port.c b/FreeRTOS/Source/portable/IAR/RX100/port.c
index 1051aff05f5dd5a89546414cfb4fe94dce0da8b3..23b04391e644e32e4235d1fea9545d0151baf402 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RX100/port.c
+++ b/FreeRTOS/Source/portable/IAR/RX100/port.c
@@ -424,10 +424,8 @@ static void prvSetupTimerInterrupt( void )
                }\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime tick\r
-               periods.  -1 is used because this code will execute part way through\r
-               one of the tick periods, and the fraction of a tick period is accounted\r
-               for later. */\r
-               ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) );\r
+               periods. */\r
+               ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime;\r
                if( ulMatchValue > ulStoppedTimerCompensation )\r
                {\r
                        /* Compensate for the fact that the CMT is going to be stopped\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX100/port.c b/FreeRTOS/Source/portable/Renesas/RX100/port.c
index 6dacf3a9c5db327f0f8ee4aaa54a9999d16db6c5..7026dff16d36a53268c20026917bacf77397bc99 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX100/port.c
+++ b/FreeRTOS/Source/portable/Renesas/RX100/port.c
@@ -554,10 +554,8 @@ static void prvSetupTimerInterrupt( void )
                }\r
 \r
                /* Calculate the reload value required to wait xExpectedIdleTime tick\r
-               periods.  -1 is used because this code will execute part way through\r
-               one of the tick periods, and the fraction of a tick period is accounted\r
-               for later. */\r
-               ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) );\r
+               periods. */\r
+               ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime;\r
                if( ulMatchValue > ulStoppedTimerCompensation )\r
                {\r
                        /* Compensate for the fact that the CMT is going to be stopped\r