len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add additional NOP after EINT instruction in MSP430 ports.

Browse source
This commit is contained in:
Richard Barry 2014-01-10 10:38:02 +00:00
parent a20e75082e
commit f01bf9fdc3
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
View file

@ -110,7 +110,7 @@ typedef unsigned short UBaseType_t;
/* Interrupt control macros. */ /* Interrupt control macros. */
#define portDISABLE_INTERRUPTS() _disable_interrupt(); _nop() #define portDISABLE_INTERRUPTS() _disable_interrupt(); _nop()
#define portENABLE_INTERRUPTS() _enable_interrupt() #define portENABLE_INTERRUPTS() _enable_interrupt(); _nop()
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical section control macros. */ /* Critical section control macros. */
@ -118,7 +118,7 @@ typedef unsigned short UBaseType_t;
#define portENTER_CRITICAL() \ #define portENTER_CRITICAL() \
{ \ { \
extern volatile uint16_t usCriticalNesting; \ extern volatile uint16_t usCriticalNesting; \
\ \
portDISABLE_INTERRUPTS(); \ portDISABLE_INTERRUPTS(); \
\ \
@ -130,7 +130,7 @@ extern volatile uint16_t usCriticalNesting; \
#define portEXIT_CRITICAL() \ #define portEXIT_CRITICAL() \
{ \ { \
extern volatile uint16_t usCriticalNesting; \ extern volatile uint16_t usCriticalNesting; \
\ \
if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \ if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \
{ \ { \

2
FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
View file

@ -104,7 +104,7 @@ typedef unsigned short UBaseType_t;
/* Interrupt control macros. */ /* Interrupt control macros. */
#define portDISABLE_INTERRUPTS() asm volatile ( "DINT" ); asm volatile ( "NOP" ) #define portDISABLE_INTERRUPTS() asm volatile ( "DINT" ); asm volatile ( "NOP" )
#define portENABLE_INTERRUPTS() asm volatile ( "EINT" ) #define portENABLE_INTERRUPTS() asm volatile ( "EINT" ); asm volatile ( "NOP" )
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical section control macros. */ /* Critical section control macros. */

2
FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
View file

@ -102,7 +102,7 @@ typedef unsigned short UBaseType_t;
/* Interrupt control macros. */ /* Interrupt control macros. */
#define portDISABLE_INTERRUPTS() _DINT(); _NOP() #define portDISABLE_INTERRUPTS() _DINT(); _NOP()
#define portENABLE_INTERRUPTS() _EINT(); #define portENABLE_INTERRUPTS() _EINT(); _NOP()
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical section control macros. */ /* Critical section control macros. */

6
FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
View file

@ -110,7 +110,7 @@ typedef unsigned short UBaseType_t;
/* Interrupt control macros. */ /* Interrupt control macros. */
#define portDISABLE_INTERRUPTS() _DINT();_NOP() #define portDISABLE_INTERRUPTS() _DINT();_NOP()
#define portENABLE_INTERRUPTS() _EINT() #define portENABLE_INTERRUPTS() _EINT(); _NOP()
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical section control macros. */ /* Critical section control macros. */
@ -118,7 +118,7 @@ typedef unsigned short UBaseType_t;
#define portENTER_CRITICAL() \ #define portENTER_CRITICAL() \
{ \ { \
extern volatile uint16_t usCriticalNesting; \ extern volatile uint16_t usCriticalNesting; \
\ \
portDISABLE_INTERRUPTS(); \ portDISABLE_INTERRUPTS(); \
\ \
@ -130,7 +130,7 @@ extern volatile uint16_t usCriticalNesting; \
#define portEXIT_CRITICAL() \ #define portEXIT_CRITICAL() \
{ \ { \
extern volatile uint16_t usCriticalNesting; \ extern volatile uint16_t usCriticalNesting; \
\ \
if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \ if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \
{ \ { \