Add additional NOP after EINT instruction in MSP430 ports.

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

diff --git a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
index a80412bf22d1a6ce65b0f6c321f6a231970ac8ef..6dff6d872c1f0e558ffe9267fa6968f58c65ed35 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
+++ b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned short UBaseType_t;
 \r
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS()       _disable_interrupt(); _nop()\r
-#define portENABLE_INTERRUPTS()                _enable_interrupt()\r
+#define portENABLE_INTERRUPTS()                _enable_interrupt(); _nop()\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section control macros. */\r
@@ -118,7 +118,7 @@ typedef unsigned short UBaseType_t;
 \r
 #define portENTER_CRITICAL()                                                                                                   \\r
 {                                                                                                                                                              \\r
-extern volatile uint16_t usCriticalNesting;                                                            \\r
+extern volatile uint16_t usCriticalNesting;                                                                            \\r
                                                                                                                                                                \\r
        portDISABLE_INTERRUPTS();                                                                                                       \\r
                                                                                                                                                                \\r
@@ -130,7 +130,7 @@ extern volatile uint16_t usCriticalNesting;                                                         \
 \r
 #define portEXIT_CRITICAL()                                                                                                            \\r
 {                                                                                                                                                              \\r
-extern volatile uint16_t usCriticalNesting;                                                            \\r
+extern volatile uint16_t usCriticalNesting;                                                                            \\r
                                                                                                                                                                \\r
        if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )                                       \\r
        {                                                                                                                                                       \\r

diff --git a/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h b/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
index 0c87007ecdbdcc6e0950576e078432ac3e168dca..cd28cbd9b5645d00aff283f80dd82c3d55c24ba9 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
@@ -104,7 +104,7 @@ typedef unsigned short UBaseType_t;
 \r
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS()       asm volatile ( "DINT" ); asm volatile ( "NOP" )\r
-#define portENABLE_INTERRUPTS()                asm volatile ( "EINT" )\r
+#define portENABLE_INTERRUPTS()                asm volatile ( "EINT" ); asm volatile ( "NOP" )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section control macros. */\r

diff --git a/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
index cb7ebe8718832b623757f7c2ecc10880e39ff9f0..e19b9180b176400d4b84a4896cf5686d1b0b65cc 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
@@ -102,7 +102,7 @@ typedef unsigned short UBaseType_t;
 \r
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS()       _DINT(); _NOP()\r
-#define portENABLE_INTERRUPTS()                _EINT();\r
+#define portENABLE_INTERRUPTS()                _EINT(); _NOP()\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section control macros. */\r

diff --git a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
index b6c7ab72c292b7d117e646d0912cdbaed3175032..2873e9355bee70221270d07c7128a7d027f91a5e 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned short UBaseType_t;
 \r
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS()       _DINT();_NOP()\r
-#define portENABLE_INTERRUPTS()                _EINT()\r
+#define portENABLE_INTERRUPTS()                _EINT(); _NOP()\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section control macros. */\r
@@ -118,7 +118,7 @@ typedef unsigned short UBaseType_t;
 \r
 #define portENTER_CRITICAL()                                                                                                   \\r
 {                                                                                                                                                              \\r
-extern volatile uint16_t usCriticalNesting;                                                            \\r
+extern volatile uint16_t usCriticalNesting;                                                                            \\r
                                                                                                                                                                \\r
        portDISABLE_INTERRUPTS();                                                                                                       \\r
                                                                                                                                                                \\r
@@ -130,7 +130,7 @@ extern volatile uint16_t usCriticalNesting;                                                         \
 \r
 #define portEXIT_CRITICAL()                                                                                                            \\r
 {                                                                                                                                                              \\r
-extern volatile uint16_t usCriticalNesting;                                                    \\r
+extern volatile uint16_t usCriticalNesting;                                                                            \\r
                                                                                                                                                                \\r
        if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )                                       \\r
        {                                                                                                                                                       \\r