Minor updates to the MSP430X CCS4 and IAR port layers.

Change the sprintf() in prvGenerateRunTimeStatsForTasksInList() to accept unsigned long instead of unsigned int parameters so it works on 16bit devices too.

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

diff --git a/Source/portable/CCS4/MSP430X/port.c b/Source/portable/CCS4/MSP430X/port.c
index fa5e9300ff7571eb86b061ad47b5e245f948ea7d..73af84f965df2e287bc4ab78726c222ae5ebbc4e 100644 (file)
--- a/Source/portable/CCS4/MSP430X/port.c
+++ b/Source/portable/CCS4/MSP430X/port.c
@@ -171,7 +171,7 @@ void vPortSetupTimerInterrupt( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#pragma vector=configTICK_INTERRUPT_VECTOR\r
+#pragma vector=configTICK_VECTOR\r
 interrupt void vTickISREntry( void )\r
 {\r
 extern void vPortTickISR( void );\r

diff --git a/Source/portable/CCS4/MSP430X/portext.asm b/Source/portable/CCS4/MSP430X/portext.asm
index 97c69b65ecd0fb483fb8fd57a27626bae2c4a7c3..44ff501f25c5b0112b7710d472070ff439a02426 100644 (file)
--- a/Source/portable/CCS4/MSP430X/portext.asm
+++ b/Source/portable/CCS4/MSP430X/portext.asm
@@ -127,7 +127,6 @@ vPortCooperativeTickISR:
        portSAVE_CONTEXT\r
                                \r
        calla   #vTaskIncrementTick\r
-       calla   #vTaskSwitchContext\r
                \r
        portRESTORE_CONTEXT\r
 ;-----------------------------------------------------------\r

diff --git a/Source/portable/IAR/MSP430X/port.c b/Source/portable/IAR/MSP430X/port.c
index 65d0179fc5284b73609f23870bfc84f8809c7304..3020ff3c03bcff6b219fd27d24e42b59ed7b17ac 100644 (file)
--- a/Source/portable/IAR/MSP430X/port.c
+++ b/Source/portable/IAR/MSP430X/port.c
@@ -171,7 +171,7 @@ void vPortSetupTimerInterrupt( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-#pragma vector=configTICK_INTERRUPT_VECTOR\r
+#pragma vector=configTICK_VECTOR\r
 __interrupt void vTickISREntry( void )\r
 {\r
 extern void vPortTickISR( void );\r

diff --git a/Source/tasks.c b/Source/tasks.c
index 7fa375d0f3c8e91e6b11ca2860e72b5289c2afa3..a39200b96fe251405dc9538081efa9f0fc0f43e6 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1068,7 +1068,7 @@ portBASE_TYPE xReturn;
                macro must be defined to configure the timer/counter used to generate\r
                the run time counter time base. */\r
                portCONFIGURE_TIMER_FOR_RUN_TIME_STATS();\r
-\r
+               \r
                /* Setting up the timer tick is hardware specific and thus in the\r
                portable interface. */\r
                if( xPortStartScheduler() )\r
@@ -2128,13 +2128,13 @@ tskTCB *pxNewTCB;
 \r
                                        if( ulStatsAsPercentage > 0UL )\r
                                        {\r
-                                               sprintf( pcStatsString, ( char * ) "%s\t\t%u\t\t%u%%\r\n", pxNextTCB->pcTaskName, ( unsigned int ) pxNextTCB->ulRunTimeCounter, ( unsigned int ) ulStatsAsPercentage );\r
+                                               sprintf( pcStatsString, ( char * ) "%s\t\t%lu\t\t%lu%%\r\n", pxNextTCB->pcTaskName, pxNextTCB->ulRunTimeCounter, ulStatsAsPercentage );\r
                                        }\r
                                        else\r
                                        {\r
                                                /* If the percentage is zero here then the task has\r
                                                consumed less than 1% of the total run time. */\r
-                                               sprintf( pcStatsString, ( char * ) "%s\t\t%u\t\t<1%%\r\n", pxNextTCB->pcTaskName, ( unsigned int ) pxNextTCB->ulRunTimeCounter );\r
+                                               sprintf( pcStatsString, ( char * ) "%s\t\t%lu\t\t<1%%\r\n", pxNextTCB->pcTaskName, pxNextTCB->ulRunTimeCounter );\r
                                        }\r
                                }\r
 \r