Change the configCPU_CLOCK_HZ setting in the SAM4E demo to use the SystemCoreClock...

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

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo
index b648c532d25fef28eaeeadbbd0c352ab292e3dff..864edf72d853a115a559f324f30b9004bc0ab91d 100644 (file)
Binary files a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo and b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo differ

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
index ec820c4e3321a45cc8a9260648921ce153fd0e25..8226146fcd752bd44077aaa9dcc2109df1032970 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
@@ -636,6 +636,9 @@
     <None Include="src\config\conf_ili93xx.h">\r
       <SubType>compile</SubType>\r
     </None>\r
+    <Compile Include="src\config\FreeRTOSIPConfig.h">\r
+      <SubType>compile</SubType>\r
+    </Compile>\r
     <Compile Include="src\FreeRTOS+\FreeRTOS+FAT SL\API\fat_sl.h">\r
       <SubType>compile</SubType>\r
     </Compile>\r
@@ -734,9 +737,6 @@
     <Compile Include="src\config\FreeRTOSConfig.h">\r
       <SubType>compile</SubType>\r
     </Compile>\r
-    <Compile Include="src\config\FreeRTOSIPConfig.h">\r
-      <SubType>compile</SubType>\r
-    </Compile>\r
     <Compile Include="src\main.c">\r
       <SubType>compile</SubType>\r
     </Compile>\r
@@ -1121,9 +1121,6 @@
     <None Include="src\ASF\thirdparty\CMSIS\Include\core_cmInstr.h">\r
       <SubType>compile</SubType>\r
     </None>\r
-    <None Include="src\ASF\thirdparty\CMSIS\Lib\GCC\libarm_cortexM4lf_math.a">\r
-      <SubType>compile</SubType>\r
-    </None>\r
     <None Include="src\ASF\thirdparty\CMSIS\README.txt">\r
       <SubType>compile</SubType>\r
     </None>\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
index d7696232e2fcd460bd87f7ec4f07c28130de4fe8..5037a1187b9cf06617260a077a8459331ba46cfe 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
@@ -82,12 +82,14 @@
  * See http://www.freertos.org/a00110.html.\r
  *----------------------------------------------------------*/\r
 \r
+extern uint32_t SystemCoreClock;\r
+\r
 #define configUSE_PREEMPTION                                   1\r
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION        1\r
 #define configUSE_QUEUE_SETS                                   1\r
 #define configUSE_IDLE_HOOK                                            0\r
 #define configUSE_TICK_HOOK                                            1\r
-#define configCPU_CLOCK_HZ                                             ( ( unsigned long ) CHIP_FREQ_CPU_MAX )\r
+#define configCPU_CLOCK_HZ                                             ( SystemCoreClock )\r
 #define configTICK_RATE_HZ                                             ( 1000 )\r
 #define configMAX_PRIORITIES                                   ( 5 )\r
 #define configMINIMAL_STACK_SIZE                               ( ( unsigned short ) 130 )\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main.c
index e7df6cbdff63b6e008b43ae04abee8fefc16a040..ff6f7a86450928907b6f0671961ce51284812104 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main.c
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main.c
@@ -88,7 +88,7 @@
 /* Set mainCREATE_SIMPLE_BLINKY_DEMO_ONLY to one to run the simple blinky demo,\r
 or 0 to run the more comprehensive demo application that includes add-on\r
 components. */\r
-#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY     0\r
+#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY     1\r
 \r
 /*-----------------------------------------------------------*/\r
 \r