Update to use new port layer.

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

diff --git a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
index 10ca33726e74ad9596e6970f096e8872873c9167..1dcb11cb9f7f347bf5f25bceaa60b23e56e58e9f 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
@@ -80,7 +80,7 @@ to exclude the API function. */
 #define INCLUDE_vTaskDelayUntil                        1\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_LM3S811_KEIL/RTOSDemo.Opt b/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Opt
index a78d564cec66d314f89f855067c6c34d02890435..425ad0675dbc36125d38e8e024a54d5f9a6d559b 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Opt
+++ b/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Opt
@@ -12,13 +12,13 @@
 \r
 Target (FreeRTOS_Demo), 0x0004 // Tools: 'ARM-ADS'\r
 GRPOPT 1,(Demo_Source),1,0,0\r
-GRPOPT 2,(Libraries),1,0,0\r
-GRPOPT 3,(RTOS_Source),1,0,0\r
-GRPOPT 4,(Documentation),1,0,0\r
+GRPOPT 2,(Libraries),0,0,0\r
+GRPOPT 3,(RTOS_Source),0,0,0\r
+GRPOPT 4,(Documentation),0,0,0\r
 \r
-OPTFFF 1,1,2,0,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S> \r
+OPTFFF 1,1,2,301989888,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S> \r
 OPTFFF 1,2,1,167772160,0,0,0,0,<.\LuminaryCode\osram96x16.c><osram96x16.c> \r
-OPTFFF 1,3,1,0,0,0,0,0,<.\main.c><main.c> \r
+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 }\r
 OPTFFF 1,4,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> \r
 OPTFFF 1,5,1,989855744,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> \r
 OPTFFF 1,6,1,939524096,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> \r
@@ -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> \r
 OPTFFF 3,11,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
 OPTFFF 3,12,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
-OPTFFF 3,13,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> \r
-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 }\r
+OPTFFF 3,13,1,335544320,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> \r
+OPTFFF 4,14,5,0,0,0,0,0,<.\readme.txt><readme.txt> \r
 \r
-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 }\r
 \r
 TARGOPT 1, (FreeRTOS_Demo)\r
  ADSCLK=50000000\r
@@ -42,9 +41,10 @@ TARGOPT 1, (FreeRTOS_Demo)
   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)(-pLM3S811)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S811)\r
   OPTDBG 48126,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()\r
-  OPTKEY 0,(DLGTARM)()\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)(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))\r
   OPTKEY 0,(ARMDBGFLAGS)(-T5F)\r
   OPTKEY 0,(LMIDK-AGDI)(-B0 -O1792)\r
   OPTDF 0x84\r

diff --git a/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Uv2 b/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Uv2
index 737a39bf0ddb0065ad96b1344b5c90c799e0971f..4199167b1d982bcb6b99c1b12a765c3069cc4fa6 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Uv2
+++ b/Demo/CORTEX_LM3S811_KEIL/RTOSDemo.Uv2
@@ -8,20 +8,20 @@ Group (Libraries)
 Group (RTOS_Source)\r
 Group (Documentation)\r
 \r
-File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x45431C95 \r
-File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c> 0x452BAD20 \r
-File 1,1,<.\main.c><main.c> 0x452A35C1 \r
-File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x452A35D8 \r
-File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x452A35D8 \r
-File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x452A35D8 \r
-File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x4538ECC1 \r
-File 1,1,<.\heap\heap_1.c><heap_1.c> 0x45431CD6 \r
-File 2,4,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><driverlib.lib> 0x44F892D1 \r
-File 3,1,<..\..\Source\tasks.c><tasks.c> 0x452A35A8 \r
-File 3,1,<..\..\Source\list.c><list.c> 0x452A35BA \r
-File 3,1,<..\..\Source\queue.c><queue.c> 0x452A35BA \r
-File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x452A35FB \r
-File 4,5,<.\readme.txt><readme.txt> 0x44FC00DA \r
+File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S>\r
+File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c>\r
+File 1,1,<.\main.c><main.c>\r
+File 1,1,<..\Common\Minimal\semtest.c><semtest.c>\r
+File 1,1,<..\Common\Minimal\integer.c><integer.c>\r
+File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c>\r
+File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>\r
+File 1,1,<.\heap\heap_1.c><heap_1.c>\r
+File 2,4,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\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 4,5,<.\readme.txt><readme.txt>\r
 \r
 \r
 Options 1,0,0  // Target 'FreeRTOS_Demo'\r
@@ -64,11 +64,14 @@ Options 1,0,0  // Target 'FreeRTOS_Demo'
  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 { 176,3,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,32,0,0 }\r
  OCMADSIROM { 1,0,0,0,0,0,0,1,0 }\r

diff --git a/Demo/CORTEX_LM3S811_KEIL/startup_rvmdk.S b/Demo/CORTEX_LM3S811_KEIL/startup_rvmdk.S
index e22c13e83a394b0a1f5fa7eb5810481d90df9be4..8cd8aaab6a1da7d6d7c079d1a96677ba505cebdc 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/startup_rvmdk.S
+++ b/Demo/CORTEX_LM3S811_KEIL/startup_rvmdk.S
@@ -82,7 +82,8 @@ HeapMem
 ; The vector table.\r
 ;\r
 ;******************************************************************************\r
-Vectors\r
+               EXPORT __Vectors\r
+__Vectors\r
         DCD     StackMem + Stack            ; Top of Stack\r
         DCD     Reset_Handler               ; Reset Handler\r
         DCD     NmiSR                       ; NMI Handler\r
@@ -94,7 +95,7 @@ Vectors
         DCD     0                           ; Reserved\r
         DCD     0                           ; Reserved\r
         DCD     0                           ; Reserved\r
-        DCD     IntDefaultHandler           ; SVCall Handler\r
+        DCD     vPortSVCHandler             ; SVCall Handler\r
         DCD     IntDefaultHandler           ; Debug Monitor Handler\r
         DCD     0                           ; Reserved\r
         DCD     xPortPendSVHandler             ; PendSV Handler\r
@@ -147,6 +148,7 @@ Reset_Handler
                IMPORT  vUART_ISR\r
                IMPORT  xPortPendSVHandler\r
                IMPORT  xPortSysTickHandler\r
+               IMPORT  vPortSVCHandler\r
 \r
         LDR     R0, =__main\r
         BX      R0\r