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 548f3b365f17c5b26c154b7f5fdfeb5afdba9dcd..cdd71761eab7e4df3b5e88c5a9cf2ae4ec81eb0d 100644 (file)
--- 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 }\r
 \r
 Target (LM3S1xx), 0x0004 // Tools: 'ARM-ADS'\r
-GRPOPT 1,(Source),1,0,0\r
-GRPOPT 2,(Demo),1,0,0\r
+GRPOPT 1,(Source),0,0,0\r
+GRPOPT 2,(Demo),0,0,0\r
 \r
 OPTFFF 1,1,1,0,0,0,0,0,<..\..\Source\croutine.c><croutine.c> \r
 OPTFFF 1,2,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
@@ -25,7 +25,7 @@ OPTFFF 2,8,2,0,0,0,0,0,<.\init\Startup.s><Startup.s>
 OPTFFF 2,9,1,0,0,0,0,0,<..\Common\Minimal\crflash.c><crflash.c> \r
 OPTFFF 2,10,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> \r
 OPTFFF 2,11,1,0,0,0,0,0,<.\include\pdc.c><pdc.c> \r
-OPTFFF 2,12,4,0,0,0,0,0,<C:\Keil\ARM\RV30\LIB\Luminary\DriverLib.lib><DriverLib.lib> \r
+OPTFFF 2,12,4,0,0,0,0,0,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib> \r
 \r
 \r
 TARGOPT 1, (LM3S1xx)\r
@@ -37,10 +37,14 @@ TARGOPT 1, (LM3S1xx)
   OPTLT 1,1,1,0,1,1,0,1,0,0,0,0\r
   OPTXL 1,1,1,1,1,1,1,0,0\r
   OPTFL 1,0,1\r
+  OPTAX 0\r
   OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S101)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S101)\r
   OPTDBG 49150,1,()()()()()()()()()() (BIN\UL2CM3.DLL)()()()\r
-  OPTKEY 0,(UL2CM3)(-U -O14 -S0 -C-1 -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_8 -FS00 -FL02000)\r
-  OPTDF 0x0\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)(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))\r
+  OPTKEY 0,(ARMDBGFLAGS)()\r
+  OPTKEY 0,(DLGUARM)((105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0))\r
+  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)\r
+  OPTDF 0x80\r
   OPTLE <>\r
   OPTLC <>\r
 EndOpt\r

diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2 b/Demo/CORTEX_LM3S102_KEIL/FreeRTOS.Uv2
index 3afecbd5bf21c5359c96f54ed2c83c30475e01ba..e72477a9760a343fa250c4340c3d01a7248df229 100644 (file)
--- 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)\r
 Group (Demo)\r
 \r
-File 1,1,<..\..\Source\croutine.c><croutine.c> 0x440790D8 \r
-File 1,1,<..\..\Source\list.c><list.c> 0x440790D8 \r
-File 1,1,<..\..\Source\queue.c><queue.c> 0x440790D8 \r
-File 1,1,<..\..\Source\tasks.c><tasks.c> 0x440790D8 \r
-File 1,1,<..\..\Source\portable\MemMang\heap_1.c><heap_1.c> 0x440790D8 \r
-File 1,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x440790D8 \r
-File 2,1,<.\main.c><main.c> 0x441EE317 \r
-File 2,2,<.\init\Startup.s><Startup.s> 0x44172A20 \r
-File 2,1,<..\Common\Minimal\crflash.c><crflash.c> 0x440790D8 \r
-File 2,1,<.\ParTest\ParTest.c><ParTest.c> 0x440790D8 \r
-File 2,1,<.\include\pdc.c><pdc.c> 0x44187439 \r
-File 2,4,<C:\Keil\ARM\RV30\LIB\Luminary\DriverLib.lib><DriverLib.lib> 0x44206F94 \r
+File 1,1,<..\..\Source\croutine.c><croutine.c>\r
+File 1,1,<..\..\Source\list.c><list.c>\r
+File 1,1,<..\..\Source\queue.c><queue.c>\r
+File 1,1,<..\..\Source\tasks.c><tasks.c>\r
+File 1,1,<..\..\Source\portable\MemMang\heap_1.c><heap_1.c>\r
+File 1,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c>\r
+File 2,1,<.\main.c><main.c>\r
+File 2,2,<.\init\Startup.s><Startup.s>\r
+File 2,1,<..\Common\Minimal\crflash.c><crflash.c>\r
+File 2,1,<.\ParTest\ParTest.c><ParTest.c>\r
+File 2,1,<.\include\pdc.c><pdc.c>\r
+File 2,4,<..\Common\drivers\LuminaryMicro\Keil\driverlib.lib><driverlib.lib>\r
 \r
 \r
 Options 1,0,0  // Target 'LM3S1xx'\r
@@ -44,7 +44,7 @@ Options 1,0,0  // Target 'LM3S1xx'
  EnvLib ()\r
  EnvReg (ÿLuminary\)\r
  OrgReg (ÿLuminary\)\r
- TgStat=0\r
+ TgStat=16\r
  OutDir (.\uvision\)\r
  OutName (RTOSDemo)\r
  GenApp=1\r
@@ -60,11 +60,14 @@ Options 1,0,0  // Target 'LM3S1xx'
  RunUsr 1 0 <>\r
  BrunUsr 0 0 <>\r
  BrunUsr 1 0 <>\r
+ CrunUsr 0 0 <>\r
+ CrunUsr 1 0 <>\r
  SVCSID <>\r
  GLFLAGS=1790\r
  ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
- ACPUTYP (Cortex-M3)\r
- ADSTFLGA { 0,12,0,0,99,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,8,0,0 }\r
  OCMADSIROM { 1,0,0,0,0,0,32,0,0 }\r

diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h
index 0a54160ac2a0bb09d10e4d56760b529a363ef7e7..f22b4442ba85c7e9b708c06ebf17663c14042077 100644 (file)
--- 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\r
 #define INCLUDE_vTaskDelay                             1\r
 \r
-\r
+#define configKERNEL_INTERRUPT_PRIORITY 255\r
 \r
 \r
 #endif /* FREERTOS_CONFIG_H */\r

diff --git a/Demo/CORTEX_LM3S102_KEIL/init/Startup.s b/Demo/CORTEX_LM3S102_KEIL/init/Startup.s
index c58ab3d14c19c8312eac9d5b731438205dcbbabb..d5dea8bc5910ed2b621b3accee6fc983769dbb70 100644 (file)
--- 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\r
                                IMPORT  xPortSysTickHandler\r
                                IMPORT  vUART_ISR\r
+                               IMPORT  vPortSVCHandler\r
 \r
 ; Vector Table\r
-Vectors         DCD     Stack_Mem + Stack_Size  ; Top of Stack\r
+                               EXPORT __Vectors\r
+__Vectors       DCD     Stack_Mem + Stack_Size  ; Top of Stack\r
                 DCD     Reset_Handler                  ; Reset Handler\r
                 DCD     NmiSR                          ; NMI Handler\r
                 DCD     DefaultISR                     ; Hard Fault Handler\r
@@ -80,7 +82,7 @@ Vectors         DCD     Stack_Mem + Stack_Size  ; Top of Stack
                 DCD     0                       ; Reserved\r
                 DCD     0                       ; Reserved\r
                 DCD     0                       ; Reserved\r
-                DCD     0                                      ; SVCall Handler\r
+                DCD     vPortSVCHandler        ; SVCall Handler\r
                 DCD     DefaultISR                     ; Debug Monitor Handler\r
                 DCD     0                       ; Reserved\r
                 DCD     xPortPendSVHandler      ; PendSV Handler\r