From 38055abf18a5ab6f9f7ade6177d20a85b78024cd Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Thu, 30 Dec 2010 14:00:30 +0000
Subject: [PATCH] Change vTickISR() to vPortTickISR() in the MSP430X IAR port
 layer.

---
 Source/portable/IAR/MSP430X/port.c      | 6 +++---
 Source/portable/IAR/MSP430X/portext.s43 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/portable/IAR/MSP430X/port.c b/Source/portable/IAR/MSP430X/port.c
index 5c44aa113..65d0179fc 100644
--- a/Source/portable/IAR/MSP430X/port.c
+++ b/Source/portable/IAR/MSP430X/port.c
@@ -172,11 +172,11 @@ void vPortSetupTimerInterrupt( void )
 /*-----------------------------------------------------------*/
 
 #pragma vector=configTICK_INTERRUPT_VECTOR
-__interrupt void vISR( void )
+__interrupt void vTickISREntry( void )
 {
-extern void vTickISR( void );
+extern void vPortTickISR( void );
 
-	vTickISR();
+	vPortTickISR();
 }
 
 	
diff --git a/Source/portable/IAR/MSP430X/portext.s43 b/Source/portable/IAR/MSP430X/portext.s43
index fe4e90714..fb9a222a4 100644
--- a/Source/portable/IAR/MSP430X/portext.s43
+++ b/Source/portable/IAR/MSP430X/portext.s43
@@ -58,7 +58,7 @@
 	IMPORT vTaskSwitchContext
 	IMPORT vPortSetupTimerInterrupt
 
-	EXPORT vTickISR
+	EXPORT vPortTickISR
 	EXPORT vPortYield
 	EXPORT xPortStartScheduler
 
@@ -74,7 +74,7 @@
 	
 	RSEG ISR_CODE
 	
-vTickISR:
+vPortTickISR:
 	
 	/* The sr is not saved in portSAVE_CONTEXT() because vPortYield() needs
 	to save it manually before it gets modified (interrupts get disabled). */