Update IAR XMC4200 project to fix link error that resulted from updating the IAR...

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

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd
index bb7b199e869f77dedcaf7651ab32fb232c99c463..507d92ec5e65c22d50b86a5e8e03cb5f3bd03a7d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd
@@ -12,7 +12,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>25</version>\r
+        <version>26</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -45,7 +45,7 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Infineon\xmc4500.ddf</state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Infineon\XMC4500-F144x1024.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\r
@@ -89,7 +89,7 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>6.60.1.5099</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
@@ -183,6 +183,30 @@
           <name>OCAllMTBOptions</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>OCMulticoreNrOfCores</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreMaster</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticorePort</name>\r
+          <state>53461</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreWorkspace</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveProject</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveConfiguration</name>\r
+          <state></state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -257,7 +281,7 @@
       <name>CMSISDAP_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>0</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -398,6 +422,30 @@
           <name>CMSISDAPMultiCPUNumber</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>OCProbeCfgOverride</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCProbeConfig</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPProbeConfigRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPSelectedCPUBehaviour</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ICpuName</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -472,7 +520,7 @@
       <name>IJET_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>2</version>\r
+        <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -666,6 +714,10 @@
           <name>ICpuName</name>\r
           <state></state>\r
         </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1254,19 +1306,15 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -1309,7 +1357,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>25</version>\r
+        <version>26</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1342,7 +1390,7 @@
         </option>\r
         <option>\r
           <name>MemFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\Infineon\xmc4200.ddf</state>\r
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\Infineon\XMC4200-F64x256.ddf</state>\r
         </option>\r
         <option>\r
           <name>RunToEnable</name>\r
@@ -1386,7 +1434,7 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>6.60.1.5099</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
@@ -1480,6 +1528,30 @@
           <name>OCAllMTBOptions</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>OCMulticoreNrOfCores</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreMaster</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticorePort</name>\r
+          <state>53461</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreWorkspace</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveProject</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveConfiguration</name>\r
+          <state></state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1554,7 +1626,7 @@
       <name>CMSISDAP_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>0</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1695,6 +1767,30 @@
           <name>CMSISDAPMultiCPUNumber</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>OCProbeCfgOverride</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCProbeConfig</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPProbeConfigRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPSelectedCPUBehaviour</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ICpuName</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1769,7 +1865,7 @@
       <name>IJET_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>2</version>\r
+        <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1963,6 +2059,10 @@
           <name>ICpuName</name>\r
           <state></state>\r
         </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -2551,19 +2651,15 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
@@ -2606,7 +2702,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>25</version>\r
+        <version>26</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2777,6 +2873,30 @@
           <name>OCAllMTBOptions</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>OCMulticoreNrOfCores</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreMaster</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticorePort</name>\r
+          <state>53461</state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreWorkspace</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveProject</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCMulticoreSlaveConfiguration</name>\r
+          <state></state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -2851,7 +2971,7 @@
       <name>CMSISDAP_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>0</version>\r
+        <version>2</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2992,6 +3112,30 @@
           <name>CMSISDAPMultiCPUNumber</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>OCProbeCfgOverride</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCProbeConfig</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPProbeConfigRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CMSISDAPSelectedCPUBehaviour</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ICpuName</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -3066,7 +3210,7 @@
       <name>IJET_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>2</version>\r
+        <version>3</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -3260,6 +3404,10 @@
           <name>ICpuName</name>\r
           <state></state>\r
         </option>\r
+        <option>\r
+          <name>OCJetEmuParams</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -3848,19 +3996,15 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp
index 402737146bba9b6d3bb5bc34a92ab9c056b1a03e..0f9ad3179597012e281df06eb6964b179aa22f35 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp
@@ -87,7 +87,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>6.60.1.5099</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
@@ -99,7 +99,7 @@
         </option>\r
         <option>\r
           <name>OGChipSelectEditMenu</name>\r
-          <state>xmc4500       Infineon xmc4500</state>\r
+          <state>XMC4500-F144x1024     Infineon XMC4500-F144x1024</state>\r
         </option>\r
         <option>\r
           <name>GenLowLevelInterface</name>\r
@@ -163,7 +163,7 @@
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>29</version>\r
+        <version>30</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -233,7 +233,7 @@
         <option>\r
           <name>CCAllowList</name>\r
           <version>1</version>\r
-          <state>0000000</state>\r
+          <state>00000000</state>\r
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
@@ -402,6 +402,11 @@
           <name>CCNoLiteralPool</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCOptStrategySlave</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1023,7 +1028,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>6.60.1.5099</state>\r
+          <state>7.10.1.6733</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
@@ -1035,7 +1040,7 @@
         </option>\r
         <option>\r
           <name>OGChipSelectEditMenu</name>\r
-          <state>xmc4200       Infineon xmc4200</state>\r
+          <state>XMC4200-F64x256       Infineon XMC4200-F64x256</state>\r
         </option>\r
         <option>\r
           <name>GenLowLevelInterface</name>\r
@@ -1099,7 +1104,7 @@
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>29</version>\r
+        <version>30</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -1169,7 +1174,7 @@
         <option>\r
           <name>CCAllowList</name>\r
           <version>1</version>\r
-          <state>0000000</state>\r
+          <state>00000000</state>\r
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
@@ -1338,6 +1343,11 @@
           <name>CCNoLiteralPool</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCOptStrategySlave</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -1638,11 +1648,11 @@
         </option>\r
         <option>\r
           <name>IlinkIcfOverride</name>\r
-          <state>0</state>\r
+          <state>1</state>\r
         </option>\r
         <option>\r
           <name>IlinkIcfFile</name>\r
-          <state>$TOOLKIT_DIR$\config\linker\Infineon\xmc4200.icf</state>\r
+          <state>$PROJ_DIR$\XMC4200.icf</state>\r
         </option>\r
         <option>\r
           <name>IlinkIcfFileSlave</name>\r
@@ -2035,7 +2045,7 @@
       <name>ICCARM</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>29</version>\r
+        <version>30</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -2105,7 +2115,7 @@
         <option>\r
           <name>CCAllowList</name>\r
           <version>1</version>\r
-          <state>0000000</state>\r
+          <state>00000000</state>\r
         </option>\r
         <option>\r
           <name>CCDebugInfo</name>\r
@@ -2274,6 +2284,11 @@
           <name>CCNoLiteralPool</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>CCOptStrategySlave</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf
new file mode 100644 (file)
index 0000000..de2b789
--- /dev/null
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf
@@ -0,0 +1,35 @@
+/*###ICF### Section handled by ICF editor, don't touch! ****/\r
+/*-Editor annotation file-*/\r
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */\r
+/*-Specials-*/\r
+define symbol __ICFEDIT_intvec_start__ = 0x08000000;\r
+/*-Memory Regions-*/\r
+define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;\r
+define symbol __ICFEDIT_region_ROM_end__   = 0x0803FFFF;\r
+define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;\r
+define symbol __ICFEDIT_region_RAM_end__   = 0x20005FFF;\r
+/*-Sizes-*/\r
+define symbol __ICFEDIT_size_cstack__ = 0x400;\r
+define symbol __ICFEDIT_size_heap__   = 0x4;\r
+/**** End of ICF editor section. ###ICF###*/\r
+\r
+define symbol __PSRAM_start__ = 0x1FFFC000;\r
+define symbol __PSRAM_end__   = 0x1FFFFFFF;\r
+\r
+define memory mem with size = 4G;\r
+define region ROM_region   = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];\r
+define region RAM_region   = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];\r
+define region PSRAM_region = mem:[from __PSRAM_start__ to __PSRAM_end__];\r
+\r
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__{ };\r
+define block HEAP   with alignment = 8, size = __ICFEDIT_size_heap__{ };\r
+\r
+initialize by copy {readwrite};\r
+do not initialize  {section .noinit};\r
+\r
+place at address mem:__ICFEDIT_intvec_start__ {readonly section .intvec};\r
+\r
+place in ROM_region  {readonly};\r
+place in RAM_region  {readwrite,\r
+                      block CSTACK, block HEAP};\r
+place in PSRAM_region{section .psram};
\ No newline at end of file

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt
index 2c520168780b001028e8fe1ae600a2cc356ade7e..a29e99ddd9676717fe94bc7c5803f5b7ec98c5f4 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt
@@ -44,7 +44,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-11908-23542</Identity>\r
@@ -56,20 +56,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-5604-9989</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-5604-9989</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>84</YPos2><SelStart2>5611</SelStart2><SelEnd2>5611</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>188</YPos2><SelStart2>9833</SelStart2><SelEnd2>9833</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>63</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\ARM_CM4F\port.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>348</YPos2><SelStart2>14503</SelStart2><SelEnd2>14503</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\ARM_CM4F\portasm.s</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>104</YPos2><SelStart2>4789</SelStart2><SelEnd2>4789</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\system\startup_XMC4400.s</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>254</YPos2><SelStart2>14858</SelStart2><SelEnd2>14858</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\RegTest.s</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>114</YPos2><SelStart2>5036</SelStart2><SelEnd2>5036</SelEnd2></Tab><ActiveTab>6</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>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>100</YPos2><SelStart2>5909</SelStart2><SelEnd2>5909</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>153</YPos2><SelStart2>8654</SelStart2><SelEnd2>8654</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\queue.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>1621</YPos2><SelStart2>53725</SelStart2><SelEnd2>53725</SelEnd2></Tab><ActiveTab>2</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-01348e70><key>iaridepm.enu1</key></Toolbar-01348e70></Sizes></Row0><Row1><Sizes><Toolbar-10e58c38><key>debuggergui.enu1</key></Toolbar-10e58c38></Sizes></Row1><Row2><Sizes><Toolbar-202d5380><key>armjlink.enu1</key></Toolbar-202d5380></Sizes></Row2></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>692</Bottom><Right>279</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>167262</sizeVertCX><sizeVertCY>706721</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>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-013BA3C8><key>iaridepm.enu1</key></Toolbar-013BA3C8></Sizes></Row0><Row1><Sizes><Toolbar-0BF75808><key>debuggergui.enu1</key></Toolbar-0BF75808></Sizes></Row1><Row2><Sizes><Toolbar-0C24E0C8><key>armjlink.enu1</key></Toolbar-0C24E0C8></Sizes></Row2></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>692</Bottom><Right>279</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>167262</sizeVertCX><sizeVertCY>706721</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>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></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni
index eab10c6d422972ad80ce39ac183766a4e1f68d99..7a2dc855fafd0f447620fc4e0ed10bc0805475f5 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni
@@ -9,7 +9,7 @@ TriggerName=main
 LimitSize=0\r
 ByteLimit=50\r
 [DebugChecksum]\r
-Checksum=92877996\r
+Checksum=1444046619\r
 [Exceptions]\r
 StopOnUncaught=_ 0\r
 StopOnThrow=_ 0\r
@@ -23,9 +23,9 @@ CStepIntDis=_ 0
 OverrideDefaultClocks=0\r
 CpuClock=72000000\r
 ClockAutoDetect=0\r
-ClockWanted=2000000\r
-JtagSpeed=2000000\r
-Prescaler=36\r
+ClockWanted=1000000\r
+JtagSpeed=1000000\r
+Prescaler=72\r
 TimeStampPrescIndex=0\r
 TimeStampPrescData=0\r
 PcSampCYCTAP=1\r
@@ -36,13 +36,22 @@ ITMportsEnable=0
 ITMportsTermIO=0\r
 ITMportsLogFile=0\r
 ITMlogFile=$PROJ_DIR$\ITM.log\r
+[SWOTraceWindow]\r
+PcSampling=0\r
+InterruptLogs=0\r
+ForcedTimeStamps=0\r
+EventCPI=0\r
+EventEXC=0\r
+EventFOLD=0\r
+EventLSU=0\r
+EventSLEEP=0\r
 [PowerLog]\r
 LogEnabled=0\r
 GraphEnabled=0\r
 ShowTimeLog=1\r
 ShowTimeSum=0\r
-Title0=I0\r
-Symbol0=0 4 1\r
+Title_0=I0\r
+Symbol_0=0 4 227\r
 LiveEnabled=0\r
 LiveFile=PowerLogLive.log\r
 [DataLog]\r
@@ -57,14 +66,6 @@ SumEnabled=0
 GraphEnabled=0\r
 ShowTimeLog=1\r
 ShowTimeSum=1\r
-Title0=Ch0\r
-Symbol0=0 4 1\r
-Title1=Ch1\r
-Symbol1=0 4 1\r
-Title2=Ch2\r
-Symbol2=0 4 1\r
-Title3=Ch3\r
-Symbol3=0 4 1\r
 SumSortOrder=0\r
 [InterruptLog]\r
 LogEnabled=0\r
@@ -80,24 +81,12 @@ Category=_ 0
 [TermIOLog]\r
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
-[Trace2]\r
+[CallStackLog]\r
 Enabled=0\r
-ShowSource=0\r
-[SWOTraceWindow]\r
-PcSampling=0\r
-InterruptLogs=0\r
-ForcedTimeStamps=0\r
-EventCPI=0\r
-EventEXC=0\r
-EventFOLD=0\r
-EventLSU=0\r
-EventSLEEP=0\r
 [PowerProbe]\r
 Frequency=10000\r
 Probe0=I0\r
 ProbeSetup0=2 1 1 2 0 0\r
-[CallStackLog]\r
-Enabled=0\r
 [DriverProfiling]\r
 Enabled=0\r
 Mode=3\r

diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt
index b531a9bd8977465bd8be8d1c12ad03fd31b5dabc..52332e268d8482e8f7b6aa98552aec063b4e3b6e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt
+++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt
@@ -25,7 +25,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-29494-21985</Identity>\r
@@ -33,11 +33,11 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Common_Demo_Source</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS_Source</ExpandedNode><ExpandedNode>RTOSDemo/System</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-28344-23030</Identity>\r
@@ -47,20 +47,20 @@
           </Tab>\r
         <Tab><Identity>TabID-19430-2343</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>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>60</YPos2><SelStart2>5611</SelStart2><SelEnd2>5611</SelEnd2></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>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>64</YPos2><SelStart2>5909</SelStart2><SelEnd2>5909</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_full.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>62</YPos2><SelStart2>8654</SelStart2><SelEnd2>8654</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main_blinky.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>63</YPos2><SelStart2>0</SelStart2><SelEnd2>0</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-01348e70><key>iaridepm.enu1</key></Toolbar-01348e70></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>389</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>232738</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-013BA698><key>iaridepm.enu1</key></Toolbar-013BA698></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>740</Bottom><Right>389</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>232738</sizeVertCX><sizeVertCY>755601</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><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></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r