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 66892ba33276a42600066ec9589ec35c153ad6ad..6f489df92dc37ac91325ae9db03b70bfbdedf6f1 100644 (file)
--- 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\r
 #define configCPU_CLOCK_HZ                     ( ( unsigned portLONG ) 60000000 )      /* =12.0MHz xtal multiplied by 5 using the PLL. */\r
 #define configTICK_RATE_HZ                     ( ( portTickType ) 1000 )\r
-#define configMAX_PRIORITIES           ( ( unsigned portBASE_TYPE ) 5 )\r
-#define configMINIMAL_STACK_SIZE       ( ( unsigned portSHORT ) 100 )\r
+#define configMAX_PRIORITIES           ( ( unsigned portBASE_TYPE ) 4 )\r
+#define configMINIMAL_STACK_SIZE       ( ( unsigned portSHORT ) 90 )\r
 #define configTOTAL_HEAP_SIZE          ( ( size_t ) 13 * 1024 )\r
-#define configMAX_TASK_NAME_LEN                ( 16 )\r
+#define configMAX_TASK_NAME_LEN                ( 8 )\r
 #define configUSE_TRACE_FACILITY       0\r
 #define configUSE_16_BIT_TICKS         0\r
 #define configIDLE_SHOULD_YIELD                1\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
index 8e0aa4564faa6e84076318489afb67f56ef70cbd..be4c0e2f9c0b135b3a49c3284d46c4a544c545c3 100644 (file)
--- 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
 \r
 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s><Startup.s> \r
 OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
-OPTFFF 1,3,1,2,0,55,55,0,<.\main.c><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 }\r
+OPTFFF 1,3,1,167772162,0,143,163,0,<.\main.c><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 }\r
 OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> \r
 OPTFFF 1,5,2,0,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \r
-OPTFFF 2,6,1,301989888,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
+OPTFFF 2,6,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
 OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
 OPTFFF 2,8,1,754974720,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
-OPTFFF 2,9,1,50331648,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> \r
-OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
+OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> \r
+OPTFFF 2,10,1,520093696,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
 OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> \r
 OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> \r
-OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> \r
-OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> \r
-OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> \r
-OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c><dynamic.c> \r
-OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> \r
-OPTFFF 3,18,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> \r
+OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> \r
+OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> \r
+OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c><dynamic.c> \r
+OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> \r
+OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> \r
 \r
 \r
 TARGOPT 1, (RTOSDemo_ARM)\r
@@ -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)\r
   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))\r
   OPTKEY 0,(ARMDBGFLAGS)(-T5F)\r
-  OPTBB 0,0,303,1,1676,0,0,0,0,1,<serial.c>()()\r
   OPTDF 0x86\r
   OPTLE <>\r
   OPTLC <>\r
@@ -73,14 +71,12 @@ TARGOPT 2, (RTOSDemo_THUMB)
   OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>\r
   OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>\r
   OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
-  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
+  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
   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))\r
   OPTKEY 0,(UL2ARM)(-UU0605F6E -O39 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO19 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)\r
   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))\r
   OPTKEY 0,(ARMDBGFLAGS)(-T5F)\r
-  OPTBB 0,0,218,1,644,0,0,0,0,1,<main.c>()()\r
-  OPTBB 1,0,207,1,626,0,0,0,0,1,<main.c>()()\r
-  OPTDF 0x86\r
+  OPTDF 0x82\r
   OPTLE <>\r
   OPTLC <>\r
 EndOpt\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
index 3983ea522554f73e7037a29de8537934277e2c35..7869b44346fca89ca6ca909715b198b367dcb36b 100644 (file)
--- 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><port.c>
 File 2,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>\r
 File 2,2,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s>\r
 File 3,1,<..\Common\Minimal\flash.c><flash.c>\r
-File 3,1,<..\Common\Minimal\integer.c><integer.c>\r
 File 3,1,<..\Common\Minimal\comtest.c><comtest.c>\r
 File 3,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>\r
 File 3,1,<..\Common\Minimal\dynamic.c><dynamic.c>\r
@@ -201,7 +200,7 @@ Options 2,0,0  // Target 'RTOSDemo_THUMB'
  ADSLDIF ()\r
  ADSLDDW ()\r
   OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
-  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
+  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
  FLASH1 { 1,0,0,0,1,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0 }\r
  FLASH2 (BIN\UL2ARM.DLL)\r
  FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
index 870f48c54cb44275c63da01d257279a8702bfe32..13303e903d55541944cd7a6862a81b0481a5f3a5 100644 (file)
--- 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"'\r
 ### List of Objects: adding '".\portasm.o"'\r
 ### List of Objects: adding '"flash.o"'\r
-### List of Objects: adding '"integer.o"'\r
 ### List of Objects: adding '"comtest.o"'\r
 ### List of Objects: adding '"blockq.o"'\r
 ### List of Objects: adding '"dynamic.o"'\r
 ### List of Objects: adding '"pollq.o"'\r
 ### List of Objects: adding '"semtest.o"'\r
 ### ADS-LD Command completed:\r
-"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" \r\r
+--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" \r\r
 --autoat --summary_stderr --info summarysizes --map --xref --callgraph --symbols \r\r
 --info sizes --info totals --info unused --info veneers \r\r
  --list ".\RTOSDemo.map" -o "RTOSDemo.axf"### Preparing Environment (PrepEnvAds)\r
 ### ADS-LD Output File: 'RTOSDemo.axf'\r
 ### ADS-LD Command File: 'RTOSDemo.lnp'\r
 ### Checking for dirty Components...\r
-### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000228\r
+### Creating CmdFile 'RTOSDemo.lnp', Handle=0x000002E0\r
 ### Writing '.lnp' file\r
 ### ADS-LD Command file 'RTOSDemo.lnp' is ready.\r
 ### ADS-LD: About to start ADS-LD Thread.\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s b/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s
index 6aa4d2032a8c771ed15ae519c3bfdce718914f4b..26f7e21874027dd8c551c4e89dece21f941a9679 100644 (file)
--- 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
 ;// </h>\r
 \r
 UND_Stack_Size  EQU     0x00000008\r
-SVC_Stack_Size  EQU     0x00000400\r
+SVC_Stack_Size  EQU     0x00000300\r
 ABT_Stack_Size  EQU     0x00000008\r
 FIQ_Stack_Size  EQU     0x00000008\r
-IRQ_Stack_Size  EQU     0x00000400\r
+IRQ_Stack_Size  EQU     0x00000300\r
 USR_Stack_Size EQU             0x00000008\r
 \r
 ISR_Stack_Size  EQU     (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index a9e5c70bc76087d50035434cb849fb9bcf155d5e..69798fb7d2966ec8f2c9d1c987d1ade0dad3b340 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -82,7 +82,6 @@
 /* Demo application includes. */\r
 #include "partest.h"\r
 #include "flash.h"\r
-#include "integer.h"\r
 #include "comtest2.h"\r
 #include "serial.h"\r
 #include "PollQ.h"\r
@@ -103,12 +102,12 @@
 #define mainCOM_TEST_LED               ( 3 )\r
 \r
 /* Priorities for the demo application tasks. */\r
-#define mainLED_TASK_PRIORITY          ( tskIDLE_PRIORITY + 3 )\r
+#define mainLED_TASK_PRIORITY          ( tskIDLE_PRIORITY + 2 )\r
 #define mainCOM_TEST_PRIORITY          ( tskIDLE_PRIORITY + 2 )\r
 #define mainQUEUE_POLL_PRIORITY                ( tskIDLE_PRIORITY + 2 )\r
 #define mainBLOCK_Q_PRIORITY           ( tskIDLE_PRIORITY + 2 )\r
 #define mainSEM_TEST_PRIORITY          ( tskIDLE_PRIORITY + 1 )\r
-#define mainCHECK_TASK_PRIORITY                ( tskIDLE_PRIORITY + 4 )\r
+#define mainCHECK_TASK_PRIORITY                ( tskIDLE_PRIORITY + 3 )\r
 \r
 /* Constants used by the "check" task.  As described at the head of this file\r
 the check task toggles an LED.  The rate at which the LED flashes is used to\r
@@ -155,7 +154,6 @@ int main( void )
        prvSetupHardware();\r
 \r
        /* Start the demo/test application tasks. */\r
-       vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
@@ -240,11 +238,6 @@ portLONG lReturn = pdPASS;
        /* Check all the demo tasks (other than the flash tasks) to ensure\r
        that they are all still running, and that none of them have detected\r
        an error. */\r
-       if( xAreIntegerMathsTaskStillRunning() != pdPASS )\r
-       {\r
-               lReturn = pdFAIL;\r
-       }\r
-\r
        if( xAreComTestTasksStillRunning() != pdPASS )\r
        {\r
                lReturn = pdFAIL;\r