From: richardbarry Date: Fri, 24 Oct 2008 15:21:16 +0000 (+0000) Subject: Change to use UART1. X-Git-Tag: V5.1.2~173 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=def324a5f175b416e1af8fca1c297edbbca8b81a;p=freertos 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 1866defa0..cab98af21 100644 --- 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 OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s> -OPTFFF 1,2,1,0,0,0,0,0,<.\ParTest\ParTest.c> -OPTFFF 1,3,1,2,0,151,151,0,<.\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> -OPTFFF 1,5,2,67108864,0,0,0,0,<.\serial\serialISR.s> +OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c> +OPTFFF 1,3,1,2,0,149,155,0,<.\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 } +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,0,0,0,0,0,<..\..\Source\tasks.c> OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c> OPTFFF 2,8,1,0,0,0,0,0,<..\..\Source\queue.c> @@ -49,16 +49,15 @@ TARGOPT 1, (RTOSDemo_ARM) OPTBL 0,(Data Sheet) OPTBL 1,(User Manual) OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9) - OPTDBG 48125,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=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)) + 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) - OPTDF 0x1000086 + OPTBB 0,0,303,1,1676,0,0,0,0,1,()() + OPTDF 0x86 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) @@ -74,15 +73,13 @@ 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 48125,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) - OPTDF 0x1000086 + OPTDF 0x86 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 9f6576b5a..d0433bf10 100644 --- 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 () 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)) + 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)) FLASH4 () EndOpt @@ -147,7 +147,7 @@ Options 2,0,0 // Target 'RTOSDemo_THUMB' OutName (RTOSDemo) GenApp=1 GenLib=0 - GenHex=0 + GenHex=1 Debug=1 Browse=1 LstDir (.\) @@ -201,10 +201,10 @@ Options 2,0,0 // Target 'RTOSDemo_THUMB' 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)) + 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)) FLASH4 () EndOpt diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg index 00d256d1c..b852e5b4e 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg +++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.plg @@ -4,36 +4,9 @@

µVision3 Build Log

Project:

C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\ARM7_LPC2129_Keil_RVDS\RTOSDemo.uv2 -Project File Date: 10/23/2008 +Project File Date: 10/24/2008

Output:

-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_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 45598e3c0..b9dc2121c 100644 --- 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' ### ADS-LD Command File: 'RTOSDemo.lnp' ### Checking for dirty Components... -### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000214 +### Creating CmdFile 'RTOSDemo.lnp', Handle=0x000004F4 ### 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/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c index b42b8273c..a75f5b742 100644 --- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c +++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c @@ -95,8 +95,8 @@ /*-----------------------------------------------------------*/ /* Constants to setup I/O and processor. */ -#define mainTX_ENABLE ( ( unsigned portLONG ) 0x0001 ) -#define mainRX_ENABLE ( ( unsigned portLONG ) 0x0004 ) +#define mainTX_ENABLE ( ( unsigned portLONG ) 0x00010000 ) /* UART1. */ +#define mainRX_ENABLE ( ( unsigned portLONG ) 0x00040000 ) /* UART1. */ #define mainBUS_CLK_FULL ( ( unsigned portCHAR ) 0x01 ) #define mainLED_TO_OUTPUT ( ( unsigned portLONG ) 0xff0000 ) @@ -223,7 +223,7 @@ static void prvSetupHardware( void ) /* Perform the hardware setup required. This is minimal as most of the setup is managed by the settings in the project file. */ - /* Configure the RS2332 pins. All other pins remain at their default of 0. */ + /* Configure the UART1 pins. All other pins remain at their default of 0. */ PINSEL0 |= mainTX_ENABLE; PINSEL0 |= mainRX_ENABLE;