From 040a7c02df758ad3ab727cc469c025458ecfd160 Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Sun, 15 Dec 2013 10:17:02 +0000
Subject: [PATCH] Change the configCPU_CLOCK_HZ setting in the SAM4E demo to
 use the SystemCoreClock variable.

---
 .../RTOSDemo.atsuo                            | Bin 95232 -> 102400 bytes
 .../RTOSDemo.cproj                            |   9 +++------
 .../src/config/FreeRTOSConfig.h               |   4 +++-
 .../CORTEX_M4_ATSAM4E_Atmel_Studio/src/main.c |   2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

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
GIT binary patch
delta 3738
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

delta 2916
zcmZuz2~<;O7JfH*31KxXRuq8{7Z7O(h)NYS;yPABP!SgtjJVb+gXmD)0y++~g25}f
zTD1oCh*LM@Ii`-b1a;aON0F*Wv9&g~)%NtbbR3SOPQ|$orMBnHf6kZu_uhZG@2<bi
zskZ%~st;AF<_dx^4#SnbAQML@BmJ#RPiM?v<lx)NZh;v*o5NVZ7|xi7HOgxNo+HlO
zo!>Ttk~u=9R3esudMr;5r$|p#W>NIvIcb+e44Ske7W+&PLuHQNa)`q=AB(0ZQ~sT6
zq$1yoN^f}1qe~|bi@I1e#Z38ia-_B{EecHlldpBMR2M)HzQ89z<5eKa%#QPmf-~@p
zm>{(U+q~2T%x?FQO2SG+^)#M;G6kPTn#IV@Bd|!<qERsw_=*$tIPk(zy}fd=W!N{V
z#hdC2b`*!==doR-&H4tV<{e%b(YaVE>YD*CZj1KwajXFwo^ISP#SE}3#Us2(IyGp0
z2-()aFsR4h*Op@19h+pEV1~fuS!LU4!))uMdsDOi6L-DNw>mRedYJBk!1AN&rIqh>
z%Y0fKp8I6Q&*#Hs$)k*ks;Ei)xmAoTMmt+;5C2bPOk+%!dAKkOl{OHlwgOV6lqqMu
zFs+w?W~~FYuUi-?3=wjK(L#<id=`YDzV4VWtH|S=ERvoVg1<sQOsJYfjq|`n%c39%
zlBn7M(P)3*g?d{pZlY{VFWoM!EAv(2-fJ7ZOZncij=Q}##2Yv9%+9E0Y-S*13!{eN
zU=U*~V;kc+Lt3z53n&By=GAOR_tqeaHbaqgu>30#50)R4Ij}%hAOnxIdSRC;4JoY<
zhQ_M%D&8$D#--<{N;5Yr0h_mMA@c-SjD{^ve8Uz@&Uui8KBXhkT62ImtVA=7z{BUF
zQCrpz2W@>9Q?><3%eSQ}D8dR3%zD3LOAqwy?2dlhwW!$<Mt$eNQLMYa5_5M(;;c$7
z+V6LhzT5E>@NQK!I&bM{XBZ5`n;*PI+Ig@VFYPj*y(Yb5dCtYZV#GgBk~0f_!n}r1
zv`aDIi=~a<d&~JWnqlXV$RK+kFmWEST~A36giZRtVf)F6kS{gu?+R2<20A(=f>EX6
z9UoHdBzO;-hX&!S8GgLWK#>(7Vg1KuXpv<H@RJNJu6h!JYZ}#X6K~zA#FoSmY;Q`#
z^^ImKsDSD6nHn)t!R`@1EKb+)B#NPD^kVd8^kMX6L^EO-{TQ)~{){-r>kI=Uo?&Dp
zFcKL95Dq-AE=WdQQwraA7fq*IB{=*X;5mk#F-!SpdnhpFYz*luI3bLW$D#AnVwgdt
z7A`>c<N|D;n8;rhBf;MJfDh}Maj`YTkpnv%u@Iw*W(zd1&32J<Fk4Dnr-n~u5<T~H
z-i3mpqfm{IKHfhP&=zY#(?K=mSHW&Pb|{7;<E60!Q1_8mHIUD0#Znh<j!8z#Q8mYa
zyr3l!#;^wC@T-QeVbQBS;W@Io<8kR{D=B#(gfKCdX0L-i=rl(#F_>mghF$2~J5_eJ
ztS)rN)h-vfWw#tcPp(!a*U&7SePS0HYejUX8+czoDdD35fCaTTl!-7B6P9E#bEpJ=
zPXH|ZY%?bQqnSL@fIsF^D;_ONN6SS&Y~E(Vsz1)a3+F>Q#@?dap`gdx=jT&q9Irgm
z>MM=ibVAY4`~hG^WgWiO;^ITcb3lay)?4E+|C?hCS3rT6JdvChf!N-1Lz;gz73i21
z3eniQN6teF?!KPc@I{+Ku@<C9H++;BxKq#R(G|b04wuGy4g$HS!2-$lZ2+L>&SUBH
z?Fi`5*XR!hbY>)ay(p_cQuPKni78VI%t&S%9PDsfp59+A7@4ep8PvJGS^hdRMEX}Y
zT*l^SA)Bx0CH;>#l`N3Qb}mjEB-{OEfX=^+;%^f0L0zUC)Fm|aPjG+tLj@L|;0oJT
z=7rxq)5+d<V$095HN)U0t+zm5G+kbS?n_fZD?$5MpvkLv0jo;)fg@^_`y8DU!R%1L
zDN(Ml<W@k4zdUpCWpYJtKRP=S=>1eaD(}#ESGfv)0BX>H$5r43Y2e!I4NF8SD1me2
zUJuFGV)dhdXz)260B00(r=T`1Ocvz^+tDChMS;M5O>Vj~J9$(T0yaf9(4!DAYjT*K
z*C}!pb%l)z%yd}s(5^ll1cfejcd#hXye*o%x<fGL*;CP0uECq@)MV5_;_;qf1JVQ7
z_C>JEo9t`Iqk|}}<SEn?#l@5Z2uEMlV;-(PuIEqiy2AZXDY$7wJPfCD`Dt)!lQ-qQ
z4iWo$^9j~{J5V=MM@BXHktZ5N%3sSy%zN`S_R=s`bSgIO|2Hj}2v*e`Cd27gG~A=J
z{UL>nBIILUVGmkk0X1Be%M+QrA%x!T4@2Oz90=<uXA)?AjboAr4;=i)sKnKcuN0x;
zBruXGo|_ZvRUE|9Ron;URv?dsrvIaK3|S2DC8tG{7)-<CVW`U%4-REu@9)7a`gr|!
zWy!?Y>MGB|;nkVl6jp(vk|3L|_kw8RyzJqh`r>H*^>bV4>jCg3xs$*h$X%=BJ=7`w
zn5qXtJk?jg6zW+4u`bgfu=!%yKGVK5@WI(TQ}Efku2i1RMIsNIUE9qt7aUfIKz~Og
zEuI8P@Qd9RIkLHDh<n?}J_QO~`I8|TTt8(4J5hr$^a2Kq8N$II=ISyHX2P#4TX=ea
z>&^^lQ_${Qn1uz0(lGDsI9gK3);?V`9NxjFi^lQR06Mu0Mx*^$Pt^TEONK;tfr;O6
zuA)L150Hi<Vk$|I2TgLssvfX`_tEDo;7vNa0#4CW9rvKSRThr3IM=l~tQXygg5HjF
z@RsWXMND8Xx#q$&yxh9hRXGoa0wowA5`c!qLt2OLI;<Npw9|ZS-M4<3FBO&u^Mr*0
z4%})YOAbsRqY=i@tSV^1{1ZDIn;-=GBlrdT_ve?(1mSo5tl=S7)>ksG{z8^8O0ZC4
zDf}6m`)FTm;ok#=VK3{60^y5VZ0Qs5D_Im|<AuU7`E~koB#r)UgL1XK4U-k3{CIkq
W!UeDq=u!!MLW5Rw;+s}O@&5p%lhDfm

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
index ec820c4e3..8226146fc 100644
--- 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">
       <SubType>compile</SubType>
     </None>
+    <Compile Include="src\config\FreeRTOSIPConfig.h">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="src\FreeRTOS+\FreeRTOS+FAT SL\API\fat_sl.h">
       <SubType>compile</SubType>
     </Compile>
@@ -734,9 +737,6 @@
     <Compile Include="src\config\FreeRTOSConfig.h">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="src\config\FreeRTOSIPConfig.h">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="src\main.c">
       <SubType>compile</SubType>
     </Compile>
@@ -1121,9 +1121,6 @@
     <None Include="src\ASF\thirdparty\CMSIS\Include\core_cmInstr.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="src\ASF\thirdparty\CMSIS\Lib\GCC\libarm_cortexM4lf_math.a">
-      <SubType>compile</SubType>
-    </None>
     <None Include="src\ASF\thirdparty\CMSIS\README.txt">
       <SubType>compile</SubType>
     </None>
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 d7696232e..5037a1187 100644
--- 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.
  *----------------------------------------------------------*/
 
+extern uint32_t SystemCoreClock;
+
 #define configUSE_PREEMPTION					1
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION	1
 #define configUSE_QUEUE_SETS					1
 #define configUSE_IDLE_HOOK						0
 #define configUSE_TICK_HOOK						1
-#define configCPU_CLOCK_HZ						( ( unsigned long ) CHIP_FREQ_CPU_MAX )
+#define configCPU_CLOCK_HZ						( SystemCoreClock )
 #define configTICK_RATE_HZ						( 1000 )
 #define configMAX_PRIORITIES					( 5 )
 #define configMINIMAL_STACK_SIZE				( ( unsigned short ) 130 )
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 e7df6cbdf..ff6f7a864 100644
--- 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,
 or 0 to run the more comprehensive demo application that includes add-on
 components. */
-#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY	0
+#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY	1
 
 /*-----------------------------------------------------------*/