From b5377eb4b578e968d503236d2d6dae231fc8dd0a Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 12 Mar 2011 14:59:44 +0000 Subject: [PATCH] Update the MSP430X CCS4 port layer. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1321 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Source/portable/CCS4/MSP430X/port.c | 1 - Source/portable/CCS4/MSP430X/portmacro.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/portable/CCS4/MSP430X/port.c b/Source/portable/CCS4/MSP430X/port.c index 0f21b920f..f1bbc7bf0 100644 --- a/Source/portable/CCS4/MSP430X/port.c +++ b/Source/portable/CCS4/MSP430X/port.c @@ -126,7 +126,6 @@ unsigned long *pulTopOfStack; pusTopOfStack--; pulTopOfStack = ( unsigned long * ) pusTopOfStack; *pulTopOfStack = ( unsigned long ) pxCode; - pusTopOfStack = ( unsigned short * ) pulTopOfStack; } pusTopOfStack--; diff --git a/Source/portable/CCS4/MSP430X/portmacro.h b/Source/portable/CCS4/MSP430X/portmacro.h index 20086f0bd..b21c1eb36 100644 --- a/Source/portable/CCS4/MSP430X/portmacro.h +++ b/Source/portable/CCS4/MSP430X/portmacro.h @@ -114,7 +114,7 @@ extern volatile unsigned short usCriticalNesting; \ #define portEXIT_CRITICAL() \ { \ -extern volatile unsigned short usCriticalNesting; \ +extern volatile unsigned short usCriticalNesting; \ \ if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \ { \ @@ -141,10 +141,10 @@ extern void vPortYield( void ); /*-----------------------------------------------------------*/ /* Hardware specifics. */ -#define portBYTE_ALIGNMENT 4 +#define portBYTE_ALIGNMENT 2 #define portSTACK_GROWTH ( -1 ) #define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) -#define portNOP() +#define portNOP() __no_operation() /*-----------------------------------------------------------*/ /* Task function macros as described on the FreeRTOS.org WEB site. */ -- 2.39.5