Add static qualifier to the function that starts the first task in GCC/ARM_CM3/port.c.

Added a _nop() after the _disable_interrupt() in CCS4/MSP430X/portmacro.h.
Added a NOP() after the disabling of interrupts in IAR/MSP430X/portmacro.h.

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

diff --git a/Source/portable/CCS4/MSP430X/portmacro.h b/Source/portable/CCS4/MSP430X/portmacro.h
index 65e1b6962a0e1062c32a166a7473f548adfbc2b0..85411fd79da7f1f10ffd6933ea4d77471362407c 100644 (file)
--- a/Source/portable/CCS4/MSP430X/portmacro.h
+++ b/Source/portable/CCS4/MSP430X/portmacro.h
@@ -93,7 +93,7 @@
 /*-----------------------------------------------------------*/        \r
 \r
 /* Interrupt control macros. */\r
-#define portDISABLE_INTERRUPTS()       _disable_interrupt()\r
+#define portDISABLE_INTERRUPTS()       _disable_interrupt(); _nop()\r
 #define portENABLE_INTERRUPTS()                _enable_interrupt()\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Source/portable/GCC/ARM_CM3/port.c b/Source/portable/GCC/ARM_CM3/port.c
index d03fbaeb2fef1ce706dbb873123bec7e4e08166b..bf124d95da32dd7836fbcc52ee55a915fd26cdad 100644 (file)
--- a/Source/portable/GCC/ARM_CM3/port.c
+++ b/Source/portable/GCC/ARM_CM3/port.c
@@ -1,6 +1,6 @@
 /*\r
     FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.\r
-       \r
+\r
 \r
     ***************************************************************************\r
      *                                                                       *\r
@@ -104,7 +104,7 @@ void vPortSVCHandler( void ) __attribute__ (( naked ));
 /*\r
  * Start first task is a separate function so it can be tested in isolation.\r
  */\r
-void vPortStartFirstTask( void ) __attribute__ (( naked ));\r
+static void prvPortStartFirstTask( void ) __attribute__ (( naked ));\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -148,7 +148,7 @@ void vPortSVCHandler( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vPortStartFirstTask( void )\r
+static void prvPortStartFirstTask( void )\r
 {\r
        __asm volatile(\r
                                        " ldr r0, =0xE000ED08   \n" /* Use the NVIC offset register to locate the stack. */\r
@@ -179,7 +179,7 @@ portBASE_TYPE xPortStartScheduler( void )
        uxCriticalNesting = 0;\r
 \r
        /* Start the first task. */\r
-       vPortStartFirstTask();\r
+       prvPortStartFirstTask();\r
 \r
        /* Should not get here! */\r
        return 0;\r

diff --git a/Source/portable/IAR/ARM_CM3/port.c b/Source/portable/IAR/ARM_CM3/port.c
index 8eecac555cd4493411399114d29af168785db309..bfd969c32fa7671ac19c320cae19d25f0d529a49 100644 (file)
--- a/Source/portable/IAR/ARM_CM3/port.c
+++ b/Source/portable/IAR/ARM_CM3/port.c
@@ -51,13 +51,6 @@
     licensing and training services.\r
 */\r
 \r
-/*\r
-       Change from V4.2.1:\r
-\r
-       + Introduced usage of configKERNEL_INTERRUPT_PRIORITY macro to set the\r
-         interrupt priority used by the kernel.\r
-*/\r
-\r
 /*-----------------------------------------------------------\r
  * Implementation of functions defined in portable.h for the ARM CM3 port.\r
  *----------------------------------------------------------*/\r

diff --git a/Source/portable/IAR/MSP430X/portmacro.h b/Source/portable/IAR/MSP430X/portmacro.h
index 822802e6e0d380b0e587e426757fdb45e6027989..448737acec1583d1b62bb81192163be4c45ad608 100644 (file)
--- a/Source/portable/IAR/MSP430X/portmacro.h
+++ b/Source/portable/IAR/MSP430X/portmacro.h
@@ -93,7 +93,7 @@
 /*-----------------------------------------------------------*/        \r
 \r
 /* Interrupt control macros. */\r
-#define portDISABLE_INTERRUPTS()       _DINT()\r
+#define portDISABLE_INTERRUPTS()       _DINT();_NOP()\r
 #define portENABLE_INTERRUPTS()                _EINT()\r
 /*-----------------------------------------------------------*/\r
 \r