Update demos that use FreeRTOS+FAT SL to have correct version numbers after the update of FreeRTOS+FAT SL itself.

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

16 files changed, 200 insertions, 133 deletions

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd
index 10f454cc6..81e55ac4f 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd
@@ -12,7 +12,7 @@
       <name>C-SPY</name>

       <archiveVersion>2</archiveVersion>

       <data>

-        <version>25</version>

+        <version>26</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -89,7 +89,7 @@
         </option>

         <option>

           <name>OCLastSavedByProductVersion</name>

-          <state>6.50.6.4952</state>

+          <state>7.10.1.6733</state>

         </option>

         <option>

           <name>OCDownloadAttachToProgram</name>

@@ -183,6 +183,30 @@
           <name>OCAllMTBOptions</name>

           <state>1</state>

         </option>

+        <option>

+          <name>OCMulticoreNrOfCores</name>

+          <state>1</state>

+        </option>

+        <option>

+          <name>OCMulticoreMaster</name>

+          <state>0</state>

+        </option>

+        <option>

+          <name>OCMulticorePort</name>

+          <state>53461</state>

+        </option>

+        <option>

+          <name>OCMulticoreWorkspace</name>

+          <state></state>

+        </option>

+        <option>

+          <name>OCMulticoreSlaveProject</name>

+          <state></state>

+        </option>

+        <option>

+          <name>OCMulticoreSlaveConfiguration</name>

+          <state></state>

+        </option>

       </data>

     </settings>

     <settings>

@@ -257,7 +281,7 @@
       <name>CMSISDAP_ID</name>

       <archiveVersion>2</archiveVersion>

       <data>

-        <version>0</version>

+        <version>2</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -398,6 +422,30 @@
           <name>CMSISDAPMultiCPUNumber</name>

           <state>0</state>

         </option>

+        <option>

+          <name>OCProbeCfgOverride</name>

+          <state>0</state>

+        </option>

+        <option>

+          <name>OCProbeConfig</name>

+          <state></state>

+        </option>

+        <option>

+          <name>CMSISDAPProbeConfigRadio</name>

+          <state>0</state>

+        </option>

+        <option>

+          <name>CMSISDAPSelectedCPUBehaviour</name>

+          <state>0</state>

+        </option>

+        <option>

+          <name>ICpuName</name>

+          <state></state>

+        </option>

+        <option>

+          <name>OCJetEmuParams</name>

+          <state>1</state>

+        </option>

       </data>

     </settings>

     <settings>

@@ -472,7 +520,7 @@
       <name>IJET_ID</name>

       <archiveVersion>2</archiveVersion>

       <data>

-        <version>2</version>

+        <version>3</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -666,6 +714,10 @@
           <name>ICpuName</name>

           <state></state>

         </option>

+        <option>

+          <name>OCJetEmuParams</name>

+          <state>1</state>

+        </option>

       </data>

     </settings>

     <settings>

@@ -1254,19 +1306,15 @@
         <loadFlag>0</loadFlag>

       </plugin>

       <plugin>

-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>

-        <loadFlag>0</loadFlag>

-      </plugin>

-      <plugin>

-        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>

+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>

         <loadFlag>0</loadFlag>

       </plugin>

       <plugin>

-        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>

+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>

         <loadFlag>0</loadFlag>

       </plugin>

       <plugin>

-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>

+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>

         <loadFlag>0</loadFlag>

       </plugin>

       <plugin>

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp
index ce5914e3e..f0b9b6d9a 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp
@@ -12,7 +12,7 @@
       <name>General</name>

       <archiveVersion>3</archiveVersion>

       <data>

-        <version>21</version>

+        <version>22</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -87,7 +87,7 @@
         </option>

         <option>

           <name>OGLastSavedByProductVersion</name>

-          <state>6.50.6.4952</state>

+          <state>7.10.1.6733</state>

         </option>

         <option>

           <name>GeneralEnableMisra</name>

@@ -153,13 +153,17 @@
           <name>OGUseCmsisDspLib</name>

           <state>0</state>

         </option>

+        <option>

+          <name>GRuntimeLibThreads</name>

+          <state>0</state>

+        </option>

       </data>

     </settings>

     <settings>

       <name>ICCARM</name>

       <archiveVersion>2</archiveVersion>

       <data>

-        <version>28</version>

+        <version>30</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -229,7 +233,7 @@
         <option>

           <name>CCAllowList</name>

           <version>1</version>

-          <state>0000000</state>

+          <state>00000000</state>

         </option>

         <option>

           <name>CCDebugInfo</name>

@@ -400,13 +404,22 @@
           <name>IccFloatSemantics</name>

           <state>0</state>

         </option>

+        <option>

+          <name>CCNoLiteralPool</name>

+          <state>0</state>

+        </option>

+        <option>

+          <name>CCOptStrategySlave</name>

+          <version>0</version>

+          <state>0</state>

+        </option>

       </data>

     </settings>

     <settings>

       <name>AARM</name>

       <archiveVersion>2</archiveVersion>

       <data>

-        <version>8</version>

+        <version>9</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -563,6 +576,10 @@
           <name>AExtraOptionsV2</name>

           <state></state>

         </option>

+        <option>

+          <name>AsmNoLiteralPool</name>

+          <state>0</state>

+        </option>

       </data>

     </settings>

     <settings>

@@ -620,7 +637,7 @@
       <name>ILINK</name>

       <archiveVersion>0</archiveVersion>

       <data>

-        <version>15</version>

+        <version>16</version>

         <wantNonLocal>1</wantNonLocal>

         <debug>1</debug>

         <option>

@@ -900,6 +917,10 @@
           <version>0</version>

           <state>0</state>

         </option>

+        <option>

+          <name>IlinkThreadsSlave</name>

+          <state>1</state>

+        </option>

       </data>

     </settings>

     <settings>

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni
index 6174c3cd6..168f8bbb0 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni
@@ -52,9 +52,6 @@ Title0=ITrgPwr
 Symbol0=0 4 1

 LiveEnabled=0

 LiveFile=PowerLogLive.log

-[Trace2]

-Enabled=0

-ShowSource=0

 [SWOTraceWindow]

 ForcedPcSampling=0

 ForcedInterruptLogs=0

@@ -94,9 +91,6 @@ UseAuto=0
 TypeViolation=1

 UnspecRange=1

 ActionState=1

-[Trace1]

-Enabled=0

-ShowSource=1

 [Log file]

 LoggingEnabled=_ 0

 LogFile=_ ""

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt
index e9229ca91..fb28973bb 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt
@@ -14,7 +14,7 @@
           

           

           

-        <Column0>290</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>

+        <Column0>306</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>

       </Workspace>

       <Debug-Log>

         

@@ -30,7 +30,7 @@
     <Windows>

       

       

-    <Wnd0>

+    <Wnd2>

         <Tabs>

           <Tab>

             <Identity>TabID-16877-7786</Identity>

@@ -38,11 +38,11 @@
             <Factory>Workspace</Factory>

             <Session>

               

-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Full-Demo</ExpandedNode><ExpandedNode>RTOSDemo/Full-Demo/Common-Demo-Source</ExpandedNode></NodeDict></Session>

+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Blinky-Demo</ExpandedNode></NodeDict></Session>

           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>

+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>

         <Tabs>

           <Tab>

             <Identity>TabID-27919-7988</Identity>

@@ -58,20 +58,20 @@
           </Tab>

         <Tab><Identity>TabID-959-438</Identity><TabName>Ambiguous Definitions</TabName><Factory>Select-Ambiguous-Definitions</Factory><Session/></Tab><Tab><Identity>TabID-21579-10611</Identity><TabName>Find All Declarations</TabName><Factory>Find-All-Declarations</Factory><Session/></Tab></Tabs>

         

-      <SelectedTab>1</SelectedTab></Wnd1></Windows>

+      <SelectedTab>1</SelectedTab></Wnd3></Windows>

     <Editor>

       

       

       

       

-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Source\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>122</YPos2><SelStart2>6677</SelStart2><SelEnd2>6677</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Source\Full-Demo\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>410</YPos2><SelStart2>19389</SelStart2><SelEnd2>19389</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Common\Minimal\QueueOverwrite.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>178</YPos2><SelStart2>8141</SelStart2><SelEnd2>8141</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

+    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Source\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>62</YPos2><SelStart2>6677</SelStart2><SelEnd2>6677</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Source\Full-Demo\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>410</YPos2><SelStart2>19389</SelStart2><SelEnd2>19389</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\Source\Blinky-Demo\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>63</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

     <Positions>

       

       

       

       

       

-    <Top><Row0><Sizes><Toolbar-0134b418><key>iaridepm.enu1</key></Toolbar-0134b418></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>692</Bottom><Right>380</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>227381</sizeVertCX><sizeVertCY>706721</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>246</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>248</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>252546</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

+    <Top><Row0><Sizes><Toolbar-013BA3C8><key>iaridepm.enu1</key></Toolbar-013BA3C8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>692</Bottom><Right>380</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>227381</sizeVertCX><sizeVertCY>706721</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>246</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>248</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>252546</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

   </Desktop>

 </Workspace>

 

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h
index a51ecb8ed..1c69c6417 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H

 

 #include "../version/ver_fat_sl.h"

-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2

+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2

  #error Incompatible FAT_SL version number!

 #endif

 

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h
index b769abe9f..87ad9c6d6 100644
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo
index 85c113a8b..2f22006d2 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo
diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
index df2987558..525f7236e 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
@@ -281,36 +281,6 @@
   </armgcc.linker.libraries.LibrarySearchPaths>

   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>

   <armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam/utils/linker_scripts/sam4e/sam4e16e/gcc/flash.ld</armgcc.linker.miscellaneous.LinkerFlags>

-  <armgcc.assembler.general.IncludePaths>

-    <ListValues>

-      <Value>../src</Value>

-      <Value>../src/ASF/common/boards</Value>

-      <Value>../src/ASF/common/services/clock</Value>

-      <Value>../src/ASF/common/services/ioport</Value>

-      <Value>../src/ASF/common/utils</Value>

-      <Value>../src/ASF/sam/boards</Value>

-      <Value>../src/ASF/sam/boards/sam4e_ek</Value>

-      <Value>../src/ASF/sam/drivers/pmc</Value>

-      <Value>../src/ASF/sam/utils</Value>

-      <Value>../src/ASF/sam/utils/cmsis/sam4e/include</Value>

-      <Value>../src/ASF/sam/utils/cmsis/sam4e/source/templates</Value>

-      <Value>../src/ASF/sam/utils/fpu</Value>

-      <Value>../src/ASF/sam/utils/header_files</Value>

-      <Value>../src/ASF/sam/utils/preprocessor</Value>

-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>

-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>

-      <Value>../src/config</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include</Value>

-      <Value>../src/ASF/sam/components/ethernet_phy/ksz8051mnl</Value>

-      <Value>../src/ASF/sam/drivers/gmac</Value>

-      <Value>../src/ASF/sam/components/display/aat31xx</Value>

-      <Value>../src/ASF/sam/components/display/ili93xx</Value>

-      <Value>../src/ASF/sam/drivers/ebi/smc</Value>

-    </ListValues>

-  </armgcc.assembler.general.IncludePaths>

   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf</armgcc.preprocessingassembler.general.AssemblerFlags>

   <armgcc.preprocessingassembler.general.IncludePaths>

     <ListValues>

@@ -422,36 +392,6 @@
   </armgcc.linker.libraries.LibrarySearchPaths>

   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>

   <armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam/utils/linker_scripts/sam4e/sam4e16e/gcc/flash.ld</armgcc.linker.miscellaneous.LinkerFlags>

-  <armgcc.assembler.general.IncludePaths>

-    <ListValues>

-      <Value>../src</Value>

-      <Value>../src/ASF/common/boards</Value>

-      <Value>../src/ASF/common/services/clock</Value>

-      <Value>../src/ASF/common/services/ioport</Value>

-      <Value>../src/ASF/common/utils</Value>

-      <Value>../src/ASF/sam/boards</Value>

-      <Value>../src/ASF/sam/boards/sam4e_ek</Value>

-      <Value>../src/ASF/sam/drivers/pmc</Value>

-      <Value>../src/ASF/sam/utils</Value>

-      <Value>../src/ASF/sam/utils/cmsis/sam4e/include</Value>

-      <Value>../src/ASF/sam/utils/cmsis/sam4e/source/templates</Value>

-      <Value>../src/ASF/sam/utils/fpu</Value>

-      <Value>../src/ASF/sam/utils/header_files</Value>

-      <Value>../src/ASF/sam/utils/preprocessor</Value>

-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>

-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>

-      <Value>../src/config</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>

-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include</Value>

-      <Value>../src/ASF/sam/components/ethernet_phy/ksz8051mnl</Value>

-      <Value>../src/ASF/sam/drivers/gmac</Value>

-      <Value>../src/ASF/sam/components/display/aat31xx</Value>

-      <Value>../src/ASF/sam/components/display/ili93xx</Value>

-      <Value>../src/ASF/sam/drivers/ebi/smc</Value>

-    </ListValues>

-  </armgcc.assembler.general.IncludePaths>

   <armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>

   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf</armgcc.preprocessingassembler.general.AssemblerFlags>

   <armgcc.preprocessingassembler.general.IncludePaths>

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h
index 373d78092..8647077ee 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H

 

 #include "../version/ver_fat_sl.h"

-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2

+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2

  #error Incompatible FAT_SL version number!

 #endif

 

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h
index bd7823ef1..de630faf2 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h
index 373d78092..8647077ee 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H

 

 #include "../version/ver_fat_sl.h"

-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2

+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2

  #error Incompatible FAT_SL version number!

 #endif

 

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h
new file mode 100644
index 000000000..2f56f933d
--- /dev/null
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h
@@ -0,0 +1,62 @@
+/*

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

+ *

+ * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

+ * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

+ * the FreeRTOS kernel.  FreeRTOS+FAT SL is licensed separately from FreeRTOS,

+ * and uses a different license to FreeRTOS.  FreeRTOS+FAT SL uses a dual

+ * license model, information on which is provided below:

+ *

+ * - Open source licensing -

+ * FreeRTOS+FAT SL is a free download and may be used, modified and distributed

+ * without charge provided the user adheres to version two of the GNU General

+ * Public license (GPL) and does not remove the copyright notice or this text.

+ * The GPL V2 text is available on the gnu.org web site, and on the following

+ * URL: http://www.FreeRTOS.org/gpl-2.0.txt

+ *

+ * - Commercial licensing -

+ * Businesses and individuals who wish to incorporate FreeRTOS+FAT SL into

+ * proprietary software for redistribution in any form must first obtain a

+ * commercial license - and in-so-doing support the maintenance, support and

+ * further development of the FreeRTOS+FAT SL product.  Commercial licenses can

+ * be obtained from http://shop.freertos.org and do not require any source files

+ * to be changed.

+ *

+ * FreeRTOS+FAT SL is distributed in the hope that it will be useful.  You

+ * cannot use FreeRTOS+FAT SL unless you agree that you use the software 'as

+ * is'.  FreeRTOS+FAT SL is provided WITHOUT ANY WARRANTY; without even the

+ * implied warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A

+ * PARTICULAR PURPOSE. Real Time Engineers Ltd. and HCC Embedded disclaims all

+ * conditions and terms, be they implied, expressed, or statutory.

+ *

+ * http://www.FreeRTOS.org

+ * http://www.FreeRTOS.org/FreeRTOS-Plus

+ *

+ */

+

+#ifndef _CONFIG_FAT_SL_TEST_H

+#define _CONFIG_FAT_SL_TEST_H

+

+#include "../version/ver_fat_sl.h"

+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2

+ #error Incompatible FAT_SL version number!

+#endif

+

+

+/*

+** Maximum size for seek test.

+** Options: 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768

+*/

+#define F_MAX_SEEK_TEST 16384

+

+

+/*

+** Defines media type for testing.

+** Options: F_FAT12_MEDIA, F_FAT16_MEDIA, F_FAT32_MEDIA

+*/

+#define F_FAT_TYPE      F_FAT16_MEDIA

+

+

+#endif /* ifndef _CONFIG_STHIN_TEST_H */

+

+

diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h
index eababe5fa..134fedd65 100644
--- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h
+++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded

+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded

  *

  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers

  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of

diff --git a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
index 4890fde4b..141bb1d5d 100644
--- a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
+++ b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
@@ -1019,8 +1019,8 @@ BaseType_t xMessagePosted;
 		/* Clear the bits again. */

 		uxReturned = xEventGroupClearBitsFromISR( xISREventGroup, uxBitsToSet );

 

-		/* The returned value should be the value before the bits were cleaed.*/

-		if( uxReturned != uxBitsToSet )

+		/* Check the message was posted. */

+		if( uxReturned != pdPASS )

 		{

 			xISRTestError = pdTRUE;

 		}

diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
index d54af9bd6..03b185af8 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
@@ -2,5 +2,4 @@ TOOL_CHAIN=Renesas RXC Toolchain
 VERSION=v2.01.00
 TC_INSTALL=C:\Devtools\Renesas\RX\2_1_0\
 VERSION_IDE=3.06.02.004
-ACTIVE_CONFIGURATION=HardwareDebug
-E2STUDIO_VERSION=2.1.0.21
+E2STUDIO_VERSION=2.1.0.21
\ No newline at end of file
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h
index b8f28645b..362e2f3b2 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h
@@ -3,7 +3,7 @@
 /* Device     : RX/RX600/RX64M                                                  */

 /* File Name  : iodefine.h                                                      */

 /* Abstract   : Definition of I/O Register.                                     */

-/* History    : V0.8A  (2014-02-18)  [Hardware Manual Revision : 0.80]          */

+/* History    : V0.8C  (2014-03-22)  [Hardware Manual Revision : 0.80]          */

 /* Note       : This is a typical example.                                      */

 /*                                                                              */

 /*  Copyright(c) 2014 Renesas Electronics Corp.                                 */

@@ -1768,6 +1768,8 @@ struct st_edmac {
 		struct {

 			unsigned long :24;

 			unsigned long RMAFCE:1;

+			unsigned long :2;

+			unsigned long RRFCE:1;

 		} BIT;

 	} TRSCER;

 	char           wk7[4];

@@ -2783,9 +2785,9 @@ struct st_eptpc0 {
 			unsigned long MACL:24;

 		} BIT;

 	} SYMACRL;

-	char           wk0a[1];

+	char           wk1[4];

 	unsigned long  SYIPADDRR;

-	char           wk1[32];

+	char           wk2[32];

 	union {

 		unsigned long LONG;

 		struct {

@@ -2801,7 +2803,7 @@ struct st_eptpc0 {
 			unsigned long DNUM:8;

 		} BIT;

 	} SYDOMR;

-	char           wk2[8];

+	char           wk3[8];

 	union {

 		unsigned long LONG;

 		struct {

@@ -2899,7 +2901,7 @@ struct st_eptpc0 {
 			unsigned long PNUM:16;

 		} BIT;

 	} SYPNUMR;

-	char           wk3[20];

+	char           wk4[20];

 	union {

 		unsigned long LONG;

 		struct {

@@ -2909,7 +2911,7 @@ struct st_eptpc0 {
 			unsigned long BMUP:1;

 		} BIT;

 	} SYRVLDR;

-	char           wk4[12];

+	char           wk5[12];

 	union {

 		unsigned long LONG;

 		struct {

@@ -2955,7 +2957,7 @@ struct st_eptpc0 {
 			unsigned long ANCE:1;

 		} BIT;

 	} SYTRENR;

-	char           wk5[4];

+	char           wk6[4];

 	unsigned long  MTCIDU;

 	unsigned long  MTCIDL;

 	union {

@@ -2965,7 +2967,7 @@ struct st_eptpc0 {
 			unsigned long PNUM:16;

 		} BIT;

 	} MTPID;

-	char           wk6[20];

+	char           wk7[20];

 	union {

 		unsigned long LONG;

 		struct {

@@ -2988,7 +2990,7 @@ struct st_eptpc0 {
 	unsigned long  OFMRL;

 	unsigned long  MPDRU;

 	unsigned long  MPDRL;

-	char           wk7[8];

+	char           wk8[8];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3016,7 +3018,7 @@ struct st_eptpc0 {
 			unsigned long SRMV:16;

 		} BIT;

 	} SRR;

-	char           wk8[8];

+	char           wk9[8];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3052,7 +3054,7 @@ struct st_eptpc0 {
 			unsigned long TYPE:16;

 		} BIT;

 	} PETYPER;

-	char           wk9[12];

+	char           wk10[12];

 	unsigned long  PPIPR;

 	unsigned long  PDIPR;

 	union {

@@ -3108,7 +3110,7 @@ struct st_eptpc0 {
 			unsigned long SEL:1;

 		} BIT;

 	} FFLTR;

-	char           wk10[28];

+	char           wk11[28];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3137,7 +3139,7 @@ struct st_eptpc0 {
 			unsigned long MACL:24;

 		} BIT;

 	} FMAC1RL;

-	char           wk11[80];

+	char           wk12[80];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3563,6 +3565,7 @@ struct st_exdmac1 {
 };

 

 struct st_flash {

+	char           wk0[2];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3570,7 +3573,7 @@ struct st_flash {
 			unsigned char FLWE:2;

 		} BIT;

 	} FWEPROR;

-	char           wk0[7806329];

+	char           wk1[7806329];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3582,7 +3585,7 @@ struct st_flash {
 			unsigned char ECRCT:1;

 		} BIT;

 	} FASTAT;

-	char           wk1[3];

+	char           wk2[3];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3594,7 +3597,7 @@ struct st_flash {
 			unsigned char ECRCTIE:1;

 		} BIT;

 	} FAEINT;

-	char           wk2[3];

+	char           wk3[3];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3602,7 +3605,7 @@ struct st_flash {
 			unsigned char FRDYIE:1;

 		} BIT;

 	} FRDYIE;

-	char           wk3[23];

+	char           wk4[23];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3615,7 +3618,7 @@ struct st_flash {
 			unsigned long FEADDR:32;

 		} BIT;

 	} FEADDR;

-	char           wk4[28];

+	char           wk5[28];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3625,7 +3628,7 @@ struct st_flash {
 			unsigned short FCRME:1;

 		} BIT;

 	} FCURAME;

-	char           wk5[42];

+	char           wk6[42];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3654,7 +3657,7 @@ struct st_flash {
 			unsigned short FENTRYC:1;

 		} BIT;

 	} FENTRYR;

-	char           wk6[2];

+	char           wk7[2];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3663,7 +3666,7 @@ struct st_flash {
 			unsigned short FPROTCN:1;

 		} BIT;

 	} FPROTR;

-	char           wk7[2];

+	char           wk8[2];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3672,7 +3675,7 @@ struct st_flash {
 			unsigned short SUINIT:1;

 		} BIT;

 	} FSUINITR;

-	char           wk8[2];

+	char           wk9[2];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3680,7 +3683,7 @@ struct st_flash {
 			unsigned char FLOCKST:1;

 		} BIT;

 	} FLKSTAT;

-	char           wk9[15];

+	char           wk10[15];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3688,7 +3691,7 @@ struct st_flash {
 			unsigned short PCMDR:8;

 		} BIT;

 	} FCMDR;

-	char           wk10[30];

+	char           wk11[30];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3696,7 +3699,7 @@ struct st_flash {
 			unsigned short PEERRST:8;

 		} BIT;

 	} FPESTAT;

-	char           wk11[14];

+	char           wk12[14];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3704,7 +3707,7 @@ struct st_flash {
 			unsigned char BCDIR:1;

 		} BIT;

 	} FBCCNT;

-	char           wk12[3];

+	char           wk13[3];

 	union {

 		unsigned char BYTE;

 		struct {

@@ -3712,7 +3715,7 @@ struct st_flash {
 			unsigned char BCST:1;

 		} BIT;

 	} FBCSTAT;

-	char           wk13[3];

+	char           wk14[3];

 	union {

 		unsigned long LONG;

 		struct {

@@ -3720,7 +3723,7 @@ struct st_flash {
 			unsigned long PSADR:19;

 		} BIT;

 	} FPSADDR;

-	char           wk14[4];

+	char           wk15[4];

 	union {

 		unsigned short WORD;

 		struct {

@@ -3728,7 +3731,7 @@ struct st_flash {
 			unsigned short ESUSPMD:1;

 		} BIT;

 	} FCPSR;

-	char           wk15[2];

+	char           wk16[2];

 	union {

 		unsigned short WORD;

 		struct {

@@ -17396,7 +17399,7 @@ IPR_PERIA_INTA253=253,IPR_PERIA_INTA254=254,IPR_PERIA_INTA255=255
 #define	EXDMAC		(*(volatile struct st_exdmac   __evenaccess *)0x82A00)

 #define	EXDMAC0		(*(volatile struct st_exdmac0  __evenaccess *)0x82800)

 #define	EXDMAC1		(*(volatile struct st_exdmac1  __evenaccess *)0x82840)

-#define	FLASH		(*(volatile struct st_flash    __evenaccess *)0x8C296)

+#define	FLASH		(*(volatile struct st_flash    __evenaccess *)0x8C294)

 #define	GPT			(*(volatile struct st_gpt      __evenaccess *)0xC2000)

 #define	GPT0		(*(volatile struct st_gpt0     __evenaccess *)0xC2100)

 #define	GPT1		(*(volatile struct st_gpt0     __evenaccess *)0xC2180)