From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Thu, 23 Oct 2008 15:59:50 +0000 (+0000)
Subject: Set up to work in both ARM and THUMB modes.
X-Git-Tag: V5.1.2~179
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7a4dc7361ee5c6416f3b99e4c4d6a66d94225167;p=freertos

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 cb1378dc7..1866defa0 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -10,28 +10,58 @@
  CppX (*.cpp)
  DaveTm { 0,0,0,0,0,0,0,0 }
 
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'
+Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'
+Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'
 GRPOPT 1,(Other),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><Startup.s> 
 OPTFFF 1,2,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> 
-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 }
+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 }
 OPTFFF 1,4,1,234881024,0,0,0,0,<.\serial\serial.c><serial.c> 
-OPTFFF 1,5,2,486539264,0,0,0,0,<.\serial\serialISR.s><serialISR.s> 
+OPTFFF 1,5,2,67108864,0,0,0,0,<.\serial\serialISR.s><serialISR.s> 
 OPTFFF 2,6,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> 
 OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c><list.c> 
 OPTFFF 2,8,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> 
 OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> 
 OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 
-OPTFFF 2,11,2,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> 
+OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> 
 OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> 
 OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> 
 OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> 
+OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> 
+OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c><dynamic.c> 
+OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> 
+OPTFFF 3,18,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> 
 
 
-TARGOPT 1, (RTOSDemo)
+TARGOPT 1, (RTOSDemo_ARM)
+ ADSCLK=12000000
+  OPTTT 1,1,1,0
+  OPTHX 1,65535,0,0,0
+  OPTLX 79,66,8,<.\>
+  OPTOX 16
+  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
+  OPTXL 1,1,1,1,1,1,1,0,0
+  OPTFL 1,0,0
+  OPTAX 8
+  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
+  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+  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)
+  OPTDF 0x1000086
+  OPTLE <>
+  OPTLC <>
+  OPTLA 0,((Port1 & 0x10000) >> 16)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)
+  OPTLA 1,((Port1 & 0x20000) >> 17)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)
+  OPTLA 2,((Port1 & 0x40000) >> 18)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000024030000)
+EndOpt
+
+TARGOPT 2, (RTOSDemo_THUMB)
  ADSCLK=12000000
   OPTTT 1,1,1,0
   OPTHX 1,65535,0,0,0
@@ -47,8 +77,12 @@ TARGOPT 1, (RTOSDemo)
   OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
   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)
-  OPTDF 0x86
+  OPTDF 0x1000086
   OPTLE <>
   OPTLC <>
+  OPTLA 0,((Port1 & 0x10000) >> 16)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)
+  OPTLA 1,((Port1 & 0x20000) >> 17)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)
+  OPTLA 2,((Port1 & 0x40000) >> 18)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000054220000)
 EndOpt
 
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2 b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
index fb042d75d..9f6576b5a 100644
--- 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
 ### Do not modify !
 
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'
+Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'
+Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'
 
 Group (Other)
 Group (FreeRTOS)
@@ -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>
 File 3,1,<..\Common\Minimal\integer.c><integer.c>
 File 3,1,<..\Common\Minimal\comtest.c><comtest.c>
+File 3,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>
+File 3,1,<..\Common\Minimal\dynamic.c><dynamic.c>
+File 3,1,<..\Common\Minimal\PollQ.c><PollQ.c>
+File 3,1,<..\Common\Minimal\semtest.c><semtest.c>
 
 
-Options 1,0,0  // Target 'RTOSDemo'
+Options 1,0,0  // Target 'RTOSDemo_ARM'
  Device (LPC2129)
  Vendor (NXP (founded by Philips))
  Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
@@ -113,3 +118,93 @@ Options 1,0,0  // Target 'RTOSDemo'
  FLASH4 ()
 EndOpt
 
+Options 2,0,0  // Target 'RTOSDemo_THUMB'
+ Device (LPC2129)
+ Vendor (NXP (founded by Philips))
+ Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
+ FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
+ StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
+ FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
+ DevID (3648)
+ Rgf (LPC21xx.H)
+ Mem ()
+ C ()
+ A ()
+ RL ()
+ OH ()
+ DBC_IFX ()
+ DBC_CMS ()
+ DBC_AMS ()
+ DBC_LMS ()
+ UseEnv=0
+ EnvBin ()
+ EnvInc ()
+ EnvLib ()
+ EnvReg (ÿPhilips\)
+ OrgReg (ÿPhilips\)
+ TgStat=16
+ OutDir (.\)
+ OutName (RTOSDemo)
+ GenApp=1
+ GenLib=0
+ GenHex=0
+ Debug=1
+ Browse=1
+ LstDir (.\)
+ HexSel=1
+ MG32K=0
+ TGMORE=0
+ RunUsr 0 0 <>
+ RunUsr 1 0 <>
+ BrunUsr 0 0 <>
+ BrunUsr 1 0 <>
+ CrunUsr 0 0 <>
+ CrunUsr 1 0 <>
+ SVCSID <>
+ GLFLAGS=1790
+ ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ACPUTYP (ARM7TDMI)
+ RVDEV ()
+ ADSTFLGA { 0,12,0,2,99,4,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }
+ 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 }
+ OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }
+ OCMADSIROM { 1,0,0,0,0,0,0,4,0 }
+ OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }
+ 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 }
+ RV_STAVEC ()
+ ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSCMISC ()
+ ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS KEIL_THUMB_INTERWORK)
+ ADSCUDEF ()
+ ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)
+ ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSAMISC ()
+ ADSADEFN ()
+ ADSAUDEF ()
+ ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=1
+ AlwaysBuild=0
+ GenAsm=0
+ AsmAsm=0
+ PublicsOnly=0
+ StopCode=3
+ CustArgs ()
+ LibMods ()
+ ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ ADSLDTA (0x00000000)
+ ADSLDDA (0x40000000)
+ ADSLDSC ()
+ ADSLDIB ()
+ ADSLDIC ()
+ ADSLDMC ()
+ ADSLDIF ()
+ ADSLDDW ()
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+ FLASH1 { 2,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0 }
+ FLASH2 ()
+ FLASH3 (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
+ FLASH4 ()
+EndOpt
+
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
index 9b87df214..00d256d1c 100644
--- 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
 
 <h2>Output:</h2>
+Build target 'RTOSDemo_THUMB'
+assembling Startup.s...
+compiling ParTest.c...
+compiling main.c...
+compiling serial.c...
+assembling serialISR.s...
+compiling tasks.c...
+compiling list.c...
+compiling queue.c...
+compiling port.c...
+compiling heap_2.c...
+assembling portASM.s...
+compiling flash.c...
+compiling integer.c...
+compiling comtest.c...
+compiling BlockQ.c...
+compiling dynamic.c...
+compiling PollQ.c...
+compiling semtest.c...
+linking...
+RTOSDemo.axf: Error: L6218E: Undefined symbol vPortYield (referred from tasks.o).
+Target not created
+Build target 'RTOSDemo_THUMB'
+assembling portASM.s...
+linking...
+Program Size: Code=10844 RO-data=32 RW-data=208 ZI-data=15696  
+"RTOSDemo.axf" - 0 Error(s), 0 Warning(s).
 Clean started: Project: 'RTOSDemo'
-   deleting intermediate output files for target 'RTOSDemo'
+   deleting intermediate output files for target 'RTOSDemo_ARM'
+   deleting intermediate output files for target 'RTOSDemo_THUMB'
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
index 1cc2f2451..45598e3c0 100644
--- 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"'
 ### 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" --device DARMP --strict --scatter "RTOSDemo.sct" 

+"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" 

 --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=0x0000044C
+### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000214
 ### 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/RTOSDemo_Opt.Bak b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Opt.Bak
deleted file mode 100644
index 97e4c82d6..000000000
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Opt.Bak
+++ /dev/null
@@ -1,56 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
- cExt (*.c)
- aExt (*.s*; *.src; *.a*)
- oExt (*.obj)
- lExt (*.lib)
- tExt (*.txt; *.h; *.inc)
- pExt (*.plm)
- CppX (*.cpp)
- DaveTm { 0,0,0,0,0,0,0,0 }
-
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'
-GRPOPT 1,(Other),0,0,0
-GRPOPT 2,(FreeRTOS),0,0,0
-GRPOPT 3,(Stadard Demo),0,0,0
-
-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 }
-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 }
-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 }
-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 }
-OPTFFF 2,5,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> 
-OPTFFF 2,6,1,0,0,0,0,0,<..\..\Source\list.c><list.c> 
-OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> 
-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 }
-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 }
-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 }
-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 }
-OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> 
-OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> 
-OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> 
-
-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 }
-
-TARGOPT 1, (RTOSDemo)
- ADSCLK=12000000
-  OPTTT 1,1,1,0
-  OPTHX 1,65535,0,0,0
-  OPTLX 79,66,8,<.\>
-  OPTOX 16
-  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
-  OPTXL 1,1,1,1,1,1,1,0,0
-  OPTFL 1,0,1
-  OPTAX 8
-  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
-  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
-  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,203,1,8560,0,0,0,0,1,<port.c>()()
-  OPTDF 0x86
-  OPTLE <>
-  OPTLC <>
-EndOpt
-
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak
deleted file mode 100644
index 2b6e5efec..000000000
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Uv2.Bak
+++ /dev/null
@@ -1,115 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
-Target (RTOSDemo), 0x0004 // Tools: 'ARM-ADS'
-
-Group (Other)
-Group (FreeRTOS)
-Group (Stadard Demo)
-
-File 1,2,<.\Startup.s><Startup.s>
-File 1,1,<.\ParTest\ParTest.c><ParTest.c>
-File 1,1,<.\main.c><main.c>
-File 1,1,<.\serial\serial.c><serial.c>
-File 2,1,<..\..\Source\tasks.c><tasks.c>
-File 2,1,<..\..\Source\list.c><list.c>
-File 2,1,<..\..\Source\queue.c><queue.c>
-File 2,1,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c>
-File 2,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>
-File 2,2,<.\serial\serialISRE.s><serialISRE.s>
-File 2,2,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s>
-File 3,1,<..\Common\Minimal\flash.c><flash.c>
-File 3,1,<..\Common\Minimal\integer.c><integer.c>
-File 3,1,<..\Common\Minimal\comtest.c><comtest.c>
-
-
-Options 1,0,0  // Target 'RTOSDemo'
- Device (LPC2129)
- Vendor (NXP (founded by Philips))
- Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
- FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
- StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
- FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
- DevID (3648)
- Rgf (LPC21xx.H)
- Mem ()
- C ()
- A ()
- RL ()
- OH ()
- DBC_IFX ()
- DBC_CMS ()
- DBC_AMS ()
- DBC_LMS ()
- UseEnv=0
- EnvBin ()
- EnvInc ()
- EnvLib ()
- EnvReg (ÿPhilips\)
- OrgReg (ÿPhilips\)
- TgStat=16
- OutDir (.\)
- OutName (RTOSDemo)
- GenApp=1
- GenLib=0
- GenHex=0
- Debug=1
- Browse=1
- LstDir (.\)
- HexSel=1
- MG32K=0
- TGMORE=0
- RunUsr 0 0 <>
- RunUsr 1 0 <>
- BrunUsr 0 0 <>
- BrunUsr 1 0 <>
- CrunUsr 0 0 <>
- CrunUsr 1 0 <>
- SVCSID <>
- GLFLAGS=1790
- ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ACPUTYP (ARM7TDMI)
- RVDEV ()
- ADSTFLGA { 0,12,0,2,99,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }
- 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 }
- OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }
- OCMADSIROM { 1,0,0,0,0,0,0,4,0 }
- OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }
- 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 }
- RV_STAVEC ()
- ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSCMISC ()
- ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS)
- ADSCUDEF ()
- ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)
- ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSAMISC ()
- ADSADEFN ()
- ADSAUDEF ()
- ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)
- PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- IncBld=1
- AlwaysBuild=0
- GenAsm=0
- AsmAsm=0
- PublicsOnly=0
- StopCode=3
- CustArgs ()
- LibMods ()
- ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSLDTA (0x00000000)
- ADSLDDA (0x40000000)
- ADSLDSC ()
- ADSLDIB ()
- ADSLDIC ()
- ADSLDMC ()
- ADSLDIF ()
- ADSLDDW ()
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 48125,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
- FLASH1 { 2,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0 }
- FLASH2 ()
- FLASH3 (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
- FLASH4 ()
-EndOpt
-
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index 97010137c..b42b8273c 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -87,20 +87,10 @@
 #include "integer.h"
 #include "comtest2.h"
 #include "serial.h"
-
-#ifdef KEIL_THUMB_INTERWORK
-
-	/* 
-		THUMB mode allows more tasks to be created without the executable 
-		binary exceeding the limits allowed by the evaluation version of 
-		uVision3.
-	*/
-	#include "PollQ.h"
-	#include "BlockQ.h"
-	#include "semtest.h"
-	#include "dynamic.h"
-
-#endif /* KEIL_THUMB_INTERWORK */
+#include "PollQ.h"
+#include "BlockQ.h"
+#include "semtest.h"
+#include "dynamic.h"
 
 /*-----------------------------------------------------------*/
 
@@ -170,15 +160,10 @@ int main( void )
 	vStartIntegerMathTasks( tskIDLE_PRIORITY );
 	vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );
 	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
-
-	#ifdef KEIL_THUMB_INTERWORK
-		/* When using THUMB mode we can start more tasks without the executable
-		exceeding the size limit imposed by the evaluation version of uVision3. */
-		vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
-		vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-		vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
-		vStartDynamicPriorityTasks();
-	#endif
+	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+	vStartDynamicPriorityTasks();
 
 	/* Start the check task - which is defined in this file.  This is the task
 	that periodically checks to see that all the other tasks are executing 
@@ -267,32 +252,25 @@ portLONG lReturn = pdPASS;
 		lReturn = pdFAIL;
 	}
 
-	#ifdef KEIL_THUMB_INTERWORK
+	if( xArePollingQueuesStillRunning() != pdTRUE )
+	{
+		lReturn = pdFAIL;
+	}
 
-		/* When using THUMB mode we can start more tasks without the executable
-		exceeding the size limit imposed by the evaluation version of uVision3. */
-	
-		if( xArePollingQueuesStillRunning() != pdTRUE )
-		{
-			lReturn = pdFAIL;
-		}
-	
-		if( xAreBlockingQueuesStillRunning() != pdTRUE )
-		{
-			lReturn = pdFAIL;
-		}
-	
-		if( xAreSemaphoreTasksStillRunning() != pdTRUE )
-		{
-			lReturn = pdFAIL;
-		}
+	if( xAreBlockingQueuesStillRunning() != pdTRUE )
+	{
+		lReturn = pdFAIL;
+	}
 
-		if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
-		{
-			lReturn = pdFAIL;
-		}
+	if( xAreSemaphoreTasksStillRunning() != pdTRUE )
+	{
+		lReturn = pdFAIL;
+	}
 
-	#endif
+	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
+	{
+		lReturn = pdFAIL;
+	}
 
 	return lReturn;
 }
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
index 6fa78c858..382b85b82 100644
--- 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
 
 	;/* Interrupt entry must always be in ARM mode. */
-	AREA	|.text|, CODE, READONLY
 	ARM
-	PRESERVE8
-
+	AREA	|.text|, CODE, READONLY
 
 
 vUART_ISREntry
 
+	PRESERVE8
+
 	; Save the context of the interrupted task.
 	portSAVE_CONTEXT