From d947c409687c343d00deb6d9d67e2950a7d6f80a Mon Sep 17 00:00:00 2001 From: richardbarry Date: Mon, 28 Sep 2009 17:52:42 +0000 Subject: [PATCH] Test with latest IAR version. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@858 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd | 202 +++++++++++++++--- Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp | 130 +++++++---- .../settings/rtosdemo.dni | 6 +- .../settings/rtosdemo.wsdt | 6 +- 4 files changed, 275 insertions(+), 69 deletions(-) diff --git a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd index de6ec3f62..0512e23af 100644 --- a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd +++ b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewd @@ -1,7 +1,7 @@ - 1 + 2 Flash 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 0 + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin + 1 + diff --git a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp index 0b69546f9..3dca32589 100644 --- a/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp +++ b/Demo/ARM7_AT91SAM7S64_IAR/rtosdemo.ewp @@ -1,7 +1,7 @@ - 1 + 2 Flash Debug @@ -12,7 +12,7 @@ General 3 - 14 + 17 1 1 - + + + + ICCARM 2 - 19 + 21 1 1 - + + @@ -491,7 +509,7 @@ 1 @@ -782,7 +808,7 @@ General 3 - 14 + 17 1 1 - + + + + ICCARM 2 - 19 + 21 1 1 - + + @@ -1260,7 +1304,7 @@ 1 diff --git a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni index 78681fc3a..63a3b21be 100644 --- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni +++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.dni @@ -30,10 +30,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_AT91SAM7S64_IAR/settings/rtosdemo.wsdt b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt index ca9ef47b3..c99a29af0 100644 --- a/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt +++ b/Demo/ARM7_AT91SAM7S64_IAR/settings/rtosdemo.wsdt @@ -36,7 +36,7 @@ Workspace - rtosdemo + rtosdemortosdemo/Demo Source @@ -62,14 +62,14 @@ - TextEditorC:\E\Dev\FreeRTOS\Demo\ARM7_AT91SAM7S64_IAR\main.c000000100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_AT91SAM7S64_IAR\main.c0088088000100000010000001 - iaridepm.enu1-2-2576310-2-232261904826477185714588595-2-23621682-2-2168436410023813706721904826477 + iaridepm.enu1-2-2576310-2-232261904826477185714588595-2-23621682-2-2168436410023813706721904826477 -- 2.39.5