From: richardbarry Date: Mon, 24 Mar 2008 10:46:56 +0000 (+0000) Subject: Update to use new port layer. X-Git-Tag: V4.8.0~15 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48fd804ce18f608fd3940ae6c51bf5b1d5200b0f;p=freertos Update to use new port layer. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@267 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Opt b/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Opt index 548f3b365..cdd71761e 100644 --- a/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Opt +++ b/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Opt @@ -11,8 +11,8 @@ DaveTm { 0,0,0,0,0,0,0,0 } Target (LM3S1xx), 0x0004 // Tools: 'ARM-ADS' -GRPOPT 1,(Source),1,0,0 -GRPOPT 2,(Demo),1,0,0 +GRPOPT 1,(Source),0,0,0 +GRPOPT 2,(Demo),0,0,0 OPTFFF 1,1,1,0,0,0,0,0,<..\..\Source\croutine.c> OPTFFF 1,2,1,0,0,0,0,0,<..\..\Source\list.c> @@ -25,7 +25,7 @@ OPTFFF 2,8,2,0,0,0,0,0,<.\init\Startup.s> OPTFFF 2,9,1,0,0,0,0,0,<..\Common\Minimal\crflash.c> OPTFFF 2,10,1,0,0,0,0,0,<.\ParTest\ParTest.c> OPTFFF 2,11,1,0,0,0,0,0,<.\include\pdc.c> -OPTFFF 2,12,4,0,0,0,0,0, +OPTFFF 2,12,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> TARGOPT 1, (LM3S1xx) @@ -37,10 +37,14 @@ TARGOPT 1, (LM3S1xx) 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 0 OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S101)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S101) OPTDBG 49150,1,()()()()()()()()()() (BIN\UL2CM3.DLL)()()() - OPTKEY 0,(UL2CM3)(-U -O14 -S0 -C-1 -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_8 -FS00 -FL02000) - OPTDF 0x0 + OPTKEY 0,(DLGTARM)((1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(102=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1014=-1,-1,-1,-1,0)(1016=-1,-1,-1,-1,0)) + OPTKEY 0,(ARMDBGFLAGS)() + OPTKEY 0,(DLGUARM)((105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)) + OPTKEY 0,(UL2CM3)(-UU0226F8E -O14 -S0 -C0 -N00("ARM CoreSight JTAG-DP") -D00(1BA00477) -L00(4) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP7 -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_8 -FS00 -FL02000) + OPTDF 0x80 OPTLE <> OPTLC <> EndOpt diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2 b/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2 index 3afecbd5b..e72477a97 100644 --- a/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2 +++ b/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2 @@ -6,18 +6,18 @@ Target (LM3S1xx), 0x0004 // Tools: 'ARM-ADS' Group (Source) Group (Demo) -File 1,1,<..\..\Source\croutine.c> 0x440790D8 -File 1,1,<..\..\Source\list.c> 0x440790D8 -File 1,1,<..\..\Source\queue.c> 0x440790D8 -File 1,1,<..\..\Source\tasks.c> 0x440790D8 -File 1,1,<..\..\Source\portable\MemMang\heap_1.c> 0x440790D8 -File 1,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c> 0x440790D8 -File 2,1,<.\main.c> 0x441EE317 -File 2,2,<.\init\Startup.s> 0x44172A20 -File 2,1,<..\Common\Minimal\crflash.c> 0x440790D8 -File 2,1,<.\ParTest\ParTest.c> 0x440790D8 -File 2,1,<.\include\pdc.c> 0x44187439 -File 2,4, 0x44206F94 +File 1,1,<..\..\Source\croutine.c> +File 1,1,<..\..\Source\list.c> +File 1,1,<..\..\Source\queue.c> +File 1,1,<..\..\Source\tasks.c> +File 1,1,<..\..\Source\portable\MemMang\heap_1.c> +File 1,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c> +File 2,1,<.\main.c> +File 2,2,<.\init\Startup.s> +File 2,1,<..\Common\Minimal\crflash.c> +File 2,1,<.\ParTest\ParTest.c> +File 2,1,<.\include\pdc.c> +File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib> Options 1,0,0 // Target 'LM3S1xx' @@ -44,7 +44,7 @@ Options 1,0,0 // Target 'LM3S1xx' EnvLib () EnvReg (ÿLuminary\) OrgReg (ÿLuminary\) - TgStat=0 + TgStat=16 OutDir (.\uvision\) OutName (RTOSDemo) GenApp=1 @@ -60,11 +60,14 @@ Options 1,0,0 // Target 'LM3S1xx' 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 (Cortex-M3) - ADSTFLGA { 0,12,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } + ACPUTYP ("Cortex-M3") + 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,32,0,8,0,0 } OCMADSIROM { 1,0,0,0,0,0,32,0,0 } diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h index 0a54160ac..f22b4442b 100644 --- a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h @@ -80,7 +80,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelayUntil 0 #define INCLUDE_vTaskDelay 1 - +#define configKERNEL_INTERRUPT_PRIORITY 255 #endif /* FREERTOS_CONFIG_H */ diff --git a/Demo/CORTEX_LM3S102_KEIL/init/Startup.s b/Demo/CORTEX_LM3S102_KEIL/init/Startup.s index c58ab3d14..d5dea8bc5 100644 --- a/Demo/CORTEX_LM3S102_KEIL/init/Startup.s +++ b/Demo/CORTEX_LM3S102_KEIL/init/Startup.s @@ -67,9 +67,11 @@ DCGC2_OFS EQU 0x0128 ; Deep-Sleep-Mode Clock Gating Control 2 IMPORT xPortPendSVHandler IMPORT xPortSysTickHandler IMPORT vUART_ISR + IMPORT vPortSVCHandler ; Vector Table -Vectors DCD Stack_Mem + Stack_Size ; Top of Stack + EXPORT __Vectors +__Vectors DCD Stack_Mem + Stack_Size ; Top of Stack DCD Reset_Handler ; Reset Handler DCD NmiSR ; NMI Handler DCD DefaultISR ; Hard Fault Handler @@ -80,7 +82,7 @@ Vectors DCD Stack_Mem + Stack_Size ; Top of Stack DCD 0 ; Reserved DCD 0 ; Reserved DCD 0 ; Reserved - DCD 0 ; SVCall Handler + DCD vPortSVCHandler ; SVCall Handler DCD DefaultISR ; Debug Monitor Handler DCD 0 ; Reserved DCD xPortPendSVHandler ; PendSV Handler