From 8c971926f1b71dcc04acf93e80cd097c69045942 Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Thu, 5 Jul 2012 09:41:37 +0000
Subject: [PATCH] In the SAM4S demo, moved FreeRTOS into the ASF/thirdparty
 directory. Changed some of the compiler warning configuration.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1756 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../RTOSDemo.atsuo                            | Bin 23040 -> 26112 bytes
 .../RTOSDemo.cproj                            | 108 +++++++++++-------
 .../src/FreeRTOSConfig.h                      |   2 +-
 .../src/ParTest.c                             |   2 +-
 .../thirdparty}/FreeRTOS/include/FreeRTOS.h   |   0
 .../FreeRTOS/include/StackMacros.h            |   0
 .../thirdparty}/FreeRTOS/include/croutine.h   |   0
 .../thirdparty}/FreeRTOS/include/list.h       |   0
 .../FreeRTOS/include/mpu_wrappers.h           |   0
 .../thirdparty}/FreeRTOS/include/portable.h   |   0
 .../thirdparty}/FreeRTOS/include/projdefs.h   |   0
 .../thirdparty}/FreeRTOS/include/queue.h      |   0
 .../thirdparty}/FreeRTOS/include/semphr.h     |   0
 .../thirdparty}/FreeRTOS/include/task.h       |   0
 .../thirdparty}/FreeRTOS/include/timers.h     |   0
 .../src/{ => asf/thirdparty}/FreeRTOS/list.c  |   0
 .../FreeRTOS/portable/GCC/ARM_CM3/port.c      |   0
 .../FreeRTOS/portable/GCC/ARM_CM3/portmacro.h |   0
 .../FreeRTOS/portable/MemMang/heap_2.c        |   0
 .../src/{ => asf/thirdparty}/FreeRTOS/queue.c |   0
 .../src/{ => asf/thirdparty}/FreeRTOS/tasks.c |   0
 .../{ => asf/thirdparty}/FreeRTOS/timers.c    |   0
 22 files changed, 69 insertions(+), 43 deletions(-)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/FreeRTOS.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/StackMacros.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/croutine.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/list.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/mpu_wrappers.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/portable.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/projdefs.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/queue.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/semphr.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/task.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/include/timers.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/list.c (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/portable/GCC/ARM_CM3/port.c (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/portable/MemMang/heap_2.c (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/queue.c (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/tasks.c (100%)
 rename Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/{ => asf/thirdparty}/FreeRTOS/timers.c (100%)

diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo
index b2cce4a678797b414ca40eac6e8818e518f93386..d6467076a56b0759997a9024c6e4f2da5f26f086 100644
GIT binary patch
delta 3825
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
a+d|s4sge5I4fL|ZOsCi7CGt1s@&5t@lTsr9

delta 2293
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

diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
index ec02a17b5..9cc4c2e60 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
@@ -251,6 +251,9 @@
       <Value>ARM_MATH_CM4=true</Value>
       <Value>BOARD=SAM4S_EK</Value>
       <Value>__SAM4S16C__</Value>
+      <Value>XMEGA=0</Value>
+      <Value>MEGA=0</Value>
+      <Value>UC3=0</Value>
     </ListValues>
   </armgcc.compiler.symbols.DefSymbols>
   <armgcc.compiler.directories.IncludePaths>
@@ -271,17 +274,16 @@
       <Value>../src/asf/thirdparty/CMSIS/Include</Value>
       <Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
       <Value>../src/config</Value>
-      <Value>../src/FreeRTOS-Source/include</Value>
-      <Value>../src/FreeRTOS-Source/portable/GCC/ARM_CM3</Value>
+      <Value>../src/asf/thirdparty/FreeRTOS/include</Value>
+      <Value>../src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3</Value>
       <Value>../src/Common-Demo-Source/include</Value>
     </ListValues>
   </armgcc.compiler.directories.IncludePaths>
-  <armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
   <armgcc.compiler.optimization.OtherFlags>-fdata-sections</armgcc.compiler.optimization.OtherFlags>
   <armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
   <armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
   <armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
-  <armgcc.compiler.miscellaneous.OtherFlags>-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return  -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -Dprintf=iprintf</armgcc.compiler.miscellaneous.OtherFlags>
+  <armgcc.compiler.miscellaneous.OtherFlags>-pipe -Wall -Wextra -std=gnu99 -ffunction-sections -fdata-sections --param max-inline-insns-single=500 -Dprintf=iprintf</armgcc.compiler.miscellaneous.OtherFlags>
   <armgcc.linker.libraries.Libraries>
     <ListValues>
       <Value>arm_cortexM4l_math</Value>
@@ -364,6 +366,60 @@
     <Compile Include="src\asf\sam\utils\cmsis\sam4s\source\templates\system_sam4s.c">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\croutine.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\FreeRTOS.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\list.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\mpu_wrappers.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\portable.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\projdefs.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\queue.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\semphr.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\StackMacros.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\task.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\timers.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\list.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\port.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\portmacro.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\MemMang\heap_2.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\queue.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\tasks.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\timers.c">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="src\Common-Demo-Source\BlockQ.c">
       <SubType>compile</SubType>
     </Compile>
@@ -427,37 +483,7 @@
     <Compile Include="src\Common-Demo-Source\semtest.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\FreeRTOS.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\queue.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\semphr.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\task.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\timers.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\list.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\portable\GCC\ARM_CM3\port.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\portable\MemMang\heap_2.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\queue.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\tasks.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\timers.c">
+    <Compile Include="src\FreeRTOSConfig.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="src\main.c">
@@ -783,15 +809,15 @@
     <Folder Include="src\asf\thirdparty\CMSIS\Include\" />
     <Folder Include="src\asf\thirdparty\CMSIS\Lib\" />
     <Folder Include="src\asf\thirdparty\CMSIS\Lib\GCC\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\include\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\GCC\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\MemMang\" />
     <Folder Include="src\Common-Demo-Source\include" />
     <Folder Include="src\config\" />
-    <Folder Include="src\FreeRTOS-Source" />
-    <Folder Include="src\FreeRTOS-Source\include" />
-    <Folder Include="src\FreeRTOS-Source\portable" />
-    <Folder Include="src\FreeRTOS-Source\portable\GCC" />
-    <Folder Include="src\FreeRTOS-Source\portable\GCC\ARM_CM3" />
     <Folder Include="src\Common-Demo-Source" />
-    <Folder Include="src\FreeRTOS-Source\portable\MemMang" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
 </Project>
\ No newline at end of file
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
index ff6deb110..217b7bb8c 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
@@ -73,7 +73,7 @@
  * executed prior to this project being built.  Once it has been executed 
  * remove the #error line below.
  */
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
+//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
 
 /*-----------------------------------------------------------
  * Application specific definitions.
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
index 690cf3f6c..b9e602a23 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
@@ -98,7 +98,7 @@ static const uint32_t ulLED[] = { LED2_GPIO, LED0_GPIO, LED1_GPIO };
 
 void vParTestInitialise( void )
 {
-long l;
+unsigned long ul;
 
 	for( l = 0; l < partestNUM_LEDS; l++ )
 	{
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c
-- 
2.39.5