mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-06-06 12:29:03 -04:00
Update to use new port layer.
This commit is contained in:
Richard Barry
parent
96b7e685a7
commit
6ec6b4508a
|
|
@ -20,13 +20,13 @@ OPTFFF 1,1,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c>
|
|||
OPTFFF 1,2,1,0,0,0,0,0,<..\Common\Minimal\blocktim.c><blocktim.c>
|
||||
OPTFFF 1,3,1,0,0,0,0,0,<..\Common\Minimal\death.c><death.c>
|
||||
OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c>
|
||||
OPTFFF 1,5,1,2,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,255,255,255,255,255,255,255,255,110,0,0,0,115,0,0,0,248,3,0,0,22,2,0,0 }
|
||||
OPTFFF 1,5,1,0,0,0,0,0,<.\main.c><main.c>
|
||||
OPTFFF 1,6,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c>
|
||||
OPTFFF 1,7,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c>
|
||||
OPTFFF 1,8,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c>
|
||||
OPTFFF 1,9,2,0,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S>
|
||||
OPTFFF 1,10,1,0,0,0,0,0,<.\timertest.c><timertest.c>
|
||||
OPTFFF 1,11,5,0,0,0,0,0,<.\FreeRTOSConfig.h><FreeRTOSConfig.h>
|
||||
OPTFFF 1,11,5,822083584,0,0,0,0,<.\FreeRTOSConfig.h><FreeRTOSConfig.h>
|
||||
OPTFFF 1,12,1,0,0,0,0,0,<..\Common\Minimal\GenQTest.c><GenQTest.c>
|
||||
OPTFFF 1,13,1,0,0,0,0,0,<..\Common\Minimal\QPeek.c><QPeek.c>
|
||||
OPTFFF 2,14,1,0,0,0,0,0,<.\rit128x96x4.c><rit128x96x4.c>
|
||||
|
|
@ -35,10 +35,10 @@ OPTFFF 2,16,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><dri
|
|||
OPTFFF 3,17,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c>
|
||||
OPTFFF 3,18,1,0,0,0,0,0,<..\..\Source\list.c><list.c>
|
||||
OPTFFF 3,19,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c>
|
||||
OPTFFF 3,20,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>
|
||||
OPTFFF 3,20,1,335544320,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>
|
||||
OPTFFF 3,21,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>
|
||||
OPTFFF 4,22,1,822083584,0,0,0,0,<.\webserver\uIP_Task.c><uIP_Task.c>
|
||||
OPTFFF 4,23,1,218103808,0,0,0,0,<.\webserver\emac.c><emac.c>
|
||||
OPTFFF 4,23,1,754974720,0,0,0,0,<.\webserver\emac.c><emac.c>
|
||||
OPTFFF 4,24,1,0,0,0,0,0,<.\webserver\httpd.c><httpd.c>
|
||||
OPTFFF 4,25,1,0,0,0,0,0,<.\webserver\httpd-cgi.c><httpd-cgi.c>
|
||||
OPTFFF 4,26,1,0,0,0,0,0,<.\webserver\httpd-fs.c><httpd-fs.c>
|
||||
|
|
@ -61,7 +61,7 @@ TARGOPT 1, (FreeRTOS_Demo)
|
|||
OPTAX 255
|
||||
OPTBL 0,(Data Sheet)<DATASHTS\Luminary\LM3S6965.PDF>
|
||||
OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6965)
|
||||
OPTDBG 48126,3,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
|
||||
OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
|
||||
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)(107=-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,(lmidk-agdi)(-B0 -O1792)
|
||||
|
|
|
|||
|
|
@ -8,37 +8,37 @@ Group (Libraries)
|
|||
Group (RTOS_Source)
|
||||
Group (uIP_Source)
|
||||
|
||||
File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x46AC3C5D
|
||||
File 1,1,<..\Common\Minimal\blocktim.c><blocktim.c> 0x46AC3C5D
|
||||
File 1,1,<..\Common\Minimal\death.c><death.c> 0x46ADD531
|
||||
File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x46AC3C5A
|
||||
File 1,1,<.\main.c><main.c> 0x46D709ED
|
||||
File 1,1,<.\ParTest\ParTest.c><ParTest.c> 0x46AC3C69
|
||||
File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x46AC3C59
|
||||
File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x46AC3C59
|
||||
File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x466462F2
|
||||
File 1,1,<.\timertest.c><timertest.c> 0x46D705A3
|
||||
File 1,5,<.\FreeRTOSConfig.h><FreeRTOSConfig.h> 0x46D70622
|
||||
File 1,1,<..\Common\Minimal\GenQTest.c><GenQTest.c> 0x46CB0603
|
||||
File 1,1,<..\Common\Minimal\QPeek.c><QPeek.c> 0x46CDED45
|
||||
File 2,1,<.\rit128x96x4.c><rit128x96x4.c> 0x46D28D06
|
||||
File 2,1,<.\osram128x64x4.c><osram128x64x4.c> 0x46644906
|
||||
File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib> 0x46BC6EE4
|
||||
File 3,1,<..\..\Source\tasks.c><tasks.c> 0x46CEC127
|
||||
File 3,1,<..\..\Source\list.c><list.c> 0x46AC3BCE
|
||||
File 3,1,<..\..\Source\queue.c><queue.c> 0x46D2EA0D
|
||||
File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x46AC3CA9
|
||||
File 3,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 0x46AC3C8D
|
||||
File 4,1,<.\webserver\uIP_Task.c><uIP_Task.c> 0x46D71230
|
||||
File 4,1,<.\webserver\emac.c><emac.c> 0x46D712B5
|
||||
File 4,1,<.\webserver\httpd.c><httpd.c> 0x461135EB
|
||||
File 4,1,<.\webserver\httpd-cgi.c><httpd-cgi.c> 0x46515375
|
||||
File 4,1,<.\webserver\httpd-fs.c><httpd-fs.c> 0x4560E5F3
|
||||
File 4,1,<.\webserver\http-strings.c><http-strings.c> 0x4560E5F3
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c><uip_arp.c> 0x46516ADA
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c><psock.c> 0x4560E5E6
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c><timer.c> 0x4560E5E6
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c><uip.c> 0x46CEF877
|
||||
File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>
|
||||
File 1,1,<..\Common\Minimal\blocktim.c><blocktim.c>
|
||||
File 1,1,<..\Common\Minimal\death.c><death.c>
|
||||
File 1,1,<..\Common\Minimal\integer.c><integer.c>
|
||||
File 1,1,<.\main.c><main.c>
|
||||
File 1,1,<.\ParTest\ParTest.c><ParTest.c>
|
||||
File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c>
|
||||
File 1,1,<..\Common\Minimal\semtest.c><semtest.c>
|
||||
File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S>
|
||||
File 1,1,<.\timertest.c><timertest.c>
|
||||
File 1,5,<.\FreeRTOSConfig.h><FreeRTOSConfig.h>
|
||||
File 1,1,<..\Common\Minimal\GenQTest.c><GenQTest.c>
|
||||
File 1,1,<..\Common\Minimal\QPeek.c><QPeek.c>
|
||||
File 2,1,<.\rit128x96x4.c><rit128x96x4.c>
|
||||
File 2,1,<.\osram128x64x4.c><osram128x64x4.c>
|
||||
File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib>
|
||||
File 3,1,<..\..\Source\tasks.c><tasks.c>
|
||||
File 3,1,<..\..\Source\list.c><list.c>
|
||||
File 3,1,<..\..\Source\queue.c><queue.c>
|
||||
File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>
|
||||
File 3,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>
|
||||
File 4,1,<.\webserver\uIP_Task.c><uIP_Task.c>
|
||||
File 4,1,<.\webserver\emac.c><emac.c>
|
||||
File 4,1,<.\webserver\httpd.c><httpd.c>
|
||||
File 4,1,<.\webserver\httpd-cgi.c><httpd-cgi.c>
|
||||
File 4,1,<.\webserver\httpd-fs.c><httpd-fs.c>
|
||||
File 4,1,<.\webserver\http-strings.c><http-strings.c>
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c><uip_arp.c>
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c><psock.c>
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c><timer.c>
|
||||
File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c><uip.c>
|
||||
|
||||
|
||||
Options 1,0,0 // Target 'FreeRTOS_Demo'
|
||||
|
|
@ -87,6 +87,7 @@ Options 1,0,0 // Target 'FreeRTOS_Demo'
|
|||
GLFLAGS=1790
|
||||
ADSFLGA { 16,3,0,0,0,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,0,1,0 }
|
||||
|
|
@ -94,7 +95,7 @@ Options 1,0,0 // Target 'FreeRTOS_Demo'
|
|||
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,32,0,0,1,0,0,0,0,0,0,0,0,0,0 }
|
||||
RV_STAVEC ()
|
||||
ADSCCFLG { 9,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSCCFLG { 17,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSCMISC (--diag_suppress 191,550,513,167,177,144)
|
||||
ADSCDEFN (RVDS_ARMCM3_LM3S102, "PACK_STRUCT_END=","ALIGN_STRUCT_END=")
|
||||
ADSCUDEF ()
|
||||
|
|
@ -123,10 +124,32 @@ Options 1,0,0 // Target 'FreeRTOS_Demo'
|
|||
ADSLDIF ()
|
||||
ADSLDDW ()
|
||||
OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6965)
|
||||
OPTDBG 48126,3,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
|
||||
OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
|
||||
FLASH1 { 1,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
FLASH2 (BIN\lmidk-agdi.dll)
|
||||
FLASH3 ("" ())
|
||||
FLASH4 ()
|
||||
EndOpt
|
||||
|
||||
Options 1,4,0 // Group 'uIP_Source'
|
||||
PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
IncBld=1
|
||||
AlwaysBuild=2
|
||||
GenAsm=2
|
||||
AsmAsm=2
|
||||
PublicsOnly=2
|
||||
StopCode=11
|
||||
CustArgs ()
|
||||
LibMods ()
|
||||
ADSCCFLG { 2,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSCMISC ()
|
||||
ADSCDEFN ()
|
||||
ADSCUDEF ()
|
||||
ADSCINCD ()
|
||||
ADSASFLG { 170,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
ADSAMISC ()
|
||||
ADSADEFN ()
|
||||
ADSAUDEF ()
|
||||
ADSAINCD ()
|
||||
EndOpt
|
||||
|
||||
|
|
|
|||
|
|
@ -218,11 +218,7 @@ int main( void )
|
|||
/* Configure the high frequency interrupt used to measure the interrupt
|
||||
jitter time. The Keil port does not yet include the
|
||||
configKERNEL_INTERRUPT_PRIORITY functionality so cannot perform this test. */
|
||||
#ifndef RVDS_ARMCM3_LM3S102
|
||||
{
|
||||
vSetupTimer();
|
||||
}
|
||||
#endif
|
||||
vSetupTimer();
|
||||
|
||||
/* Start the scheduler. */
|
||||
vTaskStartScheduler();
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ __Vectors
|
|||
DCD 0 ; Reserved
|
||||
DCD 0 ; Reserved
|
||||
DCD 0 ; Reserved
|
||||
DCD IntDefaultHandler ; SVCall Handler
|
||||
EXTERN vPortSVCHandler
|
||||
DCD vPortSVCHandler ; SVCall Handler
|
||||
DCD IntDefaultHandler ; Debug Monitor Handler
|
||||
DCD 0 ; Reserved
|
||||
EXTERN xPortPendSVHandler
|
||||
|
|
|
|||
Loading…
Reference in a new issue