Update to use new port layer.

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

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt
index 0302df76bb67f62a3010932aadf3cee0c6222482..10aef9fdad2a3ea0332cf9a579260ff599272f03 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Opt
@@ -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> \r
 OPTFFF 1,3,1,0,0,0,0,0,<..\Common\Minimal\death.c><death.c> \r
 OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> \r
-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 }\r
+OPTFFF 1,5,1,0,0,0,0,0,<.\main.c><main.c> \r
 OPTFFF 1,6,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
 OPTFFF 1,7,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> \r
 OPTFFF 1,8,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> \r
 OPTFFF 1,9,2,0,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S> \r
 OPTFFF 1,10,1,0,0,0,0,0,<.\timertest.c><timertest.c> \r
-OPTFFF 1,11,5,0,0,0,0,0,<.\FreeRTOSConfig.h><FreeRTOSConfig.h> \r
+OPTFFF 1,11,5,822083584,0,0,0,0,<.\FreeRTOSConfig.h><FreeRTOSConfig.h> \r
 OPTFFF 1,12,1,0,0,0,0,0,<..\Common\Minimal\GenQTest.c><GenQTest.c> \r
 OPTFFF 1,13,1,0,0,0,0,0,<..\Common\Minimal\QPeek.c><QPeek.c> \r
 OPTFFF 2,14,1,0,0,0,0,0,<.\rit128x96x4.c><rit128x96x4.c> \r
@@ -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> \r
 OPTFFF 3,18,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
 OPTFFF 3,19,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
-OPTFFF 3,20,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> \r
+OPTFFF 3,20,1,335544320,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> \r
 OPTFFF 3,21,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
 OPTFFF 4,22,1,822083584,0,0,0,0,<.\webserver\uIP_Task.c><uIP_Task.c> \r
-OPTFFF 4,23,1,218103808,0,0,0,0,<.\webserver\emac.c><emac.c> \r
+OPTFFF 4,23,1,754974720,0,0,0,0,<.\webserver\emac.c><emac.c> \r
 OPTFFF 4,24,1,0,0,0,0,0,<.\webserver\httpd.c><httpd.c> \r
 OPTFFF 4,25,1,0,0,0,0,0,<.\webserver\httpd-cgi.c><httpd-cgi.c> \r
 OPTFFF 4,26,1,0,0,0,0,0,<.\webserver\httpd-fs.c><httpd-fs.c> \r
@@ -61,7 +61,7 @@ TARGOPT 1, (FreeRTOS_Demo)
   OPTAX 255\r
   OPTBL 0,(Data Sheet)<DATASHTS\Luminary\LM3S6965.PDF>\r
   OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6965)\r
-  OPTDBG 48126,3,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()\r
+  OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()\r
   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))\r
   OPTKEY 0,(ARMDBGFLAGS)()\r
   OPTKEY 0,(lmidk-agdi)(-B0 -O1792)\r

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2 b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2
index 6ea95c4a54031538c1094041cd29fe15eeab2b35..01a8ed6ce1a745e628664f5accac91b51cab1efe 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/RTOSDemo.Uv2
@@ -8,37 +8,37 @@ Group (Libraries)
 Group (RTOS_Source)\r
 Group (uIP_Source)\r
 \r
-File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x46AC3C5D \r
-File 1,1,<..\Common\Minimal\blocktim.c><blocktim.c> 0x46AC3C5D \r
-File 1,1,<..\Common\Minimal\death.c><death.c> 0x46ADD531 \r
-File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x46AC3C5A \r
-File 1,1,<.\main.c><main.c> 0x46D709ED \r
-File 1,1,<.\ParTest\ParTest.c><ParTest.c> 0x46AC3C69 \r
-File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x46AC3C59 \r
-File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x46AC3C59 \r
-File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x466462F2 \r
-File 1,1,<.\timertest.c><timertest.c> 0x46D705A3 \r
-File 1,5,<.\FreeRTOSConfig.h><FreeRTOSConfig.h> 0x46D70622 \r
-File 1,1,<..\Common\Minimal\GenQTest.c><GenQTest.c> 0x46CB0603 \r
-File 1,1,<..\Common\Minimal\QPeek.c><QPeek.c> 0x46CDED45 \r
-File 2,1,<.\rit128x96x4.c><rit128x96x4.c> 0x46D28D06 \r
-File 2,1,<.\osram128x64x4.c><osram128x64x4.c> 0x46644906 \r
-File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib> 0x46BC6EE4 \r
-File 3,1,<..\..\Source\tasks.c><tasks.c> 0x46CEC127 \r
-File 3,1,<..\..\Source\list.c><list.c> 0x46AC3BCE \r
-File 3,1,<..\..\Source\queue.c><queue.c> 0x46D2EA0D \r
-File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x46AC3CA9 \r
-File 3,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 0x46AC3C8D \r
-File 4,1,<.\webserver\uIP_Task.c><uIP_Task.c> 0x46D71230 \r
-File 4,1,<.\webserver\emac.c><emac.c> 0x46D712B5 \r
-File 4,1,<.\webserver\httpd.c><httpd.c> 0x461135EB \r
-File 4,1,<.\webserver\httpd-cgi.c><httpd-cgi.c> 0x46515375 \r
-File 4,1,<.\webserver\httpd-fs.c><httpd-fs.c> 0x4560E5F3 \r
-File 4,1,<.\webserver\http-strings.c><http-strings.c> 0x4560E5F3 \r
-File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c><uip_arp.c> 0x46516ADA \r
-File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c><psock.c> 0x4560E5E6 \r
-File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c><timer.c> 0x4560E5E6 \r
-File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c><uip.c> 0x46CEF877 \r
+File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>\r
+File 1,1,<..\Common\Minimal\blocktim.c><blocktim.c>\r
+File 1,1,<..\Common\Minimal\death.c><death.c>\r
+File 1,1,<..\Common\Minimal\integer.c><integer.c>\r
+File 1,1,<.\main.c><main.c>\r
+File 1,1,<.\ParTest\ParTest.c><ParTest.c>\r
+File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c>\r
+File 1,1,<..\Common\Minimal\semtest.c><semtest.c>\r
+File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S>\r
+File 1,1,<.\timertest.c><timertest.c>\r
+File 1,5,<.\FreeRTOSConfig.h><FreeRTOSConfig.h>\r
+File 1,1,<..\Common\Minimal\GenQTest.c><GenQTest.c>\r
+File 1,1,<..\Common\Minimal\QPeek.c><QPeek.c>\r
+File 2,1,<.\rit128x96x4.c><rit128x96x4.c>\r
+File 2,1,<.\osram128x64x4.c><osram128x64x4.c>\r
+File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib>\r
+File 3,1,<..\..\Source\tasks.c><tasks.c>\r
+File 3,1,<..\..\Source\list.c><list.c>\r
+File 3,1,<..\..\Source\queue.c><queue.c>\r
+File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>\r
+File 3,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>\r
+File 4,1,<.\webserver\uIP_Task.c><uIP_Task.c>\r
+File 4,1,<.\webserver\emac.c><emac.c>\r
+File 4,1,<.\webserver\httpd.c><httpd.c>\r
+File 4,1,<.\webserver\httpd-cgi.c><httpd-cgi.c>\r
+File 4,1,<.\webserver\httpd-fs.c><httpd-fs.c>\r
+File 4,1,<.\webserver\http-strings.c><http-strings.c>\r
+File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip_arp.c><uip_arp.c>\r
+File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\psock.c><psock.c>\r
+File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\timer.c><timer.c>\r
+File 4,1,<..\Common\ethernet\uIP\uip-1.0\uip\uip.c><uip.c>\r
 \r
 \r
 Options 1,0,0  // Target 'FreeRTOS_Demo'\r
@@ -87,6 +87,7 @@ Options 1,0,0  // Target 'FreeRTOS_Demo'
  GLFLAGS=1790\r
  ADSFLGA { 16,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
  ACPUTYP ("Cortex-M3")\r
+ RVDEV ()\r
  ADSTFLGA { 0,12,0,2,99,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }\r
  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 }\r
  OCMADSIRAM { 0,0,0,0,32,0,0,1,0 }\r
@@ -94,7 +95,7 @@ Options 1,0,0  // Target 'FreeRTOS_Demo'
  OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }\r
  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 }\r
  RV_STAVEC ()\r
- ADSCCFLG { 9,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSCCFLG { 17,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
  ADSCMISC (--diag_suppress 191,550,513,167,177,144)\r
  ADSCDEFN (RVDS_ARMCM3_LM3S102, "PACK_STRUCT_END=","ALIGN_STRUCT_END=")\r
  ADSCUDEF ()\r
@@ -123,10 +124,32 @@ Options 1,0,0  // Target 'FreeRTOS_Demo'
  ADSLDIF ()\r
  ADSLDDW ()\r
   OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6965)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6965)\r
-  OPTDBG 48126,3,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()\r
+  OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()\r
  FLASH1 { 1,0,0,0,1,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0 }\r
  FLASH2 (BIN\lmidk-agdi.dll)\r
  FLASH3 ("" ())\r
  FLASH4 ()\r
 EndOpt\r
 \r
+Options 1,4,0  // Group 'uIP_Source'\r
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ IncBld=1\r
+ AlwaysBuild=2\r
+ GenAsm=2\r
+ AsmAsm=2\r
+ PublicsOnly=2\r
+ StopCode=11\r
+ CustArgs ()\r
+ LibMods ()\r
+ ADSCCFLG { 2,84,85,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSCMISC ()\r
+ ADSCDEFN ()\r
+ ADSCUDEF ()\r
+ ADSCINCD ()\r
+ ADSASFLG { 170,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSAMISC ()\r
+ ADSADEFN ()\r
+ ADSAUDEF ()\r
+ ADSAINCD ()\r
+EndOpt\r
+\r

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
index d347fc187eab194d93de65bbadc1b42472d19993..bd199c20995d871c4ab4716519d6610fb08399b1 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
@@ -218,11 +218,7 @@ int main( void )
        /* Configure the high frequency interrupt used to measure the interrupt\r
        jitter time.  The Keil port does not yet include the\r
        configKERNEL_INTERRUPT_PRIORITY functionality so cannot perform this test. */\r
-       #ifndef RVDS_ARMCM3_LM3S102\r
-       {\r
-               vSetupTimer();\r
-       }\r
-       #endif\r
+       vSetupTimer();\r
        \r
        /* Start the scheduler. */\r
        vTaskStartScheduler();\r

diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S
index ddedd9af5d08729c09a9d6994e45359bd9f12040..39ad11bd643745780acd72d4d0369de661a9226e 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/startup_rvmdk.S
@@ -94,7 +94,8 @@ __Vectors
         DCD     0                           ; Reserved\r
         DCD     0                           ; Reserved\r
         DCD     0                           ; Reserved\r
-        DCD     IntDefaultHandler           ; SVCall Handler\r
+               EXTERN  vPortSVCHandler\r
+        DCD     vPortSVCHandler                ; SVCall Handler\r
         DCD     IntDefaultHandler           ; Debug Monitor Handler\r
         DCD     0                           ; Reserved\r
                EXTERN  xPortPendSVHandler\r