Update the MSP430X CCS4 port layer.

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

diff --git a/Source/portable/CCS4/MSP430X/port.c b/Source/portable/CCS4/MSP430X/port.c
index 0f21b920f44e9c974746856a1cd6cb764aca362f..f1bbc7bf06439f3083744dd777bc7da4192ae712 100644 (file)
--- a/Source/portable/CCS4/MSP430X/port.c
+++ b/Source/portable/CCS4/MSP430X/port.c
@@ -126,7 +126,6 @@ unsigned long *pulTopOfStack;
                pusTopOfStack--;\r
                pulTopOfStack = ( unsigned long * ) pusTopOfStack;\r
                *pulTopOfStack = ( unsigned long ) pxCode;\r
-               pusTopOfStack = ( unsigned short * ) pulTopOfStack;\r
        }\r
 \r
        pusTopOfStack--;\r

diff --git a/Source/portable/CCS4/MSP430X/portmacro.h b/Source/portable/CCS4/MSP430X/portmacro.h
index 20086f0bd121b816d8580fb76866e5e3b9a8c36a..b21c1eb3687a06f7f567b9944e58eb6c21d3fcde 100644 (file)
--- a/Source/portable/CCS4/MSP430X/portmacro.h
+++ b/Source/portable/CCS4/MSP430X/portmacro.h
@@ -114,7 +114,7 @@ extern volatile unsigned short usCriticalNesting;                                                           \
 \r
 #define portEXIT_CRITICAL()                                                                                                            \\r
 {                                                                                                                                                              \\r
-extern volatile unsigned short usCriticalNesting;                                                      \\r
+extern volatile unsigned short usCriticalNesting;                                                              \\r
                                                                                                                                                                \\r
        if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )                                       \\r
        {                                                                                                                                                       \\r
@@ -141,10 +141,10 @@ extern void vPortYield( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* Hardware specifics. */\r
-#define portBYTE_ALIGNMENT                     4\r
+#define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
 #define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )  \r
-#define portNOP()      \r
+#define portNOP()                                      __no_operation()        \r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r