Change vTickISR() to vPortTickISR() in the MSP430X IAR port layer.

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

diff --git a/Source/portable/IAR/MSP430X/port.c b/Source/portable/IAR/MSP430X/port.c
index 5c44aa113fca309217e6f41aeb57e9c1a8912c79..65d0179fc5284b73609f23870bfc84f8809c7304 100644 (file)
--- a/Source/portable/IAR/MSP430X/port.c
+++ b/Source/portable/IAR/MSP430X/port.c
@@ -172,11 +172,11 @@ void vPortSetupTimerInterrupt( void )
 /*-----------------------------------------------------------*/\r
 \r
 #pragma vector=configTICK_INTERRUPT_VECTOR\r
-__interrupt void vISR( void )\r
+__interrupt void vTickISREntry( void )\r
 {\r
-extern void vTickISR( void );\r
+extern void vPortTickISR( void );\r
 \r
-       vTickISR();\r
+       vPortTickISR();\r
 }\r
 \r
        \r

diff --git a/Source/portable/IAR/MSP430X/portext.s43 b/Source/portable/IAR/MSP430X/portext.s43
index fe4e9071488189ccf9adbbf2c5f1184105dacbd9..fb9a222a4d27c3ed42a980643228e120f8848ff7 100644 (file)
--- a/Source/portable/IAR/MSP430X/portext.s43
+++ b/Source/portable/IAR/MSP430X/portext.s43
@@ -58,7 +58,7 @@
        IMPORT vTaskSwitchContext\r
        IMPORT vPortSetupTimerInterrupt\r
 \r
-       EXPORT vTickISR\r
+       EXPORT vPortTickISR\r
        EXPORT vPortYield\r
        EXPORT xPortStartScheduler\r
 \r
@@ -74,7 +74,7 @@
        \r
        RSEG ISR_CODE\r
        \r
-vTickISR:\r
+vPortTickISR:\r
        \r
        /* The sr is not saved in portSAVE_CONTEXT() because vPortYield() needs\r
        to save it manually before it gets modified (interrupts get disabled). */\r