Test with latest IAR version.

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

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd
index de6ec3f628cb8c7f98c9e532661932543f156ad0..0512e23af29bd967ca29c5c76c7043771a1f20cb 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd
+++ b/Demo/ARM7_AT91SAM7S64_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
@@ -95,10 +95,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
@@ -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></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>5</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>1</debug>\r
         <option>\r
@@ -698,16 +775,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
@@ -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>$TOOLKIT_DIR$\config\flashloader\Atmel\AT91SAM7S64-EK\at91sam7s64-flash.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
@@ -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>1</debug>\r
         <option>\r
@@ -979,13 +1092,17 @@
           <version>0</version>\r
           <state>5</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
@@ -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>1</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>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
@@ -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>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
 </project>\r

diff --git a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp
index 0b69546f99e514811b22f601ab18ec384b247848..3dca32589920b3b5ef5d9c468ab1e40bd78968f5 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp
+++ b/Demo/ARM7_AT91SAM7S64_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>0</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
@@ -491,7 +509,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
@@ -537,7 +555,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
@@ -680,10 +698,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
@@ -743,6 +757,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
@@ -782,7 +808,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
@@ -799,7 +825,7 @@
         </option>\r
         <option>\r
           <name>Variant</name>\r
-          <version>7</version>\r
+          <version>11</version>\r
           <state>0</state>\r
         </option>\r
         <option>\r
@@ -863,11 +889,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
@@ -892,13 +913,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
@@ -1030,11 +1069,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
@@ -1080,6 +1114,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
@@ -1260,7 +1304,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
@@ -1306,7 +1350,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
@@ -1449,10 +1493,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
@@ -1512,6 +1552,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_AT91SAM7S64_IAR/settings/rtosdemo.dni b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
index 78681fc3a6240a4dd927810dab3cbda5cb69982c..63a3b21beb2a5dfc5d7cd14796745f9cbfbed401 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
+++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni
@@ -30,10 +30,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_AT91SAM7S64_IAR/settings/rtosdemo.wsdt b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
index ca9ef47b334361276b1e33a8f55abbfd0f635cee..c99a29af06219e25411e13d4c0167e15b90fe77a 100644 (file)
--- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt
@@ -36,7 +36,7 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/Demo Source</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
@@ -62,14 +62,14 @@
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\ARM7_AT91SAM7S64_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_AT91SAM7S64_IAR\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>880</SelStart><SelEnd>880</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-01284260><key>iaridepm.enu1</key></Toolbar-01284260></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>576</Bottom><Right>310</Right><x>-2</x><y>-2</y><xscreen>32</xscreen><yscreen>26</yscreen><sizeHorzCX>19048</sizeHorzCX><sizeHorzCY>26477</sizeHorzCY><sizeVertCX>185714</sizeVertCX><sizeVertCY>588595</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>362</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>364</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>370672</sizeHorzCY><sizeVertCX>19048</sizeVertCX><sizeVertCY>26477</sizeVertCY></Rect></Wnd3></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>576</Bottom><Right>310</Right><x>-2</x><y>-2</y><xscreen>32</xscreen><yscreen>26</yscreen><sizeHorzCX>19048</sizeHorzCX><sizeHorzCY>26477</sizeHorzCY><sizeVertCX>185714</sizeVertCX><sizeVertCY>588595</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>362</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>364</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>370672</sizeHorzCY><sizeVertCX>19048</sizeVertCX><sizeVertCY>26477</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r