]> git.sur5r.net Git - freertos/commitdiff
Update demos that use FreeRTOS+FAT SL to have correct version numbers after the updat...
authorrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 23 Apr 2014 14:34:49 +0000 (14:34 +0000)
committerrtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 23 Apr 2014 14:34:49 +0000 (14:34 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2237 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

16 files changed:
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h
FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h
FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo
FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h
FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h
FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h
FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h [new file with mode: 0644]
FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h
FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h

index 10f454cc687117ade4d498ac797cbeac9b672c09..81e55ac4f879a1207c6c5d2a0cdc814426c0532f 100644 (file)
@@ -12,7 +12,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>25</version>\r
+        <version>26</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -89,7 +89,7 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>6.50.6.4952</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
           <name>OCAllMTBOptions</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>OCMulticoreNrOfCores</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreMaster</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticorePort</name>\r
+          <state>53461</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreWorkspace</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveProject</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveConfiguration</name>\r
+          <state></state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>CMSISDAP_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>0</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
           <name>CMSISDAPMultiCPUNumber</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>OCProbeCfgOverride</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCProbeConfig</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPProbeConfigRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPSelectedCPUBehaviour</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ICpuName</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>IJET_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>2</version>\r
+        <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
           <name>ICpuName</name>\r
           <state></state>\r
         </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
index ce5914e3e7b3390889b1ade027727c598055a53d..f0b9b6d9ac11b18023624d66ca0beac574febbbd 100644 (file)
@@ -12,7 +12,7 @@
       <name>General</name>\r
       <archiveVersion>3</archiveVersion>\r
       <data>\r
-        <version>21</version>\r
+        <version>22</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -87,7 +87,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>6.50.6.4952</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
           <name>OGUseCmsisDspLib</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>GRuntimeLibThreads</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>28</version>\r
+        <version>30</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
         <option>\r
           <name>CCAllowList</name>\r
           <version>1</version>\r
-          <state>0000000</state>\r
+          <state>00000000</state>\r
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
           <name>IccFloatSemantics</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCNoLiteralPool</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCOptStrategySlave</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>AARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>9</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
           <name>AExtraOptionsV2</name>\r
           <state></state>\r
         </option>\r
+        <option>\r
+          <name>AsmNoLiteralPool</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>ILINK</name>\r
       <archiveVersion>0</archiveVersion>\r
       <data>\r
-        <version>15</version>\r
+        <version>16</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
           <version>0</version>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>IlinkThreadsSlave</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
index 6174c3cd6d357e324bcb0204b5566147fa8edbe7..168f8bbb0e2920f5cdd771d83342cffdead927b5 100644 (file)
@@ -52,9 +52,6 @@ Title0=ITrgPwr
 Symbol0=0 4 1\r
 LiveEnabled=0\r
 LiveFile=PowerLogLive.log\r
-[Trace2]\r
-Enabled=0\r
-ShowSource=0\r
 [SWOTraceWindow]\r
 ForcedPcSampling=0\r
 ForcedInterruptLogs=0\r
@@ -94,9 +91,6 @@ UseAuto=0
 TypeViolation=1\r
 UnspecRange=1\r
 ActionState=1\r
-[Trace1]\r
-Enabled=0\r
-ShowSource=1\r
 [Log file]\r
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
index e9229ca9146e644cd7163a4393c81b53491fdd7c..fb28973bb5841729998b66af5101a1f62a37f19f 100644 (file)
@@ -14,7 +14,7 @@
           \r
           \r
           \r
-        <Column0>290</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>306</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Debug-Log>\r
         \r
@@ -30,7 +30,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd0>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-16877-7786</Identity>\r
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Full-Demo</ExpandedNode><ExpandedNode>RTOSDemo/Full-Demo/Common-Demo-Source</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Blinky-Demo</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-27919-7988</Identity>\r
           </Tab>\r
         <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>\r
         \r
-      <SelectedTab>1</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>1</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <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>\r
+    <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>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <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>\r
+    <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>\r
   </Desktop>\r
 </Workspace>\r
 \r
index a51ecb8eda48fec8d5dfc6d58c6f9e3636bb3be5..1c69c6417c1443d80201dc94fc9223381d9d04dc 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H\r
 \r
 #include "../version/ver_fat_sl.h"\r
-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2\r
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2\r
  #error Incompatible FAT_SL version number!\r
 #endif\r
 \r
index b769abe9f5de86fbd8e2ab8482f782bcee605709..87ad9c6d6a50eb2f181f4a52ab54f47c047a2871 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
index 85c113a8bbf7c93dd6054823eee3eb9bf851cd97..2f22006d2b8baf04ac6f1a14a830ae91d5371485 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
index df298755813374c1edcebd1fe7ebd77a8b12a565..525f7236e0376b2a1789e3bc8008bd9148b5d712 100644 (file)
   </armgcc.linker.libraries.LibrarySearchPaths>\r
   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>\r
   <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>\r
-  <armgcc.assembler.general.IncludePaths>\r
-    <ListValues>\r
-      <Value>../src</Value>\r
-      <Value>../src/ASF/common/boards</Value>\r
-      <Value>../src/ASF/common/services/clock</Value>\r
-      <Value>../src/ASF/common/services/ioport</Value>\r
-      <Value>../src/ASF/common/utils</Value>\r
-      <Value>../src/ASF/sam/boards</Value>\r
-      <Value>../src/ASF/sam/boards/sam4e_ek</Value>\r
-      <Value>../src/ASF/sam/drivers/pmc</Value>\r
-      <Value>../src/ASF/sam/utils</Value>\r
-      <Value>../src/ASF/sam/utils/cmsis/sam4e/include</Value>\r
-      <Value>../src/ASF/sam/utils/cmsis/sam4e/source/templates</Value>\r
-      <Value>../src/ASF/sam/utils/fpu</Value>\r
-      <Value>../src/ASF/sam/utils/header_files</Value>\r
-      <Value>../src/ASF/sam/utils/preprocessor</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>\r
-      <Value>../src/config</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include</Value>\r
-      <Value>../src/ASF/sam/components/ethernet_phy/ksz8051mnl</Value>\r
-      <Value>../src/ASF/sam/drivers/gmac</Value>\r
-      <Value>../src/ASF/sam/components/display/aat31xx</Value>\r
-      <Value>../src/ASF/sam/components/display/ili93xx</Value>\r
-      <Value>../src/ASF/sam/drivers/ebi/smc</Value>\r
-    </ListValues>\r
-  </armgcc.assembler.general.IncludePaths>\r
   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf</armgcc.preprocessingassembler.general.AssemblerFlags>\r
   <armgcc.preprocessingassembler.general.IncludePaths>\r
     <ListValues>\r
   </armgcc.linker.libraries.LibrarySearchPaths>\r
   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>\r
   <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>\r
-  <armgcc.assembler.general.IncludePaths>\r
-    <ListValues>\r
-      <Value>../src</Value>\r
-      <Value>../src/ASF/common/boards</Value>\r
-      <Value>../src/ASF/common/services/clock</Value>\r
-      <Value>../src/ASF/common/services/ioport</Value>\r
-      <Value>../src/ASF/common/utils</Value>\r
-      <Value>../src/ASF/sam/boards</Value>\r
-      <Value>../src/ASF/sam/boards/sam4e_ek</Value>\r
-      <Value>../src/ASF/sam/drivers/pmc</Value>\r
-      <Value>../src/ASF/sam/utils</Value>\r
-      <Value>../src/ASF/sam/utils/cmsis/sam4e/include</Value>\r
-      <Value>../src/ASF/sam/utils/cmsis/sam4e/source/templates</Value>\r
-      <Value>../src/ASF/sam/utils/fpu</Value>\r
-      <Value>../src/ASF/sam/utils/header_files</Value>\r
-      <Value>../src/ASF/sam/utils/preprocessor</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>\r
-      <Value>../src/config</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include</Value>\r
-      <Value>../src/ASF/sam/components/ethernet_phy/ksz8051mnl</Value>\r
-      <Value>../src/ASF/sam/drivers/gmac</Value>\r
-      <Value>../src/ASF/sam/components/display/aat31xx</Value>\r
-      <Value>../src/ASF/sam/components/display/ili93xx</Value>\r
-      <Value>../src/ASF/sam/drivers/ebi/smc</Value>\r
-    </ListValues>\r
-  </armgcc.assembler.general.IncludePaths>\r
   <armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>\r
   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf</armgcc.preprocessingassembler.general.AssemblerFlags>\r
   <armgcc.preprocessingassembler.general.IncludePaths>\r
index 373d780922895af2f95d8eae027af1ad295f770b..8647077ee7b13d7703396cbc4d48854e522426c6 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H\r
 \r
 #include "../version/ver_fat_sl.h"\r
-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2\r
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2\r
  #error Incompatible FAT_SL version number!\r
 #endif\r
 \r
index bd7823ef1f0d3df2421a7c74419209d3ad655a28..de630faf2c3a299c12fc70c02e321229a90d2670 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
index 373d780922895af2f95d8eae027af1ad295f770b..8647077ee7b13d7703396cbc4d48854e522426c6 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
@@ -38,7 +38,7 @@
 #define _CONFIG_FAT_SL_H\r
 \r
 #include "../version/ver_fat_sl.h"\r
-#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2\r
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2\r
  #error Incompatible FAT_SL version number!\r
 #endif\r
 \r
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 (file)
index 0000000..2f56f93
--- /dev/null
@@ -0,0 +1,62 @@
+/*\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
+ *\r
+ * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
+ * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
+ * the FreeRTOS kernel.  FreeRTOS+FAT SL is licensed separately from FreeRTOS,\r
+ * and uses a different license to FreeRTOS.  FreeRTOS+FAT SL uses a dual\r
+ * license model, information on which is provided below:\r
+ *\r
+ * - Open source licensing -\r
+ * FreeRTOS+FAT SL is a free download and may be used, modified and distributed\r
+ * without charge provided the user adheres to version two of the GNU General\r
+ * Public license (GPL) and does not remove the copyright notice or this text.\r
+ * The GPL V2 text is available on the gnu.org web site, and on the following\r
+ * URL: http://www.FreeRTOS.org/gpl-2.0.txt\r
+ *\r
+ * - Commercial licensing -\r
+ * Businesses and individuals who wish to incorporate FreeRTOS+FAT SL into\r
+ * proprietary software for redistribution in any form must first obtain a\r
+ * commercial license - and in-so-doing support the maintenance, support and\r
+ * further development of the FreeRTOS+FAT SL product.  Commercial licenses can\r
+ * be obtained from http://shop.freertos.org and do not require any source files\r
+ * to be changed.\r
+ *\r
+ * FreeRTOS+FAT SL is distributed in the hope that it will be useful.  You\r
+ * cannot use FreeRTOS+FAT SL unless you agree that you use the software 'as\r
+ * is'.  FreeRTOS+FAT SL is provided WITHOUT ANY WARRANTY; without even the\r
+ * implied warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A\r
+ * PARTICULAR PURPOSE. Real Time Engineers Ltd. and HCC Embedded disclaims all\r
+ * conditions and terms, be they implied, expressed, or statutory.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://www.FreeRTOS.org/FreeRTOS-Plus\r
+ *\r
+ */\r
+\r
+#ifndef _CONFIG_FAT_SL_TEST_H\r
+#define _CONFIG_FAT_SL_TEST_H\r
+\r
+#include "../version/ver_fat_sl.h"\r
+#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2\r
+ #error Incompatible FAT_SL version number!\r
+#endif\r
+\r
+\r
+/*\r
+** Maximum size for seek test.\r
+** Options: 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768\r
+*/\r
+#define F_MAX_SEEK_TEST 16384\r
+\r
+\r
+/*\r
+** Defines media type for testing.\r
+** Options: F_FAT12_MEDIA, F_FAT16_MEDIA, F_FAT32_MEDIA\r
+*/\r
+#define F_FAT_TYPE      F_FAT16_MEDIA\r
+\r
+\r
+#endif /* ifndef _CONFIG_STHIN_TEST_H */\r
+\r
+\r
index eababe5fa2c0980043beb6db7d677e77abc9c8f0..134fedd65e897c8e40cbf0b44d9e90c1fff28075 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded\r
+ * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded\r
  *\r
  * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers\r
  * Ltd. by HCC Embedded for use with FreeRTOS.  It is not, in itself, part of\r
index 4890fde4b359efed5f6995ba9ed308090dcd03ab..141bb1d5d4f66d94aaeb0723d4cab1c506750002 100644 (file)
@@ -1019,8 +1019,8 @@ BaseType_t xMessagePosted;
                /* Clear the bits again. */\r
                uxReturned = xEventGroupClearBitsFromISR( xISREventGroup, uxBitsToSet );\r
 \r
-               /* The returned value should be the value before the bits were cleaed.*/\r
-               if( uxReturned != uxBitsToSet )\r
+               /* Check the message was posted. */\r
+               if( uxReturned != pdPASS )\r
                {\r
                        xISRTestError = pdTRUE;\r
                }\r
index d54af9bd6e15bd5830a63def205006d4e5cafb39..03b185af8c352c95893de7341af5c2abe5faa943 100644 (file)
@@ -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
index b8f28645baf74941ab6143277dc83e51884ed94f..362e2f3b2d62af72a049e83dbef4abeb2f2918c8 100644 (file)
@@ -3,7 +3,7 @@
 /* Device     : RX/RX600/RX64M                                                  */\r
 /* File Name  : iodefine.h                                                      */\r
 /* Abstract   : Definition of I/O Register.                                     */\r
-/* History    : V0.8A  (2014-02-18)  [Hardware Manual Revision : 0.80]          */\r
+/* History    : V0.8C  (2014-03-22)  [Hardware Manual Revision : 0.80]          */\r
 /* Note       : This is a typical example.                                      */\r
 /*                                                                              */\r
 /*  Copyright(c) 2014 Renesas Electronics Corp.                                 */\r
@@ -1768,6 +1768,8 @@ struct st_edmac {
                struct {\r
                        unsigned long :24;\r
                        unsigned long RMAFCE:1;\r
+                       unsigned long :2;\r
+                       unsigned long RRFCE:1;\r
                } BIT;\r
        } TRSCER;\r
        char           wk7[4];\r
@@ -2783,9 +2785,9 @@ struct st_eptpc0 {
                        unsigned long MACL:24;\r
                } BIT;\r
        } SYMACRL;\r
-       char           wk0a[1];\r
+       char           wk1[4];\r
        unsigned long  SYIPADDRR;\r
-       char           wk1[32];\r
+       char           wk2[32];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -2801,7 +2803,7 @@ struct st_eptpc0 {
                        unsigned long DNUM:8;\r
                } BIT;\r
        } SYDOMR;\r
-       char           wk2[8];\r
+       char           wk3[8];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -2899,7 +2901,7 @@ struct st_eptpc0 {
                        unsigned long PNUM:16;\r
                } BIT;\r
        } SYPNUMR;\r
-       char           wk3[20];\r
+       char           wk4[20];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -2909,7 +2911,7 @@ struct st_eptpc0 {
                        unsigned long BMUP:1;\r
                } BIT;\r
        } SYRVLDR;\r
-       char           wk4[12];\r
+       char           wk5[12];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -2955,7 +2957,7 @@ struct st_eptpc0 {
                        unsigned long ANCE:1;\r
                } BIT;\r
        } SYTRENR;\r
-       char           wk5[4];\r
+       char           wk6[4];\r
        unsigned long  MTCIDU;\r
        unsigned long  MTCIDL;\r
        union {\r
@@ -2965,7 +2967,7 @@ struct st_eptpc0 {
                        unsigned long PNUM:16;\r
                } BIT;\r
        } MTPID;\r
-       char           wk6[20];\r
+       char           wk7[20];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -2988,7 +2990,7 @@ struct st_eptpc0 {
        unsigned long  OFMRL;\r
        unsigned long  MPDRU;\r
        unsigned long  MPDRL;\r
-       char           wk7[8];\r
+       char           wk8[8];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3016,7 +3018,7 @@ struct st_eptpc0 {
                        unsigned long SRMV:16;\r
                } BIT;\r
        } SRR;\r
-       char           wk8[8];\r
+       char           wk9[8];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3052,7 +3054,7 @@ struct st_eptpc0 {
                        unsigned long TYPE:16;\r
                } BIT;\r
        } PETYPER;\r
-       char           wk9[12];\r
+       char           wk10[12];\r
        unsigned long  PPIPR;\r
        unsigned long  PDIPR;\r
        union {\r
@@ -3108,7 +3110,7 @@ struct st_eptpc0 {
                        unsigned long SEL:1;\r
                } BIT;\r
        } FFLTR;\r
-       char           wk10[28];\r
+       char           wk11[28];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3137,7 +3139,7 @@ struct st_eptpc0 {
                        unsigned long MACL:24;\r
                } BIT;\r
        } FMAC1RL;\r
-       char           wk11[80];\r
+       char           wk12[80];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3563,6 +3565,7 @@ struct st_exdmac1 {
 };\r
 \r
 struct st_flash {\r
+       char           wk0[2];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3570,7 +3573,7 @@ struct st_flash {
                        unsigned char FLWE:2;\r
                } BIT;\r
        } FWEPROR;\r
-       char           wk0[7806329];\r
+       char           wk1[7806329];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3582,7 +3585,7 @@ struct st_flash {
                        unsigned char ECRCT:1;\r
                } BIT;\r
        } FASTAT;\r
-       char           wk1[3];\r
+       char           wk2[3];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3594,7 +3597,7 @@ struct st_flash {
                        unsigned char ECRCTIE:1;\r
                } BIT;\r
        } FAEINT;\r
-       char           wk2[3];\r
+       char           wk3[3];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3602,7 +3605,7 @@ struct st_flash {
                        unsigned char FRDYIE:1;\r
                } BIT;\r
        } FRDYIE;\r
-       char           wk3[23];\r
+       char           wk4[23];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3615,7 +3618,7 @@ struct st_flash {
                        unsigned long FEADDR:32;\r
                } BIT;\r
        } FEADDR;\r
-       char           wk4[28];\r
+       char           wk5[28];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3625,7 +3628,7 @@ struct st_flash {
                        unsigned short FCRME:1;\r
                } BIT;\r
        } FCURAME;\r
-       char           wk5[42];\r
+       char           wk6[42];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3654,7 +3657,7 @@ struct st_flash {
                        unsigned short FENTRYC:1;\r
                } BIT;\r
        } FENTRYR;\r
-       char           wk6[2];\r
+       char           wk7[2];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3663,7 +3666,7 @@ struct st_flash {
                        unsigned short FPROTCN:1;\r
                } BIT;\r
        } FPROTR;\r
-       char           wk7[2];\r
+       char           wk8[2];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3672,7 +3675,7 @@ struct st_flash {
                        unsigned short SUINIT:1;\r
                } BIT;\r
        } FSUINITR;\r
-       char           wk8[2];\r
+       char           wk9[2];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3680,7 +3683,7 @@ struct st_flash {
                        unsigned char FLOCKST:1;\r
                } BIT;\r
        } FLKSTAT;\r
-       char           wk9[15];\r
+       char           wk10[15];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3688,7 +3691,7 @@ struct st_flash {
                        unsigned short PCMDR:8;\r
                } BIT;\r
        } FCMDR;\r
-       char           wk10[30];\r
+       char           wk11[30];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3696,7 +3699,7 @@ struct st_flash {
                        unsigned short PEERRST:8;\r
                } BIT;\r
        } FPESTAT;\r
-       char           wk11[14];\r
+       char           wk12[14];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3704,7 +3707,7 @@ struct st_flash {
                        unsigned char BCDIR:1;\r
                } BIT;\r
        } FBCCNT;\r
-       char           wk12[3];\r
+       char           wk13[3];\r
        union {\r
                unsigned char BYTE;\r
                struct {\r
@@ -3712,7 +3715,7 @@ struct st_flash {
                        unsigned char BCST:1;\r
                } BIT;\r
        } FBCSTAT;\r
-       char           wk13[3];\r
+       char           wk14[3];\r
        union {\r
                unsigned long LONG;\r
                struct {\r
@@ -3720,7 +3723,7 @@ struct st_flash {
                        unsigned long PSADR:19;\r
                } BIT;\r
        } FPSADDR;\r
-       char           wk14[4];\r
+       char           wk15[4];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -3728,7 +3731,7 @@ struct st_flash {
                        unsigned short ESUSPMD:1;\r
                } BIT;\r
        } FCPSR;\r
-       char           wk15[2];\r
+       char           wk16[2];\r
        union {\r
                unsigned short WORD;\r
                struct {\r
@@ -17396,7 +17399,7 @@ IPR_PERIA_INTA253=253,IPR_PERIA_INTA254=254,IPR_PERIA_INTA255=255
 #define        EXDMAC          (*(volatile struct st_exdmac   __evenaccess *)0x82A00)\r
 #define        EXDMAC0         (*(volatile struct st_exdmac0  __evenaccess *)0x82800)\r
 #define        EXDMAC1         (*(volatile struct st_exdmac1  __evenaccess *)0x82840)\r
-#define        FLASH           (*(volatile struct st_flash    __evenaccess *)0x8C296)\r
+#define        FLASH           (*(volatile struct st_flash    __evenaccess *)0x8C294)\r
 #define        GPT                     (*(volatile struct st_gpt      __evenaccess *)0xC2000)\r
 #define        GPT0            (*(volatile struct st_gpt0     __evenaccess *)0xC2100)\r
 #define        GPT1            (*(volatile struct st_gpt0     __evenaccess *)0xC2180)\r