From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sun, 11 Mar 2012 20:14:50 +0000 (+0000)
Subject: Add static qualifier to the function that starts the first task in GCC/ARM_CM3/port.c.
X-Git-Tag: V7.1.1~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e4b0b6aeafd309fd058ba73858d1c9396ed94ebb;p=freertos

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 65e1b6962..85411fd79 100644
--- a/Source/portable/CCS4/MSP430X/portmacro.h
+++ b/Source/portable/CCS4/MSP430X/portmacro.h
@@ -93,7 +93,7 @@
 /*-----------------------------------------------------------*/	
 
 /* Interrupt control macros. */
-#define portDISABLE_INTERRUPTS()	_disable_interrupt()
+#define portDISABLE_INTERRUPTS()	_disable_interrupt(); _nop()
 #define portENABLE_INTERRUPTS()		_enable_interrupt()
 /*-----------------------------------------------------------*/
 
diff --git a/Source/portable/GCC/ARM_CM3/port.c b/Source/portable/GCC/ARM_CM3/port.c
index d03fbaeb2..bf124d95d 100644
--- a/Source/portable/GCC/ARM_CM3/port.c
+++ b/Source/portable/GCC/ARM_CM3/port.c
@@ -1,6 +1,6 @@
 /*
     FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.
-	
+
 
     ***************************************************************************
      *                                                                       *
@@ -104,7 +104,7 @@ void vPortSVCHandler( void ) __attribute__ (( naked ));
 /*
  * Start first task is a separate function so it can be tested in isolation.
  */
-void vPortStartFirstTask( void ) __attribute__ (( naked ));
+static void prvPortStartFirstTask( void ) __attribute__ (( naked ));
 
 /*-----------------------------------------------------------*/
 
@@ -148,7 +148,7 @@ void vPortSVCHandler( void )
 }
 /*-----------------------------------------------------------*/
 
-void vPortStartFirstTask( void )
+static void prvPortStartFirstTask( void )
 {
 	__asm volatile(
 					" ldr r0, =0xE000ED08 	\n" /* Use the NVIC offset register to locate the stack. */
@@ -179,7 +179,7 @@ portBASE_TYPE xPortStartScheduler( void )
 	uxCriticalNesting = 0;
 
 	/* Start the first task. */
-	vPortStartFirstTask();
+	prvPortStartFirstTask();
 
 	/* Should not get here! */
 	return 0;
diff --git a/Source/portable/IAR/ARM_CM3/port.c b/Source/portable/IAR/ARM_CM3/port.c
index 8eecac555..bfd969c32 100644
--- a/Source/portable/IAR/ARM_CM3/port.c
+++ b/Source/portable/IAR/ARM_CM3/port.c
@@ -51,13 +51,6 @@
     licensing and training services.
 */
 
-/*
-	Change from V4.2.1:
-
-	+ Introduced usage of configKERNEL_INTERRUPT_PRIORITY macro to set the
-	  interrupt priority used by the kernel.
-*/
-
 /*-----------------------------------------------------------
  * Implementation of functions defined in portable.h for the ARM CM3 port.
  *----------------------------------------------------------*/
diff --git a/Source/portable/IAR/MSP430X/portmacro.h b/Source/portable/IAR/MSP430X/portmacro.h
index 822802e6e..448737ace 100644
--- a/Source/portable/IAR/MSP430X/portmacro.h
+++ b/Source/portable/IAR/MSP430X/portmacro.h
@@ -93,7 +93,7 @@
 /*-----------------------------------------------------------*/	
 
 /* Interrupt control macros. */
-#define portDISABLE_INTERRUPTS()	_DINT()
+#define portDISABLE_INTERRUPTS()	_DINT();_NOP()
 #define portENABLE_INTERRUPTS()		_EINT()
 /*-----------------------------------------------------------*/