len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 01:28:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Convert the remaining ports to use xTaskIncrementTick() in place of vTaskIncremenTick().

Browse source
This commit is contained in:
Richard Barry 2013-06-07 12:16:58 +00:00
parent 2fc9d033c6
commit c04b074707
21 changed files with 80 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/port.c
View file

@ -236,7 +236,7 @@ void vPortEndScheduler( void )
{
/* Increment the tick count - this may make a delaying task ready
to run - but a context switch is not performed. */
vTaskIncrementTick();
xTaskIncrementTick();
T0IR = portTIMER_MATCH_ISR_BIT; /* Clear the timer event */
VICVectAddr = portCLEAR_VIC_INTERRUPT; /* Acknowledge the Interrupt */

4
FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/portASM.s
View file

@ -54,7 +54,7 @@
INCLUDE portmacro.inc
IMPORT vTaskSwitchContext
IMPORT vTaskIncrementTick
IMPORT xTaskIncrementTick
EXPORT vPortYieldProcessor
EXPORT vPortStartFirstTask
@ -127,7 +127,7 @@ vPreemptiveTick
portSAVE_CONTEXT ; Save the context of the current task.
LDR R0, =vTaskIncrementTick ; Increment the tick count.
LDR R0, =xTaskIncrementTick ; Increment the tick count.
MOV LR, PC ; This may make a delayed task ready
BX R0 ; to run.

13
FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
View file

@ -325,13 +325,6 @@ __asm void xPortPendSVHandler( void )
void xPortSysTickHandler( void )
{
#if configUSE_PREEMPTION == 1
{
/* If using preemption, also force a context switch. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
#endif
/* Only reset the systick load register if configUSE_TICKLESS_IDLE is set to
1. If it is set to 0 tickless idle is not being used. If it is set to a
value other than 0 or 1 then a timer other than the SysTick is being used
@ -342,7 +335,11 @@ void xPortSysTickHandler( void )
( void ) portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* Pend a context switch. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
}

13
FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
View file

@ -388,13 +388,6 @@ __asm void xPortPendSVHandler( void )
void xPortSysTickHandler( void )
{
#if configUSE_PREEMPTION == 1
{
/* If using preemption, also force a context switch. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
#endif
/* Only reset the systick load register if configUSE_TICKLESS_IDLE is set to
1. If it is set to 0 tickless idle is not being used. If it is set to a
value other than 0 or 1 then a timer other than the SysTick is being used
@ -405,7 +398,11 @@ void xPortSysTickHandler( void )
( void ) portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* Pend a context switch. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
}