CloudEdge/FreeRTOS-Kernel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update RM48/TMS570 port to use xTaskIncrementTick in place of vTaskIncrementTick.

Browse Source
This commit is contained in:
Richard Barry 2013-06-06 13:06:24 +00:00
parent 0673f63e8d
commit 06953169ba
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/port.c
View File

@ -279,11 +279,11 @@ void vPortEndScheduler(void)
__interrupt void vPortNonPreemptiveTick( void ) __interrupt void vPortNonPreemptiveTick( void )
{ {
/* clear clock interrupt flag */ /* clear clock interrupt flag */
RTI->INTFLAG = 0x00000001; portRTI_INTFLAG_REG = 0x00000001;
/* Increment the tick count - this may make a delaying task ready /* Increment the tick count - this may make a delaying task ready
to run - but a context switch is not performed. */ to run - but a context switch is not performed. */
vTaskIncrementTick(); xTaskIncrementTick();
} }
#else #else

7
FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portASM.asm
View File

@ -54,7 +54,7 @@
.text .text
.arm .arm
.ref vTaskSwitchContext .ref vTaskSwitchContext
.ref vTaskIncrementTick .ref xTaskIncrementTick
.ref ulTaskHasFPUContext .ref ulTaskHasFPUContext
.ref pxCurrentTCB .ref pxCurrentTCB
@ -225,10 +225,11 @@ vPortPreemptiveTick:
; Increment the tick count, making any adjustments to the blocked lists ; Increment the tick count, making any adjustments to the blocked lists
; that may be necessary. ; that may be necessary.
BL vTaskIncrementTick BL xTaskIncrementTick
; Select the next task to execute. ; Select the next task to execute.
BL vTaskSwitchContext CMP R0, #0
BLNE vTaskSwitchContext
; Restore the context of the task selected to execute. ; Restore the context of the task selected to execute.
portRESTORE_CONTEXT portRESTORE_CONTEXT