From: richardbarry Date: Sun, 4 Oct 2009 14:56:54 +0000 (+0000) Subject: Update to fit using later Keil version. X-Git-Tag: V6.0.0~34 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0fdff3c2a545bdfe1bbc24aee77f849c7309a063;p=freertos Update to fit using later Keil version. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@894 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h index 66892ba33..6f489df92 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h +++ b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h @@ -67,10 +67,10 @@ #define configUSE_TICK_HOOK 0 #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 60000000 ) /* =12.0MHz xtal multiplied by 5 using the PLL. */ #define configTICK_RATE_HZ ( ( portTickType ) 1000 ) -#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) -#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 100 ) +#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 4 ) +#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 90 ) #define configTOTAL_HEAP_SIZE ( ( size_t ) 13 * 1024 ) -#define configMAX_TASK_NAME_LEN ( 16 ) +#define configMAX_TASK_NAME_LEN ( 8 ) #define configUSE_TRACE_FACILITY 0 #define configUSE_16_BIT_TICKS 0 #define configIDLE_SHOULD_YIELD 1 diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt index 8e0aa4564..be4c0e2f9 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt +++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt @@ -18,22 +18,21 @@ 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,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,3,1,167772162,0,143,163,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,6,1,0,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,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,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c> +OPTFFF 2,10,1,520093696,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> -OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c> -OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\comtest.c> -OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c> -OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c> -OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c> -OPTFFF 3,18,1,0,0,0,0,0,<..\Common\Minimal\semtest.c> +OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\comtest.c> +OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c> +OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c> +OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c> +OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\semtest.c> TARGOPT 1, (RTOSDemo_ARM) @@ -54,7 +53,6 @@ TARGOPT 1, (RTOSDemo_ARM) OPTKEY 0,(UL2ARM)(-UU0605F6E -O47 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000) OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0)) OPTKEY 0,(ARMDBGFLAGS)(-T5F) - OPTBB 0,0,303,1,1676,0,0,0,0,1,()() OPTDF 0x86 OPTLE <> OPTLC <> @@ -73,14 +71,12 @@ TARGOPT 2, (RTOSDemo_THUMB) OPTBL 0,(Data Sheet) OPTBL 1,(User Manual) OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9) - OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()() + OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()() OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0)) OPTKEY 0,(UL2ARM)(-UU0605F6E -O39 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO19 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000) OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0)) OPTKEY 0,(ARMDBGFLAGS)(-T5F) - OPTBB 0,0,218,1,644,0,0,0,0,1,()() - OPTBB 1,0,207,1,626,0,0,0,0,1,()() - OPTDF 0x86 + OPTDF 0x82 OPTLE <> OPTLC <> EndOpt diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 index 3983ea522..7869b4434 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 +++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 @@ -20,7 +20,6 @@ File 2,1,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c> File 2,1,<..\..\Source\portable\MemMang\heap_2.c> File 2,2,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s> File 3,1,<..\Common\Minimal\flash.c> -File 3,1,<..\Common\Minimal\integer.c> File 3,1,<..\Common\Minimal\comtest.c> File 3,1,<..\Common\Minimal\BlockQ.c> File 3,1,<..\Common\Minimal\dynamic.c> @@ -201,7 +200,7 @@ Options 2,0,0 // Target 'RTOSDemo_THUMB' ADSLDIF () ADSLDDW () OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9) - OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()() + OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()() FLASH1 { 1,0,0,0,1,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0 } FLASH2 (BIN\UL2ARM.DLL) FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1)) diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra index 870f48c54..13303e903 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra +++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra @@ -13,21 +13,20 @@ ### List of Objects: adding '"heap_2.o"' ### List of Objects: adding '".\portasm.o"' ### List of Objects: adding '"flash.o"' -### List of Objects: adding '"integer.o"' ### List of Objects: adding '"comtest.o"' ### List of Objects: adding '"blockq.o"' ### List of Objects: adding '"dynamic.o"' ### List of Objects: adding '"pollq.o"' ### List of Objects: adding '"semtest.o"' ### ADS-LD Command completed: -"startup.o" "partest.o" "main.o" "serial.o" "serialisr.o" "tasks.o" "list.o" "queue.o" "port.o" "heap_2.o" ".\portasm.o" "flash.o" "integer.o" "comtest.o" "blockq.o" "dynamic.o" "pollq.o" "semtest.o" --device DARMP --strict --scatter "RTOSDemo.sct" +--device DARMP "startup.o" "partest.o" "main.o" "serial.o" "serialisr.o" "tasks.o" "list.o" "queue.o" "port.o" "heap_2.o" ".\portasm.o" "flash.o" "comtest.o" "blockq.o" "dynamic.o" "pollq.o" "semtest.o" --strict --scatter "RTOSDemo.sct" --autoat --summary_stderr --info summarysizes --map --xref --callgraph --symbols --info sizes --info totals --info unused --info veneers --list ".\RTOSDemo.map" -o "RTOSDemo.axf"### Preparing Environment (PrepEnvAds) ### ADS-LD Output File: 'RTOSDemo.axf' ### ADS-LD Command File: 'RTOSDemo.lnp' ### Checking for dirty Components... -### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000228 +### Creating CmdFile 'RTOSDemo.lnp', Handle=0x000002E0 ### Writing '.lnp' file ### ADS-LD Command file 'RTOSDemo.lnp' is ready. ### ADS-LD: About to start ADS-LD Thread. diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s b/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s index 6aa4d2032..26f7e2187 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s +++ b/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s @@ -58,10 +58,10 @@ F_Bit EQU 0x40 ; when F bit is set, FIQ is disabled ;// UND_Stack_Size EQU 0x00000008 -SVC_Stack_Size EQU 0x00000400 +SVC_Stack_Size EQU 0x00000300 ABT_Stack_Size EQU 0x00000008 FIQ_Stack_Size EQU 0x00000008 -IRQ_Stack_Size EQU 0x00000400 +IRQ_Stack_Size EQU 0x00000300 USR_Stack_Size EQU 0x00000008 ISR_Stack_Size EQU (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \ diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c index a9e5c70bc..69798fb7d 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c +++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c @@ -82,7 +82,6 @@ /* Demo application includes. */ #include "partest.h" #include "flash.h" -#include "integer.h" #include "comtest2.h" #include "serial.h" #include "PollQ.h" @@ -103,12 +102,12 @@ #define mainCOM_TEST_LED ( 3 ) /* Priorities for the demo application tasks. */ -#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 3 ) +#define mainLED_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 ) #define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 2 ) #define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 ) #define mainBLOCK_Q_PRIORITY ( tskIDLE_PRIORITY + 2 ) #define mainSEM_TEST_PRIORITY ( tskIDLE_PRIORITY + 1 ) -#define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 4 ) +#define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 3 ) /* Constants used by the "check" task. As described at the head of this file the check task toggles an LED. The rate at which the LED flashes is used to @@ -155,7 +154,6 @@ int main( void ) prvSetupHardware(); /* Start the demo/test application tasks. */ - vStartIntegerMathTasks( tskIDLE_PRIORITY ); vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED ); vStartLEDFlashTasks( mainLED_TASK_PRIORITY ); vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); @@ -240,11 +238,6 @@ portLONG lReturn = pdPASS; /* Check all the demo tasks (other than the flash tasks) to ensure that they are all still running, and that none of them have detected an error. */ - if( xAreIntegerMathsTaskStillRunning() != pdPASS ) - { - lReturn = pdFAIL; - } - if( xAreComTestTasksStillRunning() != pdPASS ) { lReturn = pdFAIL;