Test with latest IAR and Keil versions.

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

diff --git a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd
index e752201768af35562b69d79beffa3c58cb1bb6d5..512b4c3f5965a8d3905ed41617cc854bd6f3394a 100644 (file)
--- a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd
+++ b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>\r
 \r
 <project>\r
-  <fileVersion>1</fileVersion>\r
+  <fileVersion>2</fileVersion>\r
   <configuration>\r
     <name>Flash Debug</name>\r
     <toolchain>\r
@@ -12,7 +12,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>15</version>\r
+        <version>21</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -89,16 +89,12 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>5.11.0.50615</state>\r
+          <state>5.40.0.51529</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>1</state>\r
@@ -111,6 +107,46 @@
           <name>OCBE8Slave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>MacFile2</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CDevice</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>FlashLoadersV3</name>\r
+          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC256k.board</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck1</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath1</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck2</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath2</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck3</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath3</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OverrideDefFlashBoard</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -257,7 +293,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>9</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -370,13 +406,17 @@
           <version>0</version>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>LMIFTDI_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>1</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -395,13 +435,21 @@
           <name>CCLmiftdiLogFile</name>\r
           <state>$TOOLKIT_DIR$\cspycomm.log</state>\r
         </option>\r
+        <option>\r
+          <name>CCLmiFtdiInterfaceRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCLmiFtdiInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>MACRAIGOR_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
@@ -476,6 +524,14 @@
           <name>CCJTagUpdateBreakpoints</name>\r
           <state>main</state>\r
         </option>\r
+        <option>\r
+          <name>CCMacraigorInterfaceRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCMacraigorInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -539,6 +595,19 @@
         </option>\r
       </data>\r
     </settings>\r
+    <settings>\r
+      <name>STLINK_ID</name>\r
+      <archiveVersion>2</archiveVersion>\r
+      <data>\r
+        <version>0</version>\r
+        <wantNonLocal>1</wantNonLocal>\r
+        <debug>1</debug>\r
+        <option>\r
+          <name>OCDriverInfo</name>\r
+          <state>1</state>\r
+        </option>\r
+      </data>\r
+    </settings>\r
     <settings>\r
       <name>THIRDPARTY_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
@@ -566,11 +635,11 @@
     </settings>\r
     <debuggerPlugins>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -586,7 +655,11 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.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\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -609,6 +682,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
+      <plugin>\r
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>\r
+        <loadFlag>1</loadFlag>\r
+      </plugin>\r
     </debuggerPlugins>\r
   </configuration>\r
   <configuration>\r
@@ -621,7 +698,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>15</version>\r
+        <version>21</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -704,10 +781,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>1</state>\r
@@ -720,6 +793,46 @@
           <name>OCBE8Slave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>MacFile2</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CDevice</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>FlashLoadersV3</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck1</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath1</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck2</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath2</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesSuppressCheck3</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCImagesPath3</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OverrideDefFlashBoard</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -866,7 +979,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>9</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -979,13 +1092,17 @@
           <version>0</version>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>LMIFTDI_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>1</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -1004,13 +1121,21 @@
           <name>CCLmiftdiLogFile</name>\r
           <state>$TOOLKIT_DIR$\cspycomm.log</state>\r
         </option>\r
+        <option>\r
+          <name>CCLmiFtdiInterfaceRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCLmiFtdiInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>MACRAIGOR_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>2</version>\r
+        <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -1085,6 +1210,14 @@
           <name>CCJTagUpdateBreakpoints</name>\r
           <state>main</state>\r
         </option>\r
+        <option>\r
+          <name>CCMacraigorInterfaceRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCMacraigorInterfaceCmdLine</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1148,6 +1281,19 @@
         </option>\r
       </data>\r
     </settings>\r
+    <settings>\r
+      <name>STLINK_ID</name>\r
+      <archiveVersion>2</archiveVersion>\r
+      <data>\r
+        <version>0</version>\r
+        <wantNonLocal>1</wantNonLocal>\r
+        <debug>0</debug>\r
+        <option>\r
+          <name>OCDriverInfo</name>\r
+          <state>1</state>\r
+        </option>\r
+      </data>\r
+    </settings>\r
     <settings>\r
       <name>THIRDPARTY_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
@@ -1175,11 +1321,11 @@
     </settings>\r
     <debuggerPlugins>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -1195,7 +1341,11 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.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\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -1218,6 +1368,10 @@
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>\r
         <loadFlag>1</loadFlag>\r
       </plugin>\r
+      <plugin>\r
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>\r
+        <loadFlag>1</loadFlag>\r
+      </plugin>\r
     </debuggerPlugins>\r
   </configuration>\r
 </project>\r

diff --git a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp
index ae58590e16637b86c7207e74df95d623c8cc9993..7933cf5216ea701a260df2995d78e5e773160096 100644 (file)
--- a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp
+++ b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>\r
 \r
 <project>\r
-  <fileVersion>1</fileVersion>\r
+  <fileVersion>2</fileVersion>\r
   <configuration>\r
     <name>Flash Debug</name>\r
     <toolchain>\r
@@ -12,7 +12,7 @@
       <name>General</name>\r
       <archiveVersion>3</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>17</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -29,7 +29,7 @@
         </option>\r
         <option>\r
           <name>Variant</name>\r
-          <version>7</version>\r
+          <version>11</version>\r
           <state>1</state>\r
         </option>\r
         <option>\r
@@ -93,11 +93,6 @@
           <name>OGLastSavedByProductVersion</name>\r
           <state>5.11.0.50615</state>\r
         </option>\r
-        <option>\r
-          <name>GeneralMisraRules</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
           <state>0</state>\r
@@ -122,13 +117,31 @@
           <name>OGBufferedTerminalOutput</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>GenStdoutInterface</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraRules98</name>\r
+          <version>0</version>\r
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraVer</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraRules04</name>\r
+          <version>0</version>\r
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>19</version>\r
+        <version>21</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -260,11 +273,6 @@
           <name>PreInclude</name>\r
           <state></state>\r
         </option>\r
-        <option>\r
-          <name>CompilerMisraRules</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
         <option>\r
           <name>CompilerMisraOverride</name>\r
           <state>0</state>\r
@@ -310,6 +318,16 @@
           <name>CCOptLevelSlave</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CompilerMisraRules98</name>\r
+          <version>0</version>\r
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
+        </option>\r
+        <option>\r
+          <name>CompilerMisraRules04</name>\r
+          <version>0</version>\r
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -492,7 +510,7 @@
         <debug>1</debug>\r
         <option>\r
           <name>OOCOutputFormat</name>\r
-          <version>1</version>\r
+          <version>2</version>\r
           <state>0</state>\r
         </option>\r
         <option>\r
@@ -538,7 +556,7 @@
       <name>ILINK</name>\r
       <archiveVersion>0</archiveVersion>\r
       <data>\r
-        <version>5</version>\r
+        <version>8</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -681,10 +699,6 @@
           <name>IlinkProgramEntryLabel</name>\r
           <state>__iar_program_start</state>\r
         </option>\r
-        <option>\r
-          <name>IlinkNXPLPCChecksum</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>DoFill</name>\r
           <state>0</state>\r
@@ -744,6 +758,18 @@
           <name>IlinkBufferedTerminalOutput</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>IlinkStdoutInterfaceSlave</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>CrcFullSize</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>IlinkIElfToolPostProcess</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -783,7 +809,7 @@
       <name>General</name>\r
       <archiveVersion>3</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>17</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -800,7 +826,7 @@
         </option>\r
         <option>\r
           <name>Variant</name>\r
-          <version>7</version>\r
+          <version>11</version>\r
           <state>1</state>\r
         </option>\r
         <option>\r
@@ -864,11 +890,6 @@
           <name>OGLastSavedByProductVersion</name>\r
           <state>5.11.0.50615</state>\r
         </option>\r
-        <option>\r
-          <name>GeneralMisraRules</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
           <state>0</state>\r
@@ -893,13 +914,31 @@
           <name>OGBufferedTerminalOutput</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>GenStdoutInterface</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraRules98</name>\r
+          <version>0</version>\r
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraVer</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>GeneralMisraRules04</name>\r
+          <version>0</version>\r
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>19</version>\r
+        <version>21</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -1031,11 +1070,6 @@
           <name>PreInclude</name>\r
           <state></state>\r
         </option>\r
-        <option>\r
-          <name>CompilerMisraRules</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
         <option>\r
           <name>CompilerMisraOverride</name>\r
           <state>0</state>\r
@@ -1081,6 +1115,16 @@
           <name>CCOptLevelSlave</name>\r
           <state>3</state>\r
         </option>\r
+        <option>\r
+          <name>CompilerMisraRules98</name>\r
+          <version>0</version>\r
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
+        </option>\r
+        <option>\r
+          <name>CompilerMisraRules04</name>\r
+          <version>0</version>\r
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1263,7 +1307,7 @@
         <debug>0</debug>\r
         <option>\r
           <name>OOCOutputFormat</name>\r
-          <version>1</version>\r
+          <version>2</version>\r
           <state>0</state>\r
         </option>\r
         <option>\r
@@ -1309,7 +1353,7 @@
       <name>ILINK</name>\r
       <archiveVersion>0</archiveVersion>\r
       <data>\r
-        <version>5</version>\r
+        <version>8</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>0</debug>\r
         <option>\r
@@ -1452,10 +1496,6 @@
           <name>IlinkProgramEntryLabel</name>\r
           <state>__iar_program_start</state>\r
         </option>\r
-        <option>\r
-          <name>IlinkNXPLPCChecksum</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>DoFill</name>\r
           <state>0</state>\r
@@ -1515,6 +1555,18 @@
           <name>IlinkBufferedTerminalOutput</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>IlinkStdoutInterfaceSlave</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>CrcFullSize</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>IlinkIElfToolPostProcess</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r

diff --git a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni
index e14d726943f0af20391a2fcd4ea29a97a9768c50..51bf4f659f71af96ea6305260ae6e872ad0d9b0c 100644 (file)
--- a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni
+++ b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni
@@ -37,10 +37,10 @@ Category=_ 0
 [TermIOLog]\r
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
+[TraceHelper]\r
+Enabled=0\r
+ShowSource=1\r
 [Disassemble mode]\r
 mode=0\r
 [Breakpoints]\r
 Count=0\r
-[TraceHelper]\r
-Enabled=0\r
-ShowSource=1\r

diff --git a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt
index 63524ec48a1a095a535b9a898a08937f0ddfead7..c12807ed2725b20bca2517eae9eb5886cd7617ed 100644 (file)
--- a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt
@@ -11,7 +11,7 @@
           \r
           \r
           \r
-        <Column0>191</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>244</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Build><ColumnWidth0>18</ColumnWidth0><ColumnWidth1>1155</ColumnWidth1><ColumnWidth2>308</ColumnWidth2><ColumnWidth3>77</ColumnWidth3></Build>\r
       <Debug-Log/>\r
@@ -28,7 +28,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd0>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-17425-14382</Identity>\r
@@ -40,20 +40,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-22109-27077</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-12074-10873</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory><Session/></Tab><Tab><Identity>TabID-18349-15872</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-30013-18825</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-22109-27077</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-12074-10873</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory><Session/></Tab><Tab><Identity>TabID-18349-15872</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-30013-18825</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\temp\rc\1\Demo\ARM7_LPC2129_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><ActiveTab>0</ActiveTab></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>C:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_LPC2129_IAR\main.c</Filename><XPos>0</XPos><YPos>57</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><ActiveTab>0</ActiveTab></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-01284348><key>iaridepm.enu1</key></Toolbar-01284348></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>605</Bottom><Right>265</Right><x>-2</x><y>-2</y><xscreen>0</xscreen><yscreen>0</yscreen><sizeHorzCX>0</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>190714</sizeVertCX><sizeVertCY>618126</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>333</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>335</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>341141</sizeHorzCY><sizeVertCX>55000</sizeVertCX><sizeVertCY>78411</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00abae00><key>iaridepm.enu1</key></Toolbar-00abae00></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>605</Bottom><Right>318</Right><x>-2</x><y>-2</y><xscreen>0</xscreen><yscreen>0</yscreen><sizeHorzCX>0</sizeHorzCX><sizeHorzCY>0</sizeHorzCY><sizeVertCX>190476</sizeVertCX><sizeVertCY>618126</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>333</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>335</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>341141</sizeHorzCY><sizeVertCX>54762</sizeVertCX><sizeVertCY>78411</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
index 3860e3a40e87acd38c19c6b651f5809fde14f041..8e0aa4564faa6e84076318489afb67f56ef70cbd 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -13,18 +13,18 @@
 Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'\r
 Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'\r
 GRPOPT 1,(Other),1,0,0\r
-GRPOPT 2,(FreeRTOS),1,0,0\r
+GRPOPT 2,(FreeRTOS),0,0,0\r
 GRPOPT 3,(Stadard Demo),0,0,0\r
 \r
 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s><Startup.s> \r
 OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
-OPTFFF 1,3,1,2,0,1,1,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 }\r
+OPTFFF 1,3,1,2,0,55,55,0,<.\main.c><main.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 }\r
 OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> \r
 OPTFFF 1,5,2,0,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \r
 OPTFFF 2,6,1,301989888,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
 OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
 OPTFFF 2,8,1,754974720,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
-OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> \r
+OPTFFF 2,9,1,50331648,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> \r
 OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
 OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> \r
 OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> \r