mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-06 06:04:33 +02:00
Merge branch 'bugfix/freertos_tasks_unused_var' into 'master'
bugfix (freertos): removed unused variable in tasks.c See merge request espressif/esp-idf!18976
This commit is contained in:
@@ -3299,18 +3299,28 @@ BaseType_t xTaskIncrementTick( void )
|
|||||||
{
|
{
|
||||||
TCB_t * pxTCB;
|
TCB_t * pxTCB;
|
||||||
TaskHookFunction_t xReturn;
|
TaskHookFunction_t xReturn;
|
||||||
|
#ifndef ESP_PLATFORM
|
||||||
UBaseType_t uxSavedInterruptStatus;
|
UBaseType_t uxSavedInterruptStatus;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* If xTask is NULL then set the calling task's hook. */
|
/* If xTask is NULL then set the calling task's hook. */
|
||||||
pxTCB = prvGetTCBFromHandle( xTask );
|
pxTCB = prvGetTCBFromHandle( xTask );
|
||||||
|
|
||||||
/* Save the hook function in the TCB. A critical section is required as
|
/* Save the hook function in the TCB. A critical section is required as
|
||||||
* the value can be accessed from an interrupt. */
|
* the value can be accessed from an interrupt. */
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
portENTER_CRITICAL_ISR(&xTaskQueueMutex);
|
portENTER_CRITICAL_ISR(&xTaskQueueMutex);
|
||||||
|
#else
|
||||||
|
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
xReturn = pxTCB->pxTaskTag;
|
xReturn = pxTCB->pxTaskTag;
|
||||||
}
|
}
|
||||||
|
#ifdef ESP_PLATFORM
|
||||||
portEXIT_CRITICAL_ISR(&xTaskQueueMutex);
|
portEXIT_CRITICAL_ISR(&xTaskQueueMutex);
|
||||||
|
#else
|
||||||
|
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
|
||||||
|
#endif
|
||||||
|
|
||||||
return xReturn;
|
return xReturn;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user