Update to use new port layer.

pull/1/head
Richard Barry 17 years ago
parent 7e3a04602d
commit 96b7e685a7

@ -80,7 +80,7 @@ to exclude the API function. */
#define INCLUDE_vTaskDelayUntil 1 #define INCLUDE_vTaskDelayUntil 1
#define INCLUDE_vTaskDelay 1 #define INCLUDE_vTaskDelay 1
#define configKERNEL_INTERRUPT_PRIORITY 255
#endif /* FREERTOS_CONFIG_H */ #endif /* FREERTOS_CONFIG_H */

@ -12,13 +12,13 @@
Target (FreeRTOS_Demo), 0x0004 // Tools: 'ARM-ADS' Target (FreeRTOS_Demo), 0x0004 // Tools: 'ARM-ADS'
GRPOPT 1,(Demo_Source),1,0,0 GRPOPT 1,(Demo_Source),1,0,0
GRPOPT 2,(Libraries),1,0,0 GRPOPT 2,(Libraries),0,0,0
GRPOPT 3,(RTOS_Source),1,0,0 GRPOPT 3,(RTOS_Source),0,0,0
GRPOPT 4,(Documentation),1,0,0 GRPOPT 4,(Documentation),0,0,0
OPTFFF 1,1,2,0,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S> OPTFFF 1,1,2,301989888,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S>
OPTFFF 1,2,1,167772160,0,0,0,0,<.\LuminaryCode\osram96x16.c><osram96x16.c> OPTFFF 1,2,1,167772160,0,0,0,0,<.\LuminaryCode\osram96x16.c><osram96x16.c>
OPTFFF 1,3,1,0,0,0,0,0,<.\main.c><main.c> OPTFFF 1,3,1,2,0,148,161,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,100,0,0,0,12,0,0,0,27,4,0,0,178,1,0,0 }
OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c>
OPTFFF 1,5,1,989855744,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> OPTFFF 1,5,1,989855744,0,0,0,0,<..\Common\Minimal\integer.c><integer.c>
OPTFFF 1,6,1,939524096,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> OPTFFF 1,6,1,939524096,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c>
@ -28,10 +28,9 @@ OPTFFF 2,9,4,0,0,0,0,0,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><dr
OPTFFF 3,10,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> OPTFFF 3,10,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c>
OPTFFF 3,11,1,0,0,0,0,0,<..\..\Source\list.c><list.c> OPTFFF 3,11,1,0,0,0,0,0,<..\..\Source\list.c><list.c>
OPTFFF 3,12,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> OPTFFF 3,12,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c>
OPTFFF 3,13,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> OPTFFF 3,13,1,335544320,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>
OPTFFF 4,14,5,2,0,1,1,0,<.\readme.txt><readme.txt> { 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,99,0,0,0,22,4,0,0,64,2,0,0 } OPTFFF 4,14,5,0,0,0,0,0,<.\readme.txt><readme.txt>
ExtF <.\readme.txt> 1,1,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,99,0,0,0,22,4,0,0,64,2,0,0 }
TARGOPT 1, (FreeRTOS_Demo) TARGOPT 1, (FreeRTOS_Demo)
ADSCLK=50000000 ADSCLK=50000000
@ -42,9 +41,10 @@ TARGOPT 1, (FreeRTOS_Demo)
OPTLT 1,1,1,0,1,1,0,1,0,0,0,0 OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
OPTXL 1,1,1,1,1,1,1,0,0 OPTXL 1,1,1,1,1,1,1,0,0
OPTFL 1,0,1 OPTFL 1,0,1
OPTAX 0
OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S811)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S811) OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S811)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S811)
OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()() OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
OPTKEY 0,(DLGTARM)() 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)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(163=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1013=-1,-1,-1,-1,0)(171=-1,-1,-1,-1,0)(172=-1,-1,-1,-1,0)(173=-1,-1,-1,-1,0)(1014=-1,-1,-1,-1,0)(1016=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0))
OPTKEY 0,(ARMDBGFLAGS)(-T5F) OPTKEY 0,(ARMDBGFLAGS)(-T5F)
OPTKEY 0,(LMIDK-AGDI)(-B0 -O1792) OPTKEY 0,(LMIDK-AGDI)(-B0 -O1792)
OPTDF 0x84 OPTDF 0x84

@ -8,20 +8,20 @@ Group (Libraries)
Group (RTOS_Source) Group (RTOS_Source)
Group (Documentation) Group (Documentation)
File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x45431C95 File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S>
File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c> 0x452BAD20 File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c>
File 1,1,<.\main.c><main.c> 0x452A35C1 File 1,1,<.\main.c><main.c>
File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x452A35D8 File 1,1,<..\Common\Minimal\semtest.c><semtest.c>
File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x452A35D8 File 1,1,<..\Common\Minimal\integer.c><integer.c>
File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x452A35D8 File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c>
File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x4538ECC1 File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>
File 1,1,<.\heap\heap_1.c><heap_1.c> 0x45431CD6 File 1,1,<.\heap\heap_1.c><heap_1.c>
File 2,4,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><driverlib.lib> 0x44F892D1 File 2,4,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><driverlib.lib>
File 3,1,<..\..\Source\tasks.c><tasks.c> 0x452A35A8 File 3,1,<..\..\Source\tasks.c><tasks.c>
File 3,1,<..\..\Source\list.c><list.c> 0x452A35BA File 3,1,<..\..\Source\list.c><list.c>
File 3,1,<..\..\Source\queue.c><queue.c> 0x452A35BA File 3,1,<..\..\Source\queue.c><queue.c>
File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x452A35FB File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>
File 4,5,<.\readme.txt><readme.txt> 0x44FC00DA File 4,5,<.\readme.txt><readme.txt>
Options 1,0,0 // Target 'FreeRTOS_Demo' Options 1,0,0 // Target 'FreeRTOS_Demo'
@ -64,11 +64,14 @@ Options 1,0,0 // Target 'FreeRTOS_Demo'
RunUsr 1 0 <> RunUsr 1 0 <>
BrunUsr 0 0 <> BrunUsr 0 0 <>
BrunUsr 1 0 <> BrunUsr 1 0 <>
CrunUsr 0 0 <>
CrunUsr 1 0 <>
SVCSID <> SVCSID <>
GLFLAGS=1790 GLFLAGS=1790
ADSFLGA { 176,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSFLGA { 176,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
ACPUTYP (Cortex-M3) ACPUTYP ("Cortex-M3")
ADSTFLGA { 0,12,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } 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 } 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,32,0,0 } OCMADSIRAM { 0,0,0,0,32,0,32,0,0 }
OCMADSIROM { 1,0,0,0,0,0,0,1,0 } OCMADSIROM { 1,0,0,0,0,0,0,1,0 }

@ -82,7 +82,8 @@ HeapMem
; The vector table. ; The vector table.
; ;
;****************************************************************************** ;******************************************************************************
Vectors EXPORT __Vectors
__Vectors
DCD StackMem + Stack ; Top of Stack DCD StackMem + Stack ; Top of Stack
DCD Reset_Handler ; Reset Handler DCD Reset_Handler ; Reset Handler
DCD NmiSR ; NMI Handler DCD NmiSR ; NMI Handler
@ -94,7 +95,7 @@ Vectors
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD IntDefaultHandler ; SVCall Handler DCD vPortSVCHandler ; SVCall Handler
DCD IntDefaultHandler ; Debug Monitor Handler DCD IntDefaultHandler ; Debug Monitor Handler
DCD 0 ; Reserved DCD 0 ; Reserved
DCD xPortPendSVHandler ; PendSV Handler DCD xPortPendSVHandler ; PendSV Handler
@ -147,6 +148,7 @@ Reset_Handler
IMPORT vUART_ISR IMPORT vUART_ISR
IMPORT xPortPendSVHandler IMPORT xPortPendSVHandler
IMPORT xPortSysTickHandler IMPORT xPortSysTickHandler
IMPORT vPortSVCHandler
LDR R0, =__main LDR R0, =__main
BX R0 BX R0

Loading…
Cancel
Save