From: richardbarry Date: Tue, 29 Sep 2009 17:46:10 +0000 (+0000) Subject: Update to latest IAR version. X-Git-Tag: V6.0.0~61 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd6b3136317038977b133001fbe5c2b615aca4e0;p=freertos Update to latest IAR version. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@867 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/ARM7_STR75x_IAR/RTOSDemo.ewd b/Demo/ARM7_STR75x_IAR/RTOSDemo.ewd index 324305346..530a2ca7e 100644 --- a/Demo/ARM7_STR75x_IAR/RTOSDemo.ewd +++ b/Demo/ARM7_STR75x_IAR/RTOSDemo.ewd @@ -1,7 +1,7 @@ - 1 + 2 Debug @@ -12,7 +12,7 @@ C-SPY 2 - 15 + 21 1 1 - + + + + + + + + + + @@ -257,7 +293,7 @@ JLINK_ID 2 - 9 + 10 1 1 + LMIFTDI_ID 2 - 1 + 2 1 1 + + MACRAIGOR_ID 2 - 2 + 3 1 1 + + @@ -539,6 +595,19 @@ + + STLINK_ID + 2 + + 0 + 1 + 1 + + + THIRDPARTY_ID 2 @@ -566,11 +635,11 @@ - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin 0 @@ -586,7 +655,11 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin 0 @@ -609,6 +682,10 @@ $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin 0 + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + @@ -621,7 +698,7 @@ C-SPY 2 - 15 + 21 1 1 - + + + + + + + + + + @@ -866,7 +979,7 @@ JLINK_ID 2 - 9 + 10 1 1 + LMIFTDI_ID 2 - 1 + 2 1 1 + + MACRAIGOR_ID 2 - 2 + 3 1 1 + + @@ -1148,6 +1281,19 @@ + + STLINK_ID + 2 + + 0 + 1 + 1 + + + THIRDPARTY_ID 2 @@ -1175,11 +1321,11 @@ - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin 0 @@ -1195,7 +1341,11 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin 0 @@ -1218,6 +1368,10 @@ $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin 1 + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + diff --git a/Demo/ARM7_STR75x_IAR/RTOSDemo.ewp b/Demo/ARM7_STR75x_IAR/RTOSDemo.ewp index de0c80517..387fc23e1 100644 --- a/Demo/ARM7_STR75x_IAR/RTOSDemo.ewp +++ b/Demo/ARM7_STR75x_IAR/RTOSDemo.ewp @@ -1,7 +1,7 @@ - 1 + 2 Debug @@ -12,7 +12,7 @@ General 3 - 14 + 17 1 1 - + + + + ICCARM 2 - 19 + 21 1 1 - + + @@ -487,7 +505,7 @@ 1 @@ -778,7 +804,7 @@ General 3 - 14 + 17 1 1 - + + + + ICCARM 2 - 19 + 21 1 1 - + + @@ -1253,7 +1297,7 @@ 1 diff --git a/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.dni b/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.dni index 1dcb6aa9e..f6fe199fb 100644 --- a/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.dni +++ b/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.dni @@ -35,10 +35,10 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" +[TraceHelper] +Enabled=0 +ShowSource=1 [Disassemble mode] mode=0 [Breakpoints] Count=0 -[TraceHelper] -Enabled=0 -ShowSource=1 diff --git a/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.wsdt b/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.wsdt index c9147c33a..5126bd3bb 100644 --- a/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.wsdt +++ b/Demo/ARM7_STR75x_IAR/settings/RTOSDemo.wsdt @@ -12,7 +12,7 @@ - 224272727 + 284272727 @@ -32,7 +32,7 @@ - + TabID-5322-15070 @@ -40,24 +40,24 @@ Workspace - RTOSDemoRTOSDemo/sourceRTOSDemo/startup + RTOSDemoRTOSDemo/Demo SourceRTOSDemo/source - 0TabID-10308-14988BuildBuildTabID-11884-28246BreakpointsBreakpointsTabID-30248-21129Debug LogDebug-Log0 + 0TabID-10308-14988BuildBuildTabID-11884-28246BreakpointsBreakpointsTabID-30248-21129Debug LogDebug-Log0 - TextEditorC:\E\temp\rc\1\Demo\ARM7_STR75x_IAR\main.c01265518551800100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_STR75x_IAR\main.c000000100000010000001 - iaridepm.enu1-2-2715298-2-20000214286730143-2-22231402-2-214042251002857229124142857205703 + iaridepm.enu1-2-2715358-2-20000214286730143-2-22231682-2-216842251002381229124142857205703