From: richardbarry Date: Mon, 28 Sep 2009 18:15:32 +0000 (+0000) Subject: Test with latest IAR and Keil versions. X-Git-Tag: V6.0.0~67 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74153a437e9d872cb585c8e55f76222c128a9e17;p=freertos Test with latest IAR and Keil versions. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@861 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd index e75220176..512b4c3f5 100644 --- a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewd +++ b/Demo/ARM7_LPC2129_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 0 - + + + + + + + + + + @@ -866,7 +979,7 @@ JLINK_ID 2 - 9 + 10 1 0 + LMIFTDI_ID 2 - 1 + 2 1 0 + + MACRAIGOR_ID 2 - 2 + 3 1 0 + + @@ -1148,6 +1281,19 @@ + + STLINK_ID + 2 + + 0 + 1 + 0 + + + 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_LPC2129_IAR/rtosdemo.ewp b/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp index ae58590e1..7933cf521 100644 --- a/Demo/ARM7_LPC2129_IAR/rtosdemo.ewp +++ b/Demo/ARM7_LPC2129_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 - + + @@ -492,7 +510,7 @@ 1 @@ -783,7 +809,7 @@ General 3 - 14 + 17 1 0 - + + + + ICCARM 2 - 19 + 21 1 0 - + + @@ -1263,7 +1307,7 @@ 0 diff --git a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni index e14d72694..51bf4f659 100644 --- a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni +++ b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.dni @@ -37,10 +37,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_LPC2129_IAR/settings/rtosdemo.wsdt b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt index 63524ec48..c12807ed2 100644 --- a/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt +++ b/Demo/ARM7_LPC2129_IAR/settings/rtosdemo.wsdt @@ -11,7 +11,7 @@ - 191272727 + 244272727 18115530877 @@ -28,7 +28,7 @@ - + TabID-17425-14382 @@ -40,20 +40,20 @@ - 0TabID-22109-27077BuildBuildTabID-12074-10873BreakpointsBreakpointsTabID-18349-15872Debug LogDebug-LogTabID-30013-18825Find in FilesFind-in-Files0 + 0TabID-22109-27077BuildBuildTabID-12074-10873BreakpointsBreakpointsTabID-18349-15872Debug LogDebug-LogTabID-30013-18825Find in FilesFind-in-Files0 - TextEditorC:\E\temp\rc\1\Demo\ARM7_LPC2129_IAR\main.c000000100000010000001 + TextEditorC:\E\Dev\FreeRTOS\WorkingCopy\Demo\ARM7_LPC2129_IAR\main.c0570000100000010000001 - iaridepm.enu1-2-2605265-2-20000190714618126-2-23331402-2-2140433510028573411415500078411 + iaridepm.enu1-2-2605318-2-20000190476618126-2-23331682-2-2168433510023813411415476278411 diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt index 3860e3a40..8e0aa4564 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt +++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt @@ -13,18 +13,18 @@ Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS' Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS' GRPOPT 1,(Other),1,0,0 -GRPOPT 2,(FreeRTOS),1,0,0 +GRPOPT 2,(FreeRTOS),0,0,0 GRPOPT 3,(Stadard Demo),0,0,0 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s> OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c> -OPTFFF 1,3,1,2,0,1,1,0,<.\main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 } +OPTFFF 1,3,1,2,0,55,55,0,<.\main.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 } OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c> OPTFFF 1,5,2,0,0,0,0,0,<.\serial\serialISR.s> OPTFFF 2,6,1,301989888,0,0,0,0,<..\..\Source\tasks.c> OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c> OPTFFF 2,8,1,754974720,0,0,0,0,<..\..\Source\queue.c> -OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c> +OPTFFF 2,9,1,50331648,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c> OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c> OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s> OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c>