Change to use UART1.

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

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
index 1866defa0d82e5e9c4dbbd58e76d73e10589510a..cab98af2157a0fb491d3b04249fc8838ec575c86 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -17,10 +17,10 @@ GRPOPT 2,(FreeRTOS),0,0,0
 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,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,67108864,0,0,0,0,<.\serial\serialISR.s><serialISR.s> \r
+OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
+OPTFFF 1,3,1,2,0,149,155,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,45,0,0,0,57,0,0,0,246,3,0,0,181,1,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,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
@@ -49,16 +49,15 @@ TARGOPT 1, (RTOSDemo_ARM)
   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
+  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=932,102,1307,529,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 -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
-  OPTDF 0x1000086\r
+  OPTBB 0,0,303,1,1676,0,0,0,0,1,<serial.c>()()\r
+  OPTDF 0x86\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
@@ -74,15 +73,13 @@ 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 48125,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
-  OPTDF 0x1000086\r
+  OPTDF 0x86\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 9f6576b5ae12593b4498066e609b2bb74b7d440c..d0433bf10c52adffe4f361c45e96548b1a9b4399 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
@@ -111,10 +111,10 @@ Options 1,0,0  // Target 'RTOSDemo_ARM'
  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
+  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
  FLASH4 ()\r
 EndOpt\r
 \r
@@ -147,7 +147,7 @@ Options 2,0,0  // Target 'RTOSDemo_THUMB'
  OutName (RTOSDemo)\r
  GenApp=1\r
  GenLib=0\r
- GenHex=0\r
+ GenHex=1\r
  Debug=1\r
  Browse=1\r
  LstDir (.\)\r
@@ -201,10 +201,10 @@ 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 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
+  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
  FLASH4 ()\r
 EndOpt\r
 \r

diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
index 00d256d1c2ac2414f1c70cfb38ff428e8768e990..b852e5b4e3e8468b51a3c0f590db9528e80e73aa 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg
@@ -4,36 +4,9 @@
 <h1>µVision3 Build Log</h1>\r
 <h2>Project:</h2>\r
 C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\ARM7_LPC2129_Keil_RVDS\RTOSDemo.uv2\r
-Project File Date:  10/23/2008\r
+Project File Date:  10/24/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_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 45598e3c084757b800d13dedc067d9cfcf38c1fe..b9dc2121c506bf61a48b886e069e01fd6db3ba42 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
@@ -27,7 +27,7 @@
 ### ADS-LD Output File: 'RTOSDemo.axf'\r
 ### ADS-LD Command File: 'RTOSDemo.lnp'\r
 ### Checking for dirty Components...\r
-### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000214\r
+### Creating CmdFile 'RTOSDemo.lnp', Handle=0x000004F4\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/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index b42b8273c743c925c5ec0f38581987a5ef91f4cc..a75f5b7424bece63ae55a2f3fc3a9707da931c48 100644 (file)
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -95,8 +95,8 @@
 /*-----------------------------------------------------------*/\r
 \r
 /* Constants to setup I/O and processor. */\r
-#define mainTX_ENABLE          ( ( unsigned portLONG ) 0x0001 )\r
-#define mainRX_ENABLE          ( ( unsigned portLONG ) 0x0004 )\r
+#define mainTX_ENABLE          ( ( unsigned portLONG ) 0x00010000 )    /* UART1. */\r
+#define mainRX_ENABLE          ( ( unsigned portLONG ) 0x00040000 )    /* UART1. */\r
 #define mainBUS_CLK_FULL       ( ( unsigned portCHAR ) 0x01 )\r
 #define mainLED_TO_OUTPUT      ( ( unsigned portLONG ) 0xff0000 )\r
 \r
@@ -223,7 +223,7 @@ static void prvSetupHardware( void )
        /* Perform the hardware setup required.  This is minimal as most of the\r
        setup is managed by the settings in the project file. */\r
 \r
-       /* Configure the RS2332 pins.  All other pins remain at their default of 0. */\r
+       /* Configure the UART1 pins.  All other pins remain at their default of 0. */\r
        PINSEL0 |= mainTX_ENABLE;\r
        PINSEL0 |= mainRX_ENABLE;\r
 \r