Set up to work in both ARM and THUMB modes.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@517 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
index cb1378dc7e0289923827553166b267aed340b7f9..1866defa0d82e5e9c4dbbd58e76d73e10589510a 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -10,28 +10,58 @@
  CppX (*.cpp)\r
  DaveTm { 0,0,0,0,0,0,0,0 }\r
 \r
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'\r
+Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'\r
+Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'\r
 GRPOPT 1,(Other),1,0,0\r
 GRPOPT 2,(FreeRTOS),0,0,0\r
 GRPOPT 3,(Stadard Demo),0,0,0\r
 \r
 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s><Startup.s> \r
 OPTFFF 1,2,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
-OPTFFF 1,3,1,2,0,160,164,0,<.\main.c><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,154,0,0,0,161,0,0,0,23,5,0,0,111,2,0,0 }\r
+OPTFFF 1,3,1,2,0,151,151,0,<.\main.c><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,132,0,0,0,138,0,0,0,23,5,0,0,6,2,0,0 }\r
 OPTFFF 1,4,1,234881024,0,0,0,0,<.\serial\serial.c><serial.c> \r
-OPTFFF 1,5,2,486539264,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \r
+OPTFFF 1,5,2,67108864,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \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,0,0,0,0,0,<..\..\Source\queue.c><queue.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,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
-OPTFFF 2,11,2,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> \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
 \r
 \r
-TARGOPT 1, (RTOSDemo)\r
+TARGOPT 1, (RTOSDemo_ARM)\r
+ ADSCLK=12000000\r
+  OPTTT 1,1,1,0\r
+  OPTHX 1,65535,0,0,0\r
+  OPTLX 79,66,8,<.\>\r
+  OPTOX 16\r
+  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0\r
+  OPTXL 1,1,1,1,1,1,1,0,0\r
+  OPTFL 1,0,0\r
+  OPTAX 8\r
+  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 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\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
+  OPTDF 0x1000086\r
+  OPTLE <>\r
+  OPTLC <>\r
+  OPTLA 0,((Port1 & 0x10000) >> 16)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)\r
+  OPTLA 1,((Port1 & 0x20000) >> 17)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)\r
+  OPTLA 2,((Port1 & 0x40000) >> 18)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)\r
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)\r
+EndOpt\r
+\r
+TARGOPT 2, (RTOSDemo_THUMB)\r
  ADSCLK=12000000\r
   OPTTT 1,1,1,0\r
   OPTHX 1,65535,0,0,0\r
@@ -47,8 +77,12 @@ TARGOPT 1, (RTOSDemo)
   OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\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
-  OPTDF 0x86\r
+  OPTDF 0x1000086\r
   OPTLE <>\r
   OPTLC <>\r
+  OPTLA 0,((Port1 & 0x10000) >> 16)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)\r
+  OPTLA 1,((Port1 & 0x20000) >> 17)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)\r
+  OPTLA 2,((Port1 & 0x40000) >> 18)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)\r
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)\r
 EndOpt\r
 \r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
index fb042d75df05ac6e124ba90fe2d720640b813366..9f6576b5ae12593b4498066e609b2bb74b7d440c 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
@@ -1,7 +1,8 @@
 ### uVision2 Project, (C) Keil Software\r
 ### Do not modify !\r
 \r
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'\r
+Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'\r
+Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'\r
 \r
 Group (Other)\r
 Group (FreeRTOS)\r
@@ -21,9 +22,13 @@ File 2,2,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s>
 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
+File 3,1,<..\Common\Minimal\PollQ.c><PollQ.c>\r
+File 3,1,<..\Common\Minimal\semtest.c><semtest.c>\r
 \r
 \r
-Options 1,0,0  // Target 'RTOSDemo'\r
+Options 1,0,0  // Target 'RTOSDemo_ARM'\r
  Device (LPC2129)\r
  Vendor (NXP (founded by Philips))\r
  Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))\r
@@ -113,3 +118,93 @@ Options 1,0,0  // Target 'RTOSDemo'
  FLASH4 ()\r
 EndOpt\r
 \r
+Options 2,0,0  // Target 'RTOSDemo_THUMB'\r
+ Device (LPC2129)\r
+ Vendor (NXP (founded by Philips))\r
+ Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))\r
+ FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))\r
+ StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))\r
+ FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))\r
+ DevID (3648)\r
+ Rgf (LPC21xx.H)\r
+ Mem ()\r
+ C ()\r
+ A ()\r
+ RL ()\r
+ OH ()\r
+ DBC_IFX ()\r
+ DBC_CMS ()\r
+ DBC_AMS ()\r
+ DBC_LMS ()\r
+ UseEnv=0\r
+ EnvBin ()\r
+ EnvInc ()\r
+ EnvLib ()\r
+ EnvReg (ÿPhilips\)\r
+ OrgReg (ÿPhilips\)\r
+ TgStat=16\r
+ OutDir (.\)\r
+ OutName (RTOSDemo)\r
+ GenApp=1\r
+ GenLib=0\r
+ GenHex=0\r
+ Debug=1\r
+ Browse=1\r
+ LstDir (.\)\r
+ HexSel=1\r
+ MG32K=0\r
+ TGMORE=0\r
+ RunUsr 0 0 <>\r
+ RunUsr 1 0 <>\r
+ BrunUsr 0 0 <>\r
+ BrunUsr 1 0 <>\r
+ CrunUsr 0 0 <>\r
+ CrunUsr 1 0 <>\r
+ SVCSID <>\r
+ GLFLAGS=1790\r
+ ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ACPUTYP (ARM7TDMI)\r
+ RVDEV ()\r
+ ADSTFLGA { 0,12,0,2,99,4,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }\r
+ OCMADSIROM { 1,0,0,0,0,0,0,4,0 }\r
+ OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }\r
+ OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,64,0,0,0,0,0,0,0,0,0,0,0 }\r
+ RV_STAVEC ()\r
+ ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSCMISC ()\r
+ ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS KEIL_THUMB_INTERWORK)\r
+ ADSCUDEF ()\r
+ ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)\r
+ ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSAMISC ()\r
+ ADSADEFN ()\r
+ ADSAUDEF ()\r
+ ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)\r
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ IncBld=1\r
+ AlwaysBuild=0\r
+ GenAsm=0\r
+ AsmAsm=0\r
+ PublicsOnly=0\r
+ StopCode=3\r
+ CustArgs ()\r
+ LibMods ()\r
+ ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSLDTA (0x00000000)\r
+ ADSLDDA (0x40000000)\r
+ ADSLDSC ()\r
+ ADSLDIB ()\r
+ ADSLDIC ()\r
+ ADSLDMC ()\r
+ ADSLDIF ()\r
+ ADSLDDW ()\r
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
+  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
+ FLASH1 { 2,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0 }\r
+ FLASH2 ()\r
+ FLASH3 (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))\r
+ FLASH4 ()\r
+EndOpt\r
+\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
index 9b87df214e4b5b0e641b177ed2518ab2124ce9d4..00d256d1c2ac2414f1c70cfb38ff428e8768e990 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
@@ -7,5 +7,33 @@ C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\ARM7_LPC2129_Keil_RVDS\RTOSDemo.uv2
 Project File Date:  10/23/2008\r
 \r
 <h2>Output:</h2>\r
+Build target 'RTOSDemo_THUMB'\r
+assembling Startup.s...\r
+compiling ParTest.c...\r
+compiling main.c...\r
+compiling serial.c...\r
+assembling serialISR.s...\r
+compiling tasks.c...\r
+compiling list.c...\r
+compiling queue.c...\r
+compiling port.c...\r
+compiling heap_2.c...\r
+assembling portASM.s...\r
+compiling flash.c...\r
+compiling integer.c...\r
+compiling comtest.c...\r
+compiling BlockQ.c...\r
+compiling dynamic.c...\r
+compiling PollQ.c...\r
+compiling semtest.c...\r
+linking...\r
+RTOSDemo.axf: Error: L6218E: Undefined symbol vPortYield (referred from tasks.o).\r
+Target not created\r
+Build target 'RTOSDemo_THUMB'\r
+assembling portASM.s...\r
+linking...\r
+Program Size: Code=10844 RO-data=32 RW-data=208 ZI-data=15696  \r
+"RTOSDemo.axf" - 0 Error(s), 0 Warning(s).\r
 Clean started: Project: 'RTOSDemo'\r
-   deleting intermediate output files for target 'RTOSDemo'\r
+   deleting intermediate output files for target 'RTOSDemo_ARM'\r
+   deleting intermediate output files for target 'RTOSDemo_THUMB'\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
index 1cc2f2451b8c5855cccdfc3771eba4aaed517818..45598e3c084757b800d13dedc067d9cfcf38c1fe 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
@@ -15,15 +15,19 @@
 ### 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" --device DARMP --strict --scatter "RTOSDemo.sct" \r\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
 --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=0x0000044C\r
+### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000214\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/RTOSDemo_Opt.Bak b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Opt.Bak
deleted file mode 100644 (file)
index 97e4c82..0000000
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Opt.Bak
+++ /dev/null
@@ -1,56 +0,0 @@
-### uVision2 Project, (C) Keil Software\r
-### Do not modify !\r
-\r
- cExt (*.c)\r
- aExt (*.s*; *.src; *.a*)\r
- oExt (*.obj)\r
- lExt (*.lib)\r
- tExt (*.txt; *.h; *.inc)\r
- pExt (*.plm)\r
- CppX (*.cpp)\r
- DaveTm { 0,0,0,0,0,0,0,0 }\r
-\r
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'\r
-GRPOPT 1,(Other),0,0,0\r
-GRPOPT 2,(FreeRTOS),0,0,0\r
-GRPOPT 3,(Stadard Demo),0,0,0\r
-\r
-OPTFFF 1,1,2,0,0,1,1,0,<.\Startup.s><Startup.s> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,132,0,0,0,138,0,0,0,237,3,0,0,92,2,0,0 }\r
-OPTFFF 1,2,1,0,0,1,1,0,<.\ParTest\ParTest.c><ParTest.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,154,0,0,0,161,0,0,0,3,4,0,0,115,2,0,0 }\r
-OPTFFF 1,3,1,0,0,1,1,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,133,0,0,0,3,0,0,0,24,5,0,0,214,2,0,0 }\r
-OPTFFF 1,4,1,0,0,1,1,0,<.\serial\serial.c><serial.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,88,0,0,0,92,0,0,0,189,3,0,0,42,2,0,0 }\r
-OPTFFF 2,5,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
-OPTFFF 2,6,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
-OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
-OPTFFF 2,8,1,0,0,34,51,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,232,255,255,255,88,0,0,0,92,0,0,0,171,3,0,0,107,2,0,0 }\r
-OPTFFF 2,9,1,0,0,1,1,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.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,0,0,0,0,0,0,0,0,101,3,0,0,206,1,0,0 }\r
-OPTFFF 2,10,2,50331650,0,24,48,0,<.\serial\serialISRE.s><serialISRE.s> { 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,22,0,0,0,23,0,0,0,123,3,0,0,229,1,0,0 }\r
-OPTFFF 2,11,2,0,0,1,1,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> { 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,44,0,0,0,46,0,0,0,145,3,0,0,252,1,0,0 }\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
-\r
-ExtF <C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\RVDS\ARM7_LPC21xx\portmacro.h> 28,49,0,{ 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,69,0,0,0,167,3,0,0,19,2,0,0 }\r
-\r
-TARGOPT 1, (RTOSDemo)\r
- ADSCLK=12000000\r
-  OPTTT 1,1,1,0\r
-  OPTHX 1,65535,0,0,0\r
-  OPTLX 79,66,8,<.\>\r
-  OPTOX 16\r
-  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0\r
-  OPTXL 1,1,1,1,1,1,1,0,0\r
-  OPTFL 1,0,1\r
-  OPTAX 8\r
-  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 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\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,203,1,8560,0,0,0,0,1,<port.c>()()\r
-  OPTDF 0x86\r
-  OPTLE <>\r
-  OPTLC <>\r
-EndOpt\r
-\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak
deleted file mode 100644 (file)
index 2b6e5ef..0000000
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak
+++ /dev/null
@@ -1,115 +0,0 @@
-### uVision2 Project, (C) Keil Software\r
-### Do not modify !\r
-\r
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'\r
-\r
-Group (Other)\r
-Group (FreeRTOS)\r
-Group (Stadard Demo)\r
-\r
-File 1,2,<.\Startup.s><Startup.s>\r
-File 1,1,<.\ParTest\ParTest.c><ParTest.c>\r
-File 1,1,<.\main.c><main.c>\r
-File 1,1,<.\serial\serial.c><serial.c>\r
-File 2,1,<..\..\Source\tasks.c><tasks.c>\r
-File 2,1,<..\..\Source\list.c><list.c>\r
-File 2,1,<..\..\Source\queue.c><queue.c>\r
-File 2,1,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c>\r
-File 2,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>\r
-File 2,2,<.\serial\serialISRE.s><serialISRE.s>\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
-\r
-\r
-Options 1,0,0  // Target 'RTOSDemo'\r
- Device (LPC2129)\r
- Vendor (NXP (founded by Philips))\r
- Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))\r
- FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))\r
- StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))\r
- FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))\r
- DevID (3648)\r
- Rgf (LPC21xx.H)\r
- Mem ()\r
- C ()\r
- A ()\r
- RL ()\r
- OH ()\r
- DBC_IFX ()\r
- DBC_CMS ()\r
- DBC_AMS ()\r
- DBC_LMS ()\r
- UseEnv=0\r
- EnvBin ()\r
- EnvInc ()\r
- EnvLib ()\r
- EnvReg (ÿPhilips\)\r
- OrgReg (ÿPhilips\)\r
- TgStat=16\r
- OutDir (.\)\r
- OutName (RTOSDemo)\r
- GenApp=1\r
- GenLib=0\r
- GenHex=0\r
- Debug=1\r
- Browse=1\r
- LstDir (.\)\r
- HexSel=1\r
- MG32K=0\r
- TGMORE=0\r
- RunUsr 0 0 <>\r
- RunUsr 1 0 <>\r
- BrunUsr 0 0 <>\r
- BrunUsr 1 0 <>\r
- CrunUsr 0 0 <>\r
- CrunUsr 1 0 <>\r
- SVCSID <>\r
- GLFLAGS=1790\r
- ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- ACPUTYP (ARM7TDMI)\r
- RVDEV ()\r
- ADSTFLGA { 0,12,0,2,99,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }\r
- OCMADSIROM { 1,0,0,0,0,0,0,4,0 }\r
- OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }\r
- OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,64,0,0,0,0,0,0,0,0,0,0,0 }\r
- RV_STAVEC ()\r
- ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- ADSCMISC ()\r
- ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS)\r
- ADSCUDEF ()\r
- ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)\r
- ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- ADSAMISC ()\r
- ADSADEFN ()\r
- ADSAUDEF ()\r
- ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)\r
- PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- IncBld=1\r
- AlwaysBuild=0\r
- GenAsm=0\r
- AsmAsm=0\r
- PublicsOnly=0\r
- StopCode=3\r
- CustArgs ()\r
- LibMods ()\r
- ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- ADSLDTA (0x00000000)\r
- ADSLDDA (0x40000000)\r
- ADSLDSC ()\r
- ADSLDIB ()\r
- ADSLDIC ()\r
- ADSLDMC ()\r
- ADSLDIF ()\r
- ADSLDDW ()\r
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)\r
-  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()\r
- FLASH1 { 2,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0 }\r
- FLASH2 ()\r
- FLASH3 (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))\r
- FLASH4 ()\r
-EndOpt\r
-\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index 97010137c55eb2557919f1542a73f0d223d9f6ff..b42b8273c743c925c5ec0f38581987a5ef91f4cc 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -87,20 +87,10 @@
 #include "integer.h"\r
 #include "comtest2.h"\r
 #include "serial.h"\r
-\r
-#ifdef KEIL_THUMB_INTERWORK\r
-\r
-       /* \r
-               THUMB mode allows more tasks to be created without the executable \r
-               binary exceeding the limits allowed by the evaluation version of \r
-               uVision3.\r
-       */\r
-       #include "PollQ.h"\r
-       #include "BlockQ.h"\r
-       #include "semtest.h"\r
-       #include "dynamic.h"\r
-\r
-#endif /* KEIL_THUMB_INTERWORK */\r
+#include "PollQ.h"\r
+#include "BlockQ.h"\r
+#include "semtest.h"\r
+#include "dynamic.h"\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -170,15 +160,10 @@ int main( void )
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
        vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
-\r
-       #ifdef KEIL_THUMB_INTERWORK\r
-               /* When using THUMB mode we can start more tasks without the executable\r
-               exceeding the size limit imposed by the evaluation version of uVision3. */\r
-               vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
-               vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
-               vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
-               vStartDynamicPriorityTasks();\r
-       #endif\r
+       vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
+       vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
+       vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
+       vStartDynamicPriorityTasks();\r
 \r
        /* Start the check task - which is defined in this file.  This is the task\r
        that periodically checks to see that all the other tasks are executing \r
@@ -267,32 +252,25 @@ portLONG lReturn = pdPASS;
                lReturn = pdFAIL;\r
        }\r
 \r
-       #ifdef KEIL_THUMB_INTERWORK\r
+       if( xArePollingQueuesStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-               /* When using THUMB mode we can start more tasks without the executable\r
-               exceeding the size limit imposed by the evaluation version of uVision3. */\r
-       \r
-               if( xArePollingQueuesStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
-       \r
-               if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
-       \r
-               if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
+       if( xAreBlockingQueuesStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-               if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )\r
-               {\r
-                       lReturn = pdFAIL;\r
-               }\r
+       if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
-       #endif\r
+       if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )\r
+       {\r
+               lReturn = pdFAIL;\r
+       }\r
 \r
        return lReturn;\r
 }\r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
index 6fa78c85873d27befee1d40c03f7e24fb41b7119..382b85b8280ccf3465733b2686502796154957ab 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
@@ -61,14 +61,14 @@
        EXPORT vUART_ISREntry\r
 \r
        ;/* Interrupt entry must always be in ARM mode. */\r
-       AREA    |.text|, CODE, READONLY\r
        ARM\r
-       PRESERVE8\r
-\r
+       AREA    |.text|, CODE, READONLY\r
 \r
 \r
 vUART_ISREntry\r
 \r
+       PRESERVE8\r
+\r
        ; Save the context of the interrupted task.\r
        portSAVE_CONTEXT                        \r
 \r