mirror of
https://github.com/FreeRTOS/FreeRTOS.git
synced 2025-07-25 06:32:39 +08:00
Update ports that have their tick configuration in an application callback to use xTaskIncrementTick() in place of vTaskIncrementTick().
This commit is contained in:
FreeRTOS
Demo
ColdFire_MCF52221_CodeWarrior/sources
ColdFire_MCF52233_Eclipse/RTOSDemo
ColdFire_MCF52259_CodeWarrior
ColdFire_MCF5282_Eclipse/RTOSDemo
Source/portable/GCC/RX600
@ -148,14 +148,9 @@ unsigned portLONG ulSavedInterruptMask;
|
|||||||
|
|
||||||
/* Increment the RTOS tick. */
|
/* Increment the RTOS tick. */
|
||||||
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||||
vTaskIncrementTick();
|
if( xTaskIncrementTick() != pdFALSE )
|
||||||
|
{
|
||||||
|
taskYIELD();
|
||||||
|
}
|
||||||
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
|
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
|
|
||||||
{
|
|
||||||
taskYIELD();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
@ -147,14 +147,9 @@ unsigned portLONG ulSavedInterruptMask;
|
|||||||
|
|
||||||
/* Increment the RTOS tick. */
|
/* Increment the RTOS tick. */
|
||||||
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||||
vTaskIncrementTick();
|
if( xTaskIncrementTick() != pdFALSE )
|
||||||
|
{
|
||||||
|
taskYIELD();
|
||||||
|
}
|
||||||
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
|
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
|
|
||||||
{
|
|
||||||
taskYIELD();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
@ -148,14 +148,9 @@ unsigned portLONG ulSavedInterruptMask;
|
|||||||
|
|
||||||
/* Increment the RTOS tick. */
|
/* Increment the RTOS tick. */
|
||||||
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||||
vTaskIncrementTick();
|
if( xTaskIncrementTick() != pdFALSE )
|
||||||
|
{
|
||||||
|
taskYIELD();
|
||||||
|
}
|
||||||
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
|
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
|
|
||||||
{
|
|
||||||
taskYIELD();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
@ -147,14 +147,9 @@ unsigned portLONG ulSavedInterruptMask;
|
|||||||
|
|
||||||
/* Increment the RTOS tick. */
|
/* Increment the RTOS tick. */
|
||||||
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
ulSavedInterruptMask = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||||
vTaskIncrementTick();
|
if( xTaskIncrementTick() != pdFALSE )
|
||||||
|
{
|
||||||
|
taskYIELD();
|
||||||
|
}
|
||||||
portCLEAR_INTERRUPT_MASK_FROM_ISR( ulSavedInterruptMask );
|
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
|
|
||||||
{
|
|
||||||
taskYIELD();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
@ -364,7 +364,7 @@ void vTickISR( void )
|
|||||||
necessitates. Ensure IPL is at the max syscall value first. */
|
necessitates. Ensure IPL is at the max syscall value first. */
|
||||||
portDISABLE_INTERRUPTS_FROM_KERNEL_ISR();
|
portDISABLE_INTERRUPTS_FROM_KERNEL_ISR();
|
||||||
{
|
{
|
||||||
if( TaskIncrementTick() != pdFALSE )
|
if( xTaskIncrementTick() != pdFALSE )
|
||||||
{
|
{
|
||||||
taskYIELD();
|
taskYIELD();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user