From 5c45f756455cf36500ce3d7ca37a9ce3a7835471 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Thu, 6 Jun 2013 13:06:24 +0000 Subject: [PATCH] Update RM48/TMS570 port to use xTaskIncrementTick in place of vTaskIncrementTick. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1913 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../Source/portable/CCS/ARM_Cortex-R4/port.c | 16 ++++++++-------- .../portable/CCS/ARM_Cortex-R4/portASM.asm | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c index 45c2c850a..7aab15e01 100644 --- a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c +++ b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c @@ -56,19 +56,19 @@ *************************************************************************** - http://www.FreeRTOS.org - Documentation, books, training, latest versions, + http://www.FreeRTOS.org - Documentation, books, training, latest versions, license and Real Time Engineers Ltd. contact details. http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, including FreeRTOS+Trace - an indispensable productivity tool, and our new fully thread aware and reentrant UDP/IP stack. - http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High - Integrity Systems, who sell the code with commercial support, + http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High + Integrity Systems, who sell the code with commercial support, indemnification and middleware, under the OpenRTOS brand. - - http://www.SafeRTOS.com - High Integrity Systems also provide a safety - engineered and independently SIL3 certified version for use in safety and + + http://www.SafeRTOS.com - High Integrity Systems also provide a safety + engineered and independently SIL3 certified version for use in safety and mission critical applications that require provable dependability. */ @@ -279,11 +279,11 @@ void vPortEndScheduler(void) __interrupt void vPortNonPreemptiveTick( void ) { /* clear clock interrupt flag */ - RTI->INTFLAG = 0x00000001; + portRTI_INTFLAG_REG = 0x00000001; /* Increment the tick count - this may make a delaying task ready to run - but a context switch is not performed. */ - vTaskIncrementTick(); + xTaskIncrementTick(); } #else diff --git a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm index 61896add1..a30ced708 100644 --- a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm +++ b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm @@ -54,7 +54,7 @@ .text .arm .ref vTaskSwitchContext - .ref vTaskIncrementTick + .ref xTaskIncrementTick .ref ulTaskHasFPUContext .ref pxCurrentTCB @@ -225,10 +225,11 @@ vPortPreemptiveTick: ; Increment the tick count, making any adjustments to the blocked lists ; that may be necessary. - BL vTaskIncrementTick + BL xTaskIncrementTick ; Select the next task to execute. - BL vTaskSwitchContext + CMP R0, #0 + BLNE vTaskSwitchContext ; Restore the context of the task selected to execute. portRESTORE_CONTEXT -- 2.39.5