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

Convert some ports to use xTaskIncrementTick() in place of vTaskIncrementTick().

Browse source 
Move DSB instructions to before WFI instructions in line with ARM recommendations.
This commit is contained in:
Richard Barry 2013-06-06 15:46:40 +00:00
parent 4e9374ad90
commit 686d190798
27 changed files with 128 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/port.c
View file

@ -195,10 +195,11 @@ is being used. */
static void __interrupt __far prvPreemptiveTick( void )
{
/* Get the scheduler to update the task states following the tick. */
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* Switch in the context of the next task to be run. */
portSWITCH_CONTEXT();
}
/* Reset the PIC ready for the next time. */
portRESET_PIC();
@ -208,7 +209,7 @@ is being used. */
{
/* Same as preemptive tick, but the cooperative scheduler is being used
so we don't have to switch in the context of the next task. */
vTaskIncrementTick();
xTaskIncrementTick();
portRESET_PIC();
}
#endif

7
FreeRTOS/Source/portable/BCC/16BitDOS/PC/port.c
View file

@ -216,10 +216,11 @@ scheduler is being used. */
static void __interrupt __far prvPreemptiveTick( void )
{
/* Get the scheduler to update the task states following the tick. */
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* Switch in the context of the next task to be run. */
portSWITCH_CONTEXT();
}
/* Reset the PIC ready for the next time. */
prvPortResetPIC();
@ -229,7 +230,7 @@ scheduler is being used. */
{
/* Same as preemptive tick, but the cooperative scheduler is being used
so we don't have to switch in the context of the next task. */
vTaskIncrementTick();
xTaskIncrementTick();
prvPortResetPIC();
}
#endif

6
FreeRTOS/Source/portable/CCS/MSP430X/portext.asm
View file

@ -57,7 +57,7 @@
.include data_model.h
.global vTaskIncrementTick
.global xTaskIncrementTick
.global vTaskSwitchContext
.global vPortSetupTimerInterrupt
.global pxCurrentTCB
@ -112,7 +112,7 @@ vPortPreemptiveTickISR: .asmfunc
push.w sr
portSAVE_CONTEXT
call_x #vTaskIncrementTick
call_x #xTaskIncrementTick
call_x #vTaskSwitchContext
portRESTORE_CONTEXT
@ -128,7 +128,7 @@ vPortCooperativeTickISR: .asmfunc
push.w sr
portSAVE_CONTEXT
call_x #vTaskIncrementTick
call_x #xTaskIncrementTick
portRESTORE_CONTEXT

11
FreeRTOS/Source/portable/CodeWarrior/ColdFire_V1/port.c
View file

@ -220,16 +220,11 @@ unsigned long ulSavedInterruptMask;
/* Increment the RTOS tick. */
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
/* If we are using the pre-emptive scheduler then also request a
context switch as incrementing the tick could have unblocked a task. */
#if configUSE_PREEMPTION == 1
if( xTaskIncrementTick() != pdFALSE )
{
taskYIELD();
}
#endif
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
}

9
FreeRTOS/Source/portable/CodeWarrior/HCS12/port.c
View file

@ -260,11 +260,10 @@ void interrupt vPortTickInterrupt( void )
portSAVE_CONTEXT();
/* Increment the tick ... */
vTaskIncrementTick();
/* ... then see if the new tick value has necessitated a
context switch. */
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
}
TFLG1 = 1;
@ -274,7 +273,7 @@ void interrupt vPortTickInterrupt( void )
}
#else
{
vTaskIncrementTick();
xTaskIncrementTick();
TFLG1 = 1;
}
#endif

6
FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/portISR.c
View file

@ -161,7 +161,7 @@ void vPortYieldProcessor( void )
/* Clear tick timer interrupt indication. */
ulDummy = portTIMER_REG_BASE_PTR->TC_SR;
vTaskIncrementTick();
xTaskIncrementTick();
/* Acknowledge the interrupt at AIC level... */
AT91C_BASE_AIC->AIC_EOICR = portCLEAR_AIC_INTERRUPT;
@ -186,8 +186,10 @@ void vPortYieldProcessor( void )
/* Increment the RTOS tick count, then look for the highest priority
task that is ready to run. */
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
}
/* Acknowledge the interrupt at AIC level... */
AT91C_BASE_AIC->AIC_EOICR = portCLEAR_AIC_INTERRUPT;

7
FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
View file

@ -163,7 +163,7 @@ void vPortYieldProcessor( void )
/* Increment the tick count - which may wake some tasks but as the
preemptive scheduler is not being used any woken task is not given
processor time no matter what its priority. */
vTaskIncrementTick();
xTaskIncrementTick();
/* Clear the PIT interrupt. */
ulDummy = AT91C_BASE_PITC->PITC_PIVR;
@ -183,10 +183,11 @@ void vPortYieldProcessor( void )
portSAVE_CONTEXT();
/* Increment the tick count - this may wake a task. */
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* Find the highest priority task that is ready to run. */
vTaskSwitchContext();
}
/* End the interrupt in the AIC. */
AT91C_BASE_AIC->AIC_EOICR = AT91C_BASE_PITC->PITC_PIVR;;

2
FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portISR.c
View file

@ -166,7 +166,7 @@ void vTickISR( void )
/* Increment the RTOS tick count, then look for the highest priority
task that is ready to run. */
__asm volatile( "bl vTaskIncrementTick" );
__asm volatile( "bl xTaskIncrementTick" );
#if configUSE_PREEMPTION == 1
__asm volatile( "bl vTaskSwitchContext" );

4
FreeRTOS/Source/portable/GCC/ARM7_LPC23xx/portISR.c
View file

@ -150,7 +150,7 @@ void vPortYieldProcessor( void )
void vNonPreemptiveTick( void ) __attribute__ ((interrupt ("IRQ")));
void vNonPreemptiveTick( void )
{
vTaskIncrementTick();
xTaskIncrementTick();
T0IR = 2;
VICVectAddr = portCLEAR_VIC_INTERRUPT;
}
@ -167,7 +167,7 @@ void vPortYieldProcessor( void )
/* Increment the RTOS tick count, then look for the highest priority
task that is ready to run. */
__asm volatile( "bl vTaskIncrementTick" );
__asm volatile( "bl xTaskIncrementTick" );
__asm volatile( "bl vTaskSwitchContext" );
/* Ready for the next interrupt. */

12
FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
View file

@ -293,14 +293,14 @@ void xPortSysTickHandler( void )
{
unsigned long ulDummy;
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
*(portNVIC_INT_CTRL) = portNVIC_PENDSVSET;
#endif
ulDummy = portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
/* Increment the RTOS tick. */
if( xTaskIncrementTick() != pdFALSE )
{
/* Pend a context switch. */
*(portNVIC_INT_CTRL) = portNVIC_PENDSVSET;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulDummy );
}

18
FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
View file

@ -354,11 +354,6 @@ void xPortPendSVHandler( void )
void xPortSysTickHandler( void )
{
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
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
@ -367,9 +362,18 @@ void xPortSysTickHandler( void )
portNVIC_SYSTICK_LOAD_REG = ulTimerReloadValueForOneTick;
#endif
/* The SysTick runs at the lowest interrupt priority, so when this interrupt
executes all interrupts must be unmasked. There is therefore no need to
save and then restore the interrupt mask value as its value is already
known. */
( void ) portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
/* A context switch is required. Context switching is performed in
the PendSV interrupt. Pend the PendSV interrupt. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
}
@ -444,8 +448,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__asm volatile( "wfi" );
__asm volatile( "dsb" );
__asm volatile( "wfi" );
__asm volatile( "isb" );
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );

12
FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
View file

@ -452,14 +452,14 @@ void xPortSysTickHandler( void )
{
unsigned long ulDummy;
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
*(portNVIC_INT_CTRL) = portNVIC_PENDSVSET;
#endif
ulDummy = portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
/* Increment the RTOS tick. */
if( xTaskIncrementTick() != pdFALSE )
{
/* Pend a context switch. */
*(portNVIC_INT_CTRL) = portNVIC_PENDSVSET;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulDummy );
}

14
FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
View file

@ -387,11 +387,6 @@ void xPortPendSVHandler( void )
void xPortSysTickHandler( void )
{
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
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
@ -402,7 +397,12 @@ void xPortSysTickHandler( void )
( void ) portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
/* Increment the RTOS tick count. */
if( xTaskIncrementTick() != pdFALSE )
{
/* Pend a context switch. */
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
}
@ -477,8 +477,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__asm volatile( "wfi" );
__asm volatile( "dsb" );
__asm volatile( "wfi" );
__asm volatile( "isb" );
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );

6
FreeRTOS/Source/portable/GCC/ATMega323/port.c
View file

@ -393,8 +393,10 @@ void vPortYieldFromTick( void ) __attribute__ ( ( naked ) );
void vPortYieldFromTick( void )
{
portSAVE_CONTEXT();
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
}
portRESTORE_CONTEXT();
asm volatile ( "ret" );
@ -463,7 +465,7 @@ unsigned char ucHighByte, ucLowByte;
void SIG_OUTPUT_COMPARE1A( void ) __attribute__ ( ( signal ) );
void SIG_OUTPUT_COMPARE1A( void )
{
vTaskIncrementTick();
xTaskIncrementTick();
}
#endif

2
FreeRTOS/Source/portable/GCC/AVR32_UC3/port.c
View file

@ -254,7 +254,7 @@ __attribute__((__naked__)) static void vTick( void )
/* Because FreeRTOS is not supposed to run with nested interrupts, put all OS
calls in a critical section . */
portENTER_CRITICAL();
vTaskIncrementTick();
xTaskIncrementTick();
portEXIT_CRITICAL();
/* Restore the context of the "elected task". */

7
FreeRTOS/Source/portable/GCC/CORTUS_APS3/port.c
View file

@ -170,11 +170,10 @@ void interrupt31_handler( void )
static void prvProcessTick( void ) __attribute__((noinline));
static void prvProcessTick( void )
{
vTaskIncrementTick();
#if configUSE_PREEMPTION == 1
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
#endif
}
/* Clear the Tick Interrupt. */
counter1->expired = 0;

6
FreeRTOS/Source/portable/GCC/H8S2329/port.c
View file

@ -293,8 +293,10 @@ void vPortYield( void )
{
portSAVE_STACK_POINTER();
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
}
/* Clear the interrupt. */
TSR1 &= ~0x01;
@ -312,7 +314,7 @@ void vPortYield( void )
void vTickISR( void ) __attribute__ ( ( interrupt_handler ) );
void vTickISR( void )
{
vTaskIncrementTick();
xTaskIncrementTick();
/* Clear the interrupt. */
TSR1 &= ~0x01;

10
FreeRTOS/Source/portable/GCC/HCS12/port.c
View file

@ -263,11 +263,11 @@ void vPortTickInterrupt( void )
portSAVE_CONTEXT();
/* Increment the tick ... */
vTaskIncrementTick();
/* ... then see if the new tick value has necessitated a
context switch. */
if( xTaskIncrementTick() != pdFALSE )
{
/* A context switch is necessary. */
vTaskSwitchContext();
}
/* Restore the context of a task - which may be a different task
to that interrupted. */
@ -275,7 +275,7 @@ void vPortTickInterrupt( void )
}
#else
{
vTaskIncrementTick();
xTaskIncrementTick();
}
#endif

6
FreeRTOS/Source/portable/GCC/MCF5235/port.c
View file

@ -194,7 +194,7 @@ prvPortPreemptiveTick ( void )
* simply increment the system tick.
*/
vTaskIncrementTick( );
xTaskIncrementTick();
MCF_PIT_PCSR0 |= MCF_PIT_PCSR_PIF;
}
@ -209,8 +209,10 @@ prvPortPreemptiveTick( void )
#endif
portSAVE_CONTEXT( );
MCF_PIT_PCSR0 |= MCF_PIT_PCSR_PIF;
vTaskIncrementTick( );
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext( );
}
portRESTORE_CONTEXT( );
}
#endif

11
FreeRTOS/Source/portable/GCC/MicroBlaze/port.c
View file

@ -359,17 +359,14 @@ void vTickISR( void *pvBaseAddress )
unsigned long ulCSR;
/* Increment the RTOS tick - this might cause a task to unblock. */
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
vTaskSwitchContext();
}
/* Clear the timer interrupt */
ulCSR = XTmrCtr_mGetControlStatusReg(XPAR_OPB_TIMER_1_BASEADDR, 0);
XTmrCtr_mSetControlStatusReg( XPAR_OPB_TIMER_1_BASEADDR, portCOUNTER_0, ulCSR );
/* If we are using the preemptive scheduler then we also need to determine
if this tick should cause a context switch. */
#if configUSE_PREEMPTION == 1
vTaskSwitchContext();
#endif
}
/*-----------------------------------------------------------*/

10
FreeRTOS/Source/portable/GCC/MicroBlazeV8/port.c
View file

@ -433,15 +433,11 @@ extern void vApplicationClearTimerInterrupt( void );
vApplicationClearTimerInterrupt();
/* Increment the RTOS tick - this might cause a task to unblock. */
vTaskIncrementTick();
/* If the preemptive scheduler is being used then a context switch should be
requested in case incrementing the tick unblocked a task, or a time slice
should cause another task to enter the Running state. */
#if configUSE_PREEMPTION == 1
if( xTaskIncrementTick() != pdFALSE )
{
/* Force vTaskSwitchContext() to be called as the interrupt exits. */
ulTaskSwitchRequested = 1;
#endif
}
}
/*-----------------------------------------------------------*/

12
FreeRTOS/Source/portable/IAR/ARM_CM3/port.c
View file

@ -250,11 +250,6 @@ void vPortExitCritical( void )
void xPortSysTickHandler( void )
{
/* If using preemption, also force a context switch. */
#if configUSE_PREEMPTION == 1
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
@ -265,7 +260,10 @@ void xPortSysTickHandler( void )
( void ) portSET_INTERRUPT_MASK_FROM_ISR();
{
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
}
}
portCLEAR_INTERRUPT_MASK_FROM_ISR( 0 );
}
@ -340,8 +338,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__WFI();
__DSB();
__WFI();
__ISB();
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );

2
FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
View file

@ -365,8 +365,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__WFI();
__DSB();
__WFI();
__ISB();
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );

10
FreeRTOS/Source/portable/IAR/RX600/port.c
View file

@ -219,14 +219,12 @@ __interrupt void vTickISR( void )
necessitates. */
__set_interrupt_level( configMAX_SYSCALL_INTERRUPT_PRIORITY );
{
vTaskIncrementTick();
if( xTaskIncrementTick() != pdFALSE )
{
taskYIELD();
}
}
__set_interrupt_level( configKERNEL_INTERRUPT_PRIORITY );
/* Only select a new task if the preemptive scheduler is being used. */
#if( configUSE_PREEMPTION == 1 )
taskYIELD();
#endif
}
/*-----------------------------------------------------------*/

13
FreeRTOS/Source/portable/MSVC-MingW/port.c
View file

@ -301,18 +301,7 @@ static unsigned long prvProcessTickInterrupt( void )
unsigned long ulSwitchRequired;
/* Process the tick itself. */
vTaskIncrementTick();
#if( configUSE_PREEMPTION != 0 )
{
/* A context switch is only automatically performed from the tick
interrupt if the pre-emptive scheduler is being used. */
ulSwitchRequired = pdTRUE;
}
#else
{
ulSwitchRequired = pdFALSE;
}
#endif
ulSwitchRequired = ( unsigned long ) xTaskIncrementTick();
return ulSwitchRequired;
}

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

@ -417,8 +417,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__wfi();
__dsb( portSY_FULL_READ_WRITE );
__wfi();
__isb( portSY_FULL_READ_WRITE );
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );

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

@ -480,8 +480,8 @@ void xPortSysTickHandler( void )
configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
if( xModifiableIdleTime > 0 )
{
__wfi();
__dsb( portSY_FULL_READ_WRITE );
__wfi();
__isb( portSY_FULL_READ_WRITE );
}
configPOST_SLEEP_PROCESSING( xExpectedIdleTime );