Minor updates.

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

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
index 8a5c6d6c122215b462b09a1a477d3282db05596a..80ac9a8d5e4b2af03f70e5be4c45a2904751ad41 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
@@ -49,6 +49,9 @@
 \r
 #include "FreeRTOS.h"\r
 #include "partest.h"\r
+#include "led.h"\r
+\r
+#define partstNUM_LEDS                 ( 4 )\r
 \r
 /*-----------------------------------------------------------\r
  * Simple parallel port IO routines for the LED's.\r
@@ -56,19 +59,37 @@
 \r
 void vParTestInitialise( void )\r
 {      \r
-    LED_Configure( 0 );\r
-    LED_Configure( 1 );\r
+unsigned long ul;\r
+\r
+       for( ul = 0; ul < partstNUM_LEDS; ul++ )\r
+       {\r
+               LED_Configure( ul );\r
+       }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )\r
 {\r
+       if( uxLED < partstNUM_LEDS )\r
+       {\r
+               if( xValue == 0 )\r
+               {\r
+                       LED_Clear( uxLED );\r
+               }\r
+               else\r
+               {\r
+                       LED_Set( uxLED );\r
+               }\r
+       }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 void vParTestToggleLED( unsigned portBASE_TYPE uxLED )\r
 {\r
-    LED_Toggle(1);\r
+       if( uxLED < partstNUM_LEDS )\r
+       {\r
+       LED_Toggle( uxLED );\r
+       }\r
 }\r
 \r
 \r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
index 5fde1283a474b6e65718c93b3e3bf7f5865f8d23..1f004b52aaad21e7032ae5b6bc4a65fc80617b71 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewd
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.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>at91sam9xe128_flash</name>\r
     <toolchain>\r
@@ -12,7 +12,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</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>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>1</state>\r
@@ -107,6 +103,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -253,7 +265,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -304,14 +316,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -369,6 +373,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -400,7 +413,7 @@
       <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
@@ -475,6 +488,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
@@ -565,11 +586,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
@@ -585,7 +606,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -604,6 +629,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
@@ -616,7 +645,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -699,10 +728,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -711,6 +736,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -857,7 +898,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -908,14 +949,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -973,6 +1006,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -1004,7 +1046,7 @@
       <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
@@ -1079,6 +1121,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
@@ -1169,11 +1219,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
@@ -1189,7 +1239,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -1208,6 +1262,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
@@ -1220,7 +1278,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1303,10 +1361,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -1315,6 +1369,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1461,7 +1531,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1512,14 +1582,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -1577,6 +1639,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -1608,7 +1679,7 @@
       <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
@@ -1683,6 +1754,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
@@ -1773,11 +1852,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
@@ -1793,7 +1872,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -1812,6 +1895,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
@@ -1824,7 +1911,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1857,7 +1944,7 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe256.ddf</state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE256.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\r
@@ -1901,16 +1988,12 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>5.10.5.376</state>\r
+          <state>5.20.0.50986</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>1</state>\r
@@ -1919,6 +2002,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -2065,7 +2164,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2116,14 +2215,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -2181,6 +2272,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -2212,7 +2312,7 @@
       <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
@@ -2287,6 +2387,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
@@ -2377,11 +2485,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
@@ -2397,7 +2505,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -2416,6 +2528,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
@@ -2428,7 +2544,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2511,10 +2627,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -2523,6 +2635,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -2669,7 +2797,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2720,14 +2848,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -2785,6 +2905,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -2816,7 +2945,7 @@
       <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
@@ -2891,6 +3020,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
@@ -2981,11 +3118,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
@@ -3001,7 +3138,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -3020,6 +3161,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
@@ -3032,7 +3177,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -3115,10 +3260,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -3127,6 +3268,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -3273,7 +3430,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -3324,14 +3481,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -3389,6 +3538,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -3420,7 +3578,7 @@
       <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
@@ -3495,6 +3653,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
@@ -3585,11 +3751,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
@@ -3605,7 +3771,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -3624,6 +3794,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
@@ -3636,7 +3810,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -3669,11 +3843,11 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioat91sam9xe512.ddf</state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>RunToName</name>\r
@@ -3701,7 +3875,7 @@
         </option>\r
         <option>\r
           <name>OCDownloadVerifyAll</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>OCProductVersion</name>\r
@@ -3713,16 +3887,12 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>5.10.5.376</state>\r
+          <state>5.20.0.50986</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>1</state>\r
@@ -3731,6 +3901,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -3877,7 +4063,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -3928,17 +4114,9 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
-          <state>2</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>CCUSBDevice</name>\r
@@ -3993,6 +4171,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -4024,7 +4211,7 @@
       <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
@@ -4099,6 +4286,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
@@ -4189,11 +4384,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
@@ -4209,7 +4404,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -4228,6 +4427,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
@@ -4240,7 +4443,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -4323,10 +4526,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -4335,6 +4534,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -4481,7 +4696,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -4532,14 +4747,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -4597,6 +4804,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -4628,7 +4844,7 @@
       <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
@@ -4703,6 +4919,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
@@ -4793,11 +5017,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
@@ -4813,7 +5037,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -4832,6 +5060,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
@@ -4844,7 +5076,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>14</version>\r
+        <version>18</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -4927,10 +5159,6 @@
           <name>OCDownloadAttachToProgram</name>\r
           <state>0</state>\r
         </option>\r
-        <option>\r
-          <name>FlashLoaders</name>\r
-          <state>,,,0x200000,(default),</state>\r
-        </option>\r
         <option>\r
           <name>UseFlashLoader</name>\r
           <state>0</state>\r
@@ -4939,6 +5167,22 @@
           <name>CLowLevel</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <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>FlashLoadersV2</name>\r
+          <state>,,,0x200000,(default),</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -5085,7 +5329,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>8</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -5136,14 +5380,6 @@
           <name>CCJLinkTCPIP</name>\r
           <state>aaa.bbb.ccc.ddd</state>\r
         </option>\r
-        <option>\r
-          <name>CCJLinkResetRadio</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CCJLinkResetInitSeq</name>\r
-          <state>0</state>\r
-        </option>\r
         <option>\r
           <name>CCJLinkSpeedRadioV2</name>\r
           <state>2</state>\r
@@ -5201,6 +5437,15 @@
           <name>OCJLinkAttachSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>CCJLinkResetList</name>\r
+          <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
@@ -5232,7 +5477,7 @@
       <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
@@ -5307,6 +5552,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
@@ -5397,11 +5650,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
@@ -5417,7 +5670,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-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -5436,6 +5693,12 @@
         <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
+\r
+\r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
index cf83975d9308d8d9ce028f3e309a4bf12e5a6d25..439c35532025f66906ea7f6b31fda20fae15e446 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/at91sam9xe-ek.ewp
@@ -4728,7 +4728,7 @@
         <option>\r
           <name>Variant</name>\r
           <version>8</version>\r
-          <state>0</state>\r
+          <state>11</state>\r
         </option>\r
         <option>\r
           <name>GEndianMode</name>\r
@@ -4750,7 +4750,7 @@
         </option>\r
         <option>\r
           <name>Output description</name>\r
-          <state>No specifier a, A, no specifier n, no float nor long long, no flags.</state>\r
+          <state>No specifier a, A, no specifier n, no float nor long long.</state>\r
         </option>\r
         <option>\r
           <name>GOutputBinary</name>\r
@@ -4789,7 +4789,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>5.10.0.213</state>\r
+          <state>5.20.0.50986</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
@@ -4877,7 +4877,7 @@
         </option>\r
         <option>\r
           <name>CCDiagSuppress</name>\r
-          <state>Pe826,Pe1375</state>\r
+          <state>Pa082</state>\r
         </option>\r
         <option>\r
           <name>CCDiagRemark</name>\r
@@ -4974,6 +4974,7 @@
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek</state>\r
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\peripherals</state>\r
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\components</state>\r
+          <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\utility</state>\r
           <state>$PROJ_DIR$\..\..\Common\drivers\Atmel\at91lib\usb</state>\r
           <state>$PROJ_DIR$\..\..\..\Source\include</state>\r
           <state>$PROJ_DIR$\..</state>\r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
index 7069dbf22a39e0c472fe32e4c975bd41aac6ca3c..4784cbeee8b5f0182aa228eaf17d1ebdb18fd22a 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.cspy.bat
@@ -22,7 +22,7 @@
 @REM but they are listed at the end of this file for reference.\r
 \r
 \r
-"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE256.ddf" "--semihosting" "--device=AT91SAM9XE256" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=adaptive" "--drv_catch_exceptions=0x000" \r
+"C:\Devtools\IAR Systems\Embedded Workbench 5.0\common\bin\cspybat" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armproc.dll" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\armjlink.dll"  %1 --plugin "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\bin\<libsupport_plugin>" --macro "C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ewp\..\..\..\resources\at91sam9xe-ek-flash.mac" --backend -B "--endian=little" "--cpu=ARM926EJ-S" "--fpu=None" "-p" "C:\Devtools\IAR Systems\Embedded Workbench 5.0\ARM\CONFIG\debugger\Atmel\ioAT91SAM9XE512.ddf" "--drv_verify_download" "--semihosting" "--device=AT91SAM9XE512" "-d" "jlink" "--drv_communication=USB0" "--jlink_speed=auto" "--jlink_initial_speed=32" "--drv_catch_exceptions=0x000" "--jlink_reset_strategy=50,0" \r
 \r
 \r
 @REM Loaded plugins:\r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
index 33f4649c2fb58883d41d78e8c74bb702f144a54a..22d6b995e1d99bf51f360dfabc2c350f976308f1 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dbgdt
@@ -1,5 +1,214 @@
 <?xml version="1.0" encoding="iso-8859-1"?>\r
 \r
-<Project/>\r
+<Project>\r
+  <Desktop>\r
+    <Static>\r
+      <Debug-Log/>\r
+      <Build>\r
+        <ColumnWidth0>20</ColumnWidth0>\r
+        <ColumnWidth1>1216</ColumnWidth1>\r
+        <ColumnWidth2>324</ColumnWidth2>\r
+        <ColumnWidth3>81</ColumnWidth3>\r
+      </Build>\r
+      <Workspace>\r
+        <ColumnWidths>\r
+          <Column0>124</Column0>\r
+          <Column1>27</Column1>\r
+          <Column2>27</Column2>\r
+          <Column3>27</Column3>\r
+        </ColumnWidths>\r
+      </Workspace>\r
+      <Disassembly>\r
+        <MixedMode>1</MixedMode>\r
+        <CodeCovShow>0</CodeCovShow>\r
+      </Disassembly>\r
+    </Static>\r
+    <Windows>\r
+      <Wnd3>\r
+        <Tabs>\r
+          <Tab>\r
+            <Identity>TabID-27883-8575</Identity>\r
+            <TabName>Debug Log</TabName>\r
+            <Factory>Debug-Log</Factory>\r
+            <Session/>\r
+          </Tab>\r
+          <Tab>\r
+            <Identity>TabID-24747-8634</Identity>\r
+            <TabName>Build</TabName>\r
+            <Factory>Build</Factory>\r
+            <Session/>\r
+          </Tab>\r
+        </Tabs>\r
+        <SelectedTab>0</SelectedTab>\r
+      </Wnd3>\r
+      <Wnd4>\r
+        <Tabs>\r
+          <Tab>\r
+            <Identity>TabID-5864-8578</Identity>\r
+            <TabName>Workspace</TabName>\r
+            <Factory>Workspace</Factory>\r
+            <Session>\r
+              <NodeDict>\r
+                <ExpandedNode>at91sam9xe-ek</ExpandedNode>\r
+              </NodeDict>\r
+            </Session>\r
+          </Tab>\r
+        </Tabs>\r
+        <SelectedTab>0</SelectedTab>\r
+      </Wnd4>\r
+      <Wnd5>\r
+        <Tabs>\r
+          <Tab>\r
+            <Identity>TabID-16612-8582</Identity>\r
+            <TabName>Disassembly</TabName>\r
+            <Factory>Disassembly</Factory>\r
+            <Session/>\r
+          </Tab>\r
+        </Tabs>\r
+        <SelectedTab>0</SelectedTab>\r
+      </Wnd5>\r
+    </Windows>\r
+    <Editor>\r
+      <Pane>\r
+        <Tab>\r
+          <Factory>TextEditor</Factory>\r
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename>\r
+          <XPos>0</XPos>\r
+          <YPos>125</YPos>\r
+          <SelStart>4609</SelStart>\r
+          <SelEnd>4609</SelEnd>\r
+        </Tab>\r
+        <Tab>\r
+          <Factory>TextEditor</Factory>\r
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename>\r
+          <XPos>0</XPos>\r
+          <YPos>178</YPos>\r
+          <SelStart>7138</SelStart>\r
+          <SelEnd>7138</SelEnd>\r
+        </Tab>\r
+        <Tab>\r
+          <Factory>TextEditor</Factory>\r
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename>\r
+          <XPos>0</XPos>\r
+          <YPos>17</YPos>\r
+          <SelStart>1072</SelStart>\r
+          <SelEnd>1072</SelEnd>\r
+        </Tab>\r
+        <Tab>\r
+          <Factory>TextEditor</Factory>\r
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_IAR\ParTest\ParTest.c</Filename>\r
+          <XPos>0</XPos>\r
+          <YPos>58</YPos>\r
+          <SelStart>2678</SelStart>\r
+          <SelEnd>2701</SelEnd>\r
+        </Tab>\r
+        <ActiveTab>3</ActiveTab>\r
+        <Tab>\r
+          <Factory>TextEditor</Factory>\r
+          <Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\utility\led.c</Filename>\r
+          <XPos>0</XPos>\r
+          <YPos>92</YPos>\r
+          <SelStart>2663</SelStart>\r
+          <SelEnd>2663</SelEnd>\r
+        </Tab>\r
+      </Pane>\r
+      <ActivePane>0</ActivePane>\r
+      <Sizes>\r
+        <Pane>\r
+          <X>1000000</X>\r
+          <Y>1000000</Y>\r
+        </Pane>\r
+      </Sizes>\r
+      <SplitMode>1</SplitMode>\r
+    </Editor>\r
+    <Positions>\r
+      <Top>\r
+        <Row0>\r
+          <Sizes>\r
+            <Toolbar-00aa9b70>\r
+              <key>iaridepm.enu1</key>\r
+            </Toolbar-00aa9b70>\r
+          </Sizes>\r
+        </Row0>\r
+        <Row1>\r
+          <Sizes>\r
+            <Toolbar-044a32e0>\r
+              <key>debuggergui.enu1</key>\r
+            </Toolbar-044a32e0>\r
+          </Sizes>\r
+        </Row1>\r
+      </Top>\r
+      <Left>\r
+        <Row0>\r
+          <Sizes>\r
+            <Wnd4>\r
+              <Rect>\r
+                <Top>-2</Top>\r
+                <Left>-2</Left>\r
+                <Bottom>716</Bottom>\r
+                <Right>198</Right>\r
+                <x>-2</x>\r
+                <y>-2</y>\r
+                <xscreen>200</xscreen>\r
+                <yscreen>200</yscreen>\r
+                <sizeHorzCX>119048</sizeHorzCX>\r
+                <sizeHorzCY>203666</sizeHorzCY>\r
+                <sizeVertCX>119048</sizeVertCX>\r
+                <sizeVertCY>731161</sizeVertCY>\r
+              </Rect>\r
+            </Wnd4>\r
+          </Sizes>\r
+        </Row0>\r
+      </Left>\r
+      <Right>\r
+        <Row0>\r
+          <Sizes>\r
+            <Wnd5>\r
+              <Rect>\r
+                <Top>-2</Top>\r
+                <Left>-2</Left>\r
+                <Bottom>716</Bottom>\r
+                <Right>198</Right>\r
+                <x>-2</x>\r
+                <y>-2</y>\r
+                <xscreen>200</xscreen>\r
+                <yscreen>200</yscreen>\r
+                <sizeHorzCX>119048</sizeHorzCX>\r
+                <sizeHorzCY>203666</sizeHorzCY>\r
+                <sizeVertCX>119048</sizeVertCX>\r
+                <sizeVertCY>731161</sizeVertCY>\r
+              </Rect>\r
+            </Wnd5>\r
+          </Sizes>\r
+        </Row0>\r
+      </Right>\r
+      <Bottom>\r
+        <Row0>\r
+          <Sizes>\r
+            <Wnd3>\r
+              <Rect>\r
+                <Top>-2</Top>\r
+                <Left>-2</Left>\r
+                <Bottom>198</Bottom>\r
+                <Right>1682</Right>\r
+                <x>-2</x>\r
+                <y>-2</y>\r
+                <xscreen>1684</xscreen>\r
+                <yscreen>200</yscreen>\r
+                <sizeHorzCX>1002381</sizeHorzCX>\r
+                <sizeHorzCY>203666</sizeHorzCY>\r
+                <sizeVertCX>119048</sizeVertCX>\r
+                <sizeVertCY>203666</sizeVertCY>\r
+              </Rect>\r
+            </Wnd3>\r
+          </Sizes>\r
+        </Row0>\r
+      </Bottom>\r
+      <Float>\r
+        <Sizes/>\r
+      </Float>\r
+    </Positions>\r
+  </Desktop>\r
+</Project>\r
 \r
 \r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
index eead5182b37740e7cc4f99a22faf84291a523330..fadd9a7871b081c4afb8f293968a8c17d9d43c43 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ewp/settings/at91sam9xe-ek.dni
@@ -2,6 +2,28 @@
 WatchCond=_ 0\r
 Watch0=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0\r
 Watch1=_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0\r
+[DisAssemblyWindow]\r
+NumStates=_ 1\r
+State 1=_ 1\r
+[CodeCoverage]\r
+Enabled=_ 0\r
+[StackPlugin]\r
+Enabled=1\r
+OverflowWarningsEnabled=1\r
+WarningThreshold=90\r
+SpWarningsEnabled=1\r
+WarnHow=0\r
+UseTrigger=1\r
+TriggerName=main\r
+LimitSize=0\r
+ByteLimit=50\r
+[Log file]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
+Category=_ 0\r
+[TermIOLog]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
 [Disassemble mode]\r
 mode=0\r
 [Breakpoints]\r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/main.c b/Demo/ARM9_AT91SAM9XE_IAR/main.c
index 5deb34fce497fcf83c7a97ba8f9fc036bb7c7109..c2e71ec24168628ce7345428a298ba3b13e63586 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/main.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/main.c
@@ -96,6 +96,10 @@ int main()
        prvSetupHardware();\r
        \r
        /* Start the standard demo tasks. */\r
+       vStartLEDFlashTasks( mainLED_TASK_PRIORITY );   \r
+\r
+       /* These tasks to be added once the simple flasher is running.\r
+       \r
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
@@ -108,9 +112,9 @@ int main()
        vStartQueuePeekTasks();\r
        vStartRecursiveMutexTasks();\r
        \r
-       /* The death demo tasks must be started last as the sanity checks performed\r
-       require knowledge of the number of other tasks in the system. */\r
-       vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );\r
+       The death demo tasks must be started last as the sanity checks performed\r
+       require knowledge of the number of other tasks in the system.\r
+       vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); */\r
        \r
        /* Start the scheduler.  From this point on the execution will be under\r
        the control of the kernel. */\r
@@ -125,7 +129,7 @@ int main()
 static void prvCheckTask( void * pvParameters )\r
 {\r
 portTickType xNextWakeTime, xPeriod = mainNO_ERROR_PERIOD;\r
-static volatile ulErrorCode = 0UL;\r
+static volatile unsigned portLONG ulErrorCode = 0UL;\r
 \r
        /* Initialise xNextWakeTime prior to its first use.  From this point on\r
        the value of the variable is handled automatically by the kernel. */\r

diff --git a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
index 1be3abe1a67ed6938364cd5f1d937ce74cb85af6..c4c83264796f79bef9cb2127fce54a494971e9f5 100644 (file)
--- a/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
+++ b/Demo/ARM9_AT91SAM9XE_IAR/settings/rtosdemo.wsdt
@@ -3,7 +3,7 @@
 <Workspace>\r
   <ConfigDictionary>\r
     \r
-  <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe256_flash</Project></CurrentConfigs></ConfigDictionary>\r
+  <CurrentConfigs><Project>at91sam9xe-ek/at91sam9xe512_flash</Project></CurrentConfigs></ConfigDictionary>\r
   <Desktop>\r
     <Static>\r
       <Workspace>\r
@@ -12,7 +12,7 @@
           \r
           \r
           \r
-        <Column0>330</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>258</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
       <Build>\r
         \r
@@ -20,11 +20,11 @@
         \r
         \r
       <ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build>\r
-    </Static>\r
+    <Debug-Log/><TerminalIO/></Static>\r
     <Windows>\r
       \r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-26777-6465</Identity>\r
@@ -36,7 +36,7 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-25209-6494</Identity>\r
@@ -44,22 +44,22 @@
             <Factory>Build</Factory>\r
             <Session/>\r
           </Tab>\r
-        </Tabs>\r
+        <Tab><Identity>TabID-21317-8493</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\Common\drivers\Atmel\at91lib\boards\at91sam9xe-ek\board_cstartup_iar.s</Filename><XPos>0</XPos><YPos>125</YPos><SelStart>4609</SelStart><SelEnd>4609</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\port.c</Filename><XPos>0</XPos><YPos>178</YPos><SelStart>7138</SelStart><SelEnd>7138</SelEnd></Tab><ActiveTab>1</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\AtmelSAM9XE\portasm.s79</Filename><XPos>0</XPos><YPos>17</YPos><SelStart>1072</SelStart><SelEnd>1072</SelEnd></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>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM9_AT91SAM9XE_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
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00aa98f0><key>iaridepm.enu1</key></Toolbar-00aa98f0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>404</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>241667</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00aa9b88><key>iaridepm.enu1</key></Toolbar-00aa9b88></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>592</Bottom><Right>332</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>238571</sizeVertCX><sizeVertCY>604888</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>346</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>348</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>354379</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r