Update to latest IAR version.

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

diff --git a/Demo/ARM7_STR71x_IAR/RTOSDemo.ewd b/Demo/ARM7_STR71x_IAR/RTOSDemo.ewd
index 55ff7b44e868641516458a03556e9fb79efd3ea0..84e989fbbf42893c3d533f02104bda5cb64beb5d 100644 (file)
--- a/Demo/ARM7_STR71x_IAR/RTOSDemo.ewd
+++ b/Demo/ARM7_STR71x_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>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>,,,0x40000000,(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>$PROJ_DIR$\RTOSDemo_Debug.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>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
   <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
@@ -654,7 +731,7 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\iostr712.ddf</state>\r
+          <state>$TOOLKIT_DIR$\config\debugger\ST\iostr712.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\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>,,,0x40000000,(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\ST\FlashSTR71xF.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>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>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_STR71x_IAR/RTOSDemo.ewp b/Demo/ARM7_STR71x_IAR/RTOSDemo.ewp
index 4364c7b18d5b26706cd4a7211dbbee01171fcf03..385f101c74147553107c67a04ab8b89b9594aeae 100644 (file)
--- a/Demo/ARM7_STR71x_IAR/RTOSDemo.ewp
+++ b/Demo/ARM7_STR71x_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>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
@@ -309,6 +317,16 @@
           <name>CCOptLevelSlave</name>\r
           <state>2</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
@@ -486,7 +504,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
@@ -532,7 +550,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
@@ -675,10 +693,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
@@ -738,6 +752,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
@@ -777,7 +803,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
@@ -794,7 +820,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
@@ -858,11 +884,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
@@ -887,13 +908,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
@@ -1026,11 +1065,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
@@ -1075,6 +1109,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
@@ -1252,7 +1296,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
@@ -1298,7 +1342,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
@@ -1441,10 +1485,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
@@ -1504,6 +1544,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_STR71x_IAR/settings/RTOSDemo.dni b/Demo/ARM7_STR71x_IAR/settings/RTOSDemo.dni
index 3062e860fa12a36a7a5760da2a09ca40df0b19cd..a8cb8cc9e5c1c599fbb670dfad50acb8cda441d9 100644 (file)
--- a/Demo/ARM7_STR71x_IAR/settings/RTOSDemo.dni
+++ b/Demo/ARM7_STR71x_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_STR71x_IAR/settings/RTOSDemo.wsdt b/Demo/ARM7_STR71x_IAR/settings/RTOSDemo.wsdt
index f34de69b68dacc52addd69f3513acce930a93262..adffcdb557cedcd3867270f5a570708894c08ec0 100644 (file)
--- a/Demo/ARM7_STR71x_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/ARM7_STR71x_IAR/settings/RTOSDemo.wsdt
@@ -12,7 +12,7 @@
           \r
           \r
           \r
-        <Column0>189</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>242</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Build>\r
         \r
@@ -22,12 +22,12 @@
       <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1153</ColumnWidth1><ColumnWidth2>307</ColumnWidth2><ColumnWidth3>76</ColumnWidth3></Build>\r
       <TerminalIO/>\r
       <Profiling/>\r
-      <Debug-Log/>\r
+      <Debug-Log><ColumnWidth0>18</ColumnWidth0><ColumnWidth1>1624</ColumnWidth1></Debug-Log>\r
     <CodeCoveragePlugin/><Breakpoints/><Disassembly><MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow></Disassembly></Static>\r
     <Windows>\r
       \r
       \r
-    <Wnd3>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-14962-21036</Identity>\r
@@ -35,11 +35,11 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/source</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode><ExpandedNode>RTOSDemo/source</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd3><Wnd4>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-24623-22493</Identity>\r
@@ -55,20 +55,20 @@
           </Tab>\r
         <Tab><Identity>TabID-25855-25419</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory><Session/></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd4></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\ARM7_STR71x_IAR\main.c</Filename><XPos>0</XPos><YPos>104</YPos><SelStart>4900</SelStart><SelEnd>4900</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_STR71x_IAR\main.c</Filename><XPos>0</XPos><YPos>54</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-01284260><key>iaridepm.enu1</key></Toolbar-01284260></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>590</Bottom><Right>263</Right><x>-2</x><y>-2</y><xscreen>18</xscreen><yscreen>18</yscreen><sizeHorzCX>12857</sizeHorzCX><sizeHorzCY>18330</sizeHorzCY><sizeVertCX>189286</sizeVertCX><sizeVertCY>602851</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>348</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>350</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>356415</sizeHorzCY><sizeVertCX>12857</sizeVertCX><sizeVertCY>18330</sizeVertCY></Rect></Wnd4></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>590</Bottom><Right>316</Right><x>-2</x><y>-2</y><xscreen>22</xscreen><yscreen>18</yscreen><sizeHorzCX>13095</sizeHorzCX><sizeHorzCY>18330</sizeHorzCY><sizeVertCX>189286</sizeVertCX><sizeVertCY>602851</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>348</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>350</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>356415</sizeHorzCY><sizeVertCX>13095</sizeVertCX><sizeVertCY>18330</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r