Start to re-arrange files to include FreeRTOS+ in main download.

[freertos] / Demo / CORTEX_LM3S316_IAR / hw_include / startup.c

diff --git a/Demo/CORTEX_LM3S316_IAR/hw_include/startup.c b/Demo/CORTEX_LM3S316_IAR/hw_include/startup.c
index b07961b802e112f80cfe5af1aeefc8583a61d0ff..a76a7831e2231fb70c03ef27564716fca276c4c3 100644 (file)
--- a/Demo/CORTEX_LM3S316_IAR/hw_include/startup.c
+++ b/Demo/CORTEX_LM3S316_IAR/hw_include/startup.c
@@ -37,7 +37,6 @@
 // Forward declaration of the default fault handlers.\r
 //\r
 //*****************************************************************************\r
-void ResetISR(void);\r
 static void NmiSR(void);\r
 static void FaultISR(void);\r
 static void IntDefaultHandler(void);\r
@@ -50,13 +49,14 @@ static void IntDefaultHandler(void);
 extern void xPortPendSVHandler(void);\r
 extern void xPortSysTickHandler(void);\r
 extern void vUART_ISR( void );\r
+extern void vPortSVCHandler( void );\r
 \r
 //*****************************************************************************\r
 //\r
 // The entry point for the application.\r
 //\r
 //*****************************************************************************\r
-extern void main(void);\r
+extern void __iar_program_start(void);\r
 \r
 //*****************************************************************************\r
 //\r
@@ -66,57 +66,7 @@ extern void main(void);
 #ifndef STACK_SIZE\r
 #define STACK_SIZE                              50\r
 #endif\r
-static unsigned long pulStack[STACK_SIZE] = { \r
-0xbbbbbbbb, \r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb, \r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb, \r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb, \r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb, \r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb,\r
-0xbbbbbbbb };\r
+static unsigned long pulStack[STACK_SIZE] @ ".noinit";\r
 //*****************************************************************************\r
 //\r
 // A union that describes the entries of the vector table.  The union is needed\r
@@ -133,16 +83,16 @@ uVectorEntry;
 \r
 //*****************************************************************************\r
 //\r
-// The minimal vector table for a Cortex M3.  Note that the proper constructs\r
+// The minimal vector table for a Cortex-M3.  Note that the proper constructs\r
 // must be placed on this to ensure that it ends up at physical address\r
 // 0x0000.0000.\r
 //\r
 //*****************************************************************************\r
-__root const uVectorEntry g_pfnVectors[] @ "INTVEC" =\r
+__root const uVectorEntry __vector_table[] @ ".intvec" =\r
 {\r
     { .ulPtr = (unsigned long)pulStack + sizeof(pulStack) },\r
                                             // The initial stack pointer\r
-    ResetISR,                               // The reset handler\r
+    __iar_program_start,                    // The reset handler\r
     NmiSR,                                  // The NMI handler\r
     FaultISR,                               // The hard fault handler\r
     IntDefaultHandler,                      // The MPU fault handler\r
@@ -152,7 +102,7 @@ __root const uVectorEntry g_pfnVectors[] @ "INTVEC" =
     0,                                      // Reserved\r
     0,                                      // Reserved\r
     0,                                      // Reserved\r
-    IntDefaultHandler,                      // SVCall handler\r
+    vPortSVCHandler,                      // SVCall handler\r
     IntDefaultHandler,                      // Debug monitor handler\r
     0,                                      // Reserved\r
     xPortPendSVHandler,                     // The PendSV handler\r
@@ -189,58 +139,6 @@ __root const uVectorEntry g_pfnVectors[] @ "INTVEC" =
     IntDefaultHandler                       // FLASH Control\r
 };\r
 \r
-//*****************************************************************************\r
-//\r
-// The following are constructs created by the linker, indicating where the\r
-// the "data" and "bss" segments reside in memory.  The initializers for the\r
-// for the "data" segment resides immediately following the "text" segment.\r
-//\r
-//*****************************************************************************\r
-#pragma segment="DATA_ID"\r
-#pragma segment="DATA_I"\r
-#pragma segment="DATA_Z"\r
-\r
-//*****************************************************************************\r
-//\r
-// This is the code that gets called when the processor first starts execution\r
-// following a reset event.  Only the absolutely necessary set is performed,\r
-// after which the application supplied entry() routine is called.  Any fancy\r
-// actions (such as making decisions based on the reset cause register, and\r
-// resetting the bits in that register) are left solely in the hands of the\r
-// application.\r
-//\r
-//*****************************************************************************\r
-void\r
-ResetISR(void)\r
-{\r
-    unsigned long *pulSrc, *pulDest, *pulEnd;\r
-\r
-    //\r
-    // Copy the data segment initializers from flash to SRAM.\r
-    //\r
-    pulSrc = __segment_begin("DATA_ID");\r
-    pulDest = __segment_begin("DATA_I");\r
-    pulEnd = __segment_end("DATA_I");\r
-    while(pulDest < pulEnd)\r
-    {\r
-        *pulDest++ = *pulSrc++;\r
-    }\r
-\r
-    //\r
-    // Zero fill the bss segment.\r
-    //\r
-    pulDest = __segment_begin("DATA_Z");\r
-    pulEnd = __segment_end("DATA_Z");\r
-    while(pulDest < pulEnd)\r
-    {\r
-        *pulDest++ = 0;\r
-    }\r
-\r
-    //\r
-    // Call the application's entry point.\r
-    //\r
-    main();\r
-}\r
 \r
 //*****************************************************************************\r
 //\r