Replace FreeRTOS core/non-portable files with unmodified variants from vanilla 7.5.2

This commit is contained in:
Angus Gratton 2015-05-07 12:12:53 +10:00
parent b50ba19b1f
commit b7e0e232dd
5 changed files with 152 additions and 325 deletions

View file

@ -101,7 +101,7 @@ privileged Vs unprivileged linkage and placement. */
/*
* Defines the size, in words, of the stack allocated to the idle task.
*/
#define tskIDLE_STACK_SIZE 176 //configMINIMAL_STACK_SIZE
#define tskIDLE_STACK_SIZE configMINIMAL_STACK_SIZE
/*
* Task control block. A task control block (TCB) is allocated for each task,
@ -475,8 +475,7 @@ static tskTCB *prvAllocateTCBAndStack( unsigned short usStackDepth, portSTACK_TY
#endif
signed portBASE_TYPE ICACHE_FLASH_ATTR
xTaskGenericCreate( pdTASK_CODE pxTaskCode, const signed char * const pcName, unsigned short usStackDepth, void *pvParameters, unsigned portBASE_TYPE uxPriority, xTaskHandle *pxCreatedTask, portSTACK_TYPE *puxStackBuffer, const xMemoryRegion * const xRegions )
signed portBASE_TYPE xTaskGenericCreate( pdTASK_CODE pxTaskCode, const signed char * const pcName, unsigned short usStackDepth, void *pvParameters, unsigned portBASE_TYPE uxPriority, xTaskHandle *pxCreatedTask, portSTACK_TYPE *puxStackBuffer, const xMemoryRegion * const xRegions )
{
signed portBASE_TYPE xReturn;
tskTCB * pxNewTCB;
@ -632,8 +631,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskDelete == 1 )
void ICACHE_FLASH_ATTR
vTaskDelete( xTaskHandle xTaskToDelete )
void vTaskDelete( xTaskHandle xTaskToDelete )
{
tskTCB *pxTCB;
@ -687,8 +685,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskDelayUntil == 1 )
void ICACHE_FLASH_ATTR
vTaskDelayUntil( portTickType * const pxPreviousWakeTime, portTickType xTimeIncrement )
void vTaskDelayUntil( portTickType * const pxPreviousWakeTime, portTickType xTimeIncrement )
{
portTickType xTimeToWake;
portBASE_TYPE xAlreadyYielded, xShouldDelay = pdFALSE;
@ -764,8 +761,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskDelay == 1 )
void ICACHE_FLASH_ATTR
vTaskDelay( portTickType xTicksToDelay )
void vTaskDelay( portTickType xTicksToDelay )
{
portTickType xTimeToWake;
signed portBASE_TYPE xAlreadyYielded = pdFALSE;
@ -817,8 +813,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_eTaskGetState == 1 )
eTaskState ICACHE_FLASH_ATTR
eTaskGetState( xTaskHandle xTask )
eTaskState eTaskGetState( xTaskHandle xTask )
{
eTaskState eReturn;
xList *pxStateList;
@ -878,8 +873,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_uxTaskPriorityGet == 1 )
unsigned portBASE_TYPE ICACHE_FLASH_ATTR
uxTaskPriorityGet( xTaskHandle xTask )
unsigned portBASE_TYPE uxTaskPriorityGet( xTaskHandle xTask )
{
tskTCB *pxTCB;
unsigned portBASE_TYPE uxReturn;
@ -901,8 +895,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskPrioritySet == 1 )
void ICACHE_FLASH_ATTR
vTaskPrioritySet( xTaskHandle xTask, unsigned portBASE_TYPE uxNewPriority )
void vTaskPrioritySet( xTaskHandle xTask, unsigned portBASE_TYPE uxNewPriority )
{
tskTCB *pxTCB;
unsigned portBASE_TYPE uxCurrentBasePriority, uxPriorityUsedOnEntry;
@ -1033,8 +1026,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskSuspend == 1 )
void ICACHE_FLASH_ATTR
vTaskSuspend( xTaskHandle xTaskToSuspend )
void vTaskSuspend( xTaskHandle xTaskToSuspend )
{
tskTCB *pxTCB;
@ -1095,8 +1087,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskSuspend == 1 )
signed portBASE_TYPE ICACHE_FLASH_ATTR
xTaskIsTaskSuspended( xTaskHandle xTask )
signed portBASE_TYPE xTaskIsTaskSuspended( xTaskHandle xTask )
{
portBASE_TYPE xReturn = pdFALSE;
const tskTCB * const pxTCB = ( tskTCB * ) xTask;
@ -1130,8 +1121,7 @@ tskTCB * pxNewTCB;
#if ( INCLUDE_vTaskSuspend == 1 )
void ICACHE_FLASH_ATTR
vTaskResume( xTaskHandle xTaskToResume )
void vTaskResume( xTaskHandle xTaskToResume )
{
tskTCB * const pxTCB = ( tskTCB * ) xTaskToResume;
@ -1172,8 +1162,7 @@ tskTCB * pxNewTCB;
#if ( ( INCLUDE_xTaskResumeFromISR == 1 ) && ( INCLUDE_vTaskSuspend == 1 ) )
portBASE_TYPE
xTaskResumeFromISR( xTaskHandle xTaskToResume )
portBASE_TYPE xTaskResumeFromISR( xTaskHandle xTaskToResume )
{
portBASE_TYPE xYieldRequired = pdFALSE;
tskTCB * const pxTCB = ( tskTCB * ) xTaskToResume;
@ -1199,9 +1188,7 @@ tskTCB * pxNewTCB;
http://www.freertos.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
// uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
portSET_INTERRUPT_MASK_FROM_ISR();
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
{
if( xTaskIsTaskSuspended( pxTCB ) == pdTRUE )
{
@ -1230,8 +1217,7 @@ tskTCB * pxNewTCB;
#endif /* ( ( INCLUDE_xTaskResumeFromISR == 1 ) && ( INCLUDE_vTaskSuspend == 1 ) ) */
/*-----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskStartScheduler( void )
void vTaskStartScheduler( void )
{
portBASE_TYPE xReturn;
@ -1241,7 +1227,6 @@ portBASE_TYPE xReturn;
/* Create the idle task, storing its handle in xIdleTaskHandle so it can
be returned by the xTaskGetIdleTaskHandle() function. */
xReturn = xTaskCreate( prvIdleTask, ( signed char * ) "IDLE", tskIDLE_STACK_SIZE, ( void * ) NULL, ( tskIDLE_PRIORITY | portPRIVILEGE_BIT ), &xIdleTaskHandle ); /*lint !e961 MISRA exception, justified as it is not a redundant explicit cast to all supported compilers. */
printf("idle_task_hdl : %x\n", xIdleTaskHandle);
}
#else
{
@ -1269,8 +1254,7 @@ printf("idle_task_hdl : %x\n", xIdleTaskHandle);
STEPPING THROUGH HERE USING A DEBUGGER CAN CAUSE BIG PROBLEMS IF THE
DEBUGGER ALLOWS INTERRUPTS TO BE PROCESSED. */
//portDISABLE_INTERRUPTS();
PortDisableInt_NoNest();
portDISABLE_INTERRUPTS();
xSchedulerRunning = pdTRUE;
xTickCount = ( portTickType ) 0U;
@ -1302,22 +1286,18 @@ PortDisableInt_NoNest();
}
/*-----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskEndScheduler( void )
void vTaskEndScheduler( void )
{
/* Stop the scheduler interrupts and call the portable scheduler end
routine so the original ISRs can be restored if necessary. The port
layer must ensure interrupts enable bit is left in the correct state. */
//portDISABLE_INTERRUPTS();
PortDisableInt_NoNest();
portDISABLE_INTERRUPTS();
xSchedulerRunning = pdFALSE;
vPortEndScheduler();
}
/*----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskSuspendAll( void )
void vTaskSuspendAll( void )
{
/* A critical section is not required as the variable is of type
portBASE_TYPE. */
@ -1327,8 +1307,7 @@ vTaskSuspendAll( void )
#if ( configUSE_TICKLESS_IDLE != 0 )
static portTickType ICACHE_FLASH_ATTR
prvGetExpectedIdleTime( void )
static portTickType prvGetExpectedIdleTime( void )
{
portTickType xReturn;
@ -1354,8 +1333,7 @@ vTaskSuspendAll( void )
#endif /* configUSE_TICKLESS_IDLE */
/*----------------------------------------------------------*/
signed portBASE_TYPE ICACHE_FLASH_ATTR
xTaskResumeAll( void )
signed portBASE_TYPE xTaskResumeAll( void )
{
tskTCB *pxTCB;
portBASE_TYPE xAlreadyYielded = pdFALSE;
@ -1425,8 +1403,7 @@ portBASE_TYPE xYieldRequired = pdFALSE;
}
/*-----------------------------------------------------------*/
portTickType ICACHE_FLASH_ATTR
xTaskGetTickCount( void )
portTickType xTaskGetTickCount( void )
{
portTickType xTicks;
@ -1441,8 +1418,7 @@ portTickType xTicks;
}
/*-----------------------------------------------------------*/
portTickType
xTaskGetTickCountFromISR( void )
portTickType xTaskGetTickCountFromISR( void )
{
portTickType xReturn;
unsigned portBASE_TYPE uxSavedInterruptStatus;
@ -1463,9 +1439,7 @@ unsigned portBASE_TYPE uxSavedInterruptStatus;
link: http://www.freertos.org/RTOS-Cortex-M3-M4.html */
portASSERT_IF_INTERRUPT_PRIORITY_INVALID();
// uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
portSET_INTERRUPT_MASK_FROM_ISR();
uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();
xReturn = xTickCount;
portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );
@ -1473,8 +1447,7 @@ unsigned portBASE_TYPE uxSavedInterruptStatus;
}
/*-----------------------------------------------------------*/
unsigned portBASE_TYPE ICACHE_FLASH_ATTR
uxTaskGetNumberOfTasks( void )
unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
{
/* A critical section is not required because the variables are of type
portBASE_TYPE. */
@ -1484,8 +1457,7 @@ uxTaskGetNumberOfTasks( void )
#if ( INCLUDE_pcTaskGetTaskName == 1 )
signed char * ICACHE_FLASH_ATTR
pcTaskGetTaskName( xTaskHandle xTaskToQuery )
signed char *pcTaskGetTaskName( xTaskHandle xTaskToQuery )
{
tskTCB *pxTCB;
@ -1500,8 +1472,7 @@ uxTaskGetNumberOfTasks( void )
#if ( configUSE_TRACE_FACILITY == 1 )
unsigned portBASE_TYPE ICACHE_FLASH_ATTR
uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime )
unsigned portBASE_TYPE uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime )
{
unsigned portBASE_TYPE uxTask = 0, uxQueue = configMAX_PRIORITIES;
@ -1567,8 +1538,7 @@ uxTaskGetNumberOfTasks( void )
#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
xTaskHandle ICACHE_FLASH_ATTR
xTaskGetIdleTaskHandle( void )
xTaskHandle xTaskGetIdleTaskHandle( void )
{
/* If xTaskGetIdleTaskHandle() is called before the scheduler has been
started, then xIdleTaskHandle will be NULL. */
@ -1585,8 +1555,7 @@ implementations require configUSE_TICKLESS_IDLE to be set to a value other than
1. */
#if ( configUSE_TICKLESS_IDLE != 0 )
void ICACHE_FLASH_ATTR
vTaskStepTick( portTickType xTicksToJump )
void vTaskStepTick( portTickType xTicksToJump )
{
/* Correct the tick count value after a period during which the tick
was suppressed. Note this does *not* call the tick hook function for
@ -1599,8 +1568,7 @@ implementations require configUSE_TICKLESS_IDLE to be set to a value other than
#endif /* configUSE_TICKLESS_IDLE */
/*----------------------------------------------------------*/
portBASE_TYPE
xTaskIncrementTick( void )
portBASE_TYPE xTaskIncrementTick( void )
{
tskTCB * pxTCB;
portTickType xItemValue;
@ -1737,8 +1705,7 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
#if ( configUSE_APPLICATION_TASK_TAG == 1 )
void ICACHE_FLASH_ATTR
vTaskSetApplicationTaskTag( xTaskHandle xTask, pdTASK_HOOK_CODE pxHookFunction )
void vTaskSetApplicationTaskTag( xTaskHandle xTask, pdTASK_HOOK_CODE pxHookFunction )
{
tskTCB *xTCB;
@ -1764,8 +1731,7 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
#if ( configUSE_APPLICATION_TASK_TAG == 1 )
pdTASK_HOOK_CODE ICACHE_FLASH_ATTR
xTaskGetApplicationTaskTag( xTaskHandle xTask )
pdTASK_HOOK_CODE xTaskGetApplicationTaskTag( xTaskHandle xTask )
{
tskTCB *xTCB;
pdTASK_HOOK_CODE xReturn;
@ -1794,8 +1760,7 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
#if ( configUSE_APPLICATION_TASK_TAG == 1 )
portBASE_TYPE ICACHE_FLASH_ATTR
xTaskCallApplicationTaskHook( xTaskHandle xTask, void *pvParameter )
portBASE_TYPE xTaskCallApplicationTaskHook( xTaskHandle xTask, void *pvParameter )
{
tskTCB *xTCB;
portBASE_TYPE xReturn;
@ -1825,8 +1790,7 @@ portBASE_TYPE xSwitchRequired = pdFALSE;
#endif /* configUSE_APPLICATION_TASK_TAG */
/*-----------------------------------------------------------*/
void
vTaskSwitchContext( void )
void vTaskSwitchContext( void )
{
if( uxSchedulerSuspended != ( unsigned portBASE_TYPE ) pdFALSE )
{
@ -1879,8 +1843,7 @@ vTaskSwitchContext( void )
}
/*-----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskPlaceOnEventList( xList * const pxEventList, portTickType xTicksToWait )
void vTaskPlaceOnEventList( xList * const pxEventList, portTickType xTicksToWait )
{
portTickType xTimeToWake;
@ -1934,8 +1897,7 @@ portTickType xTimeToWake;
#if configUSE_TIMERS == 1
void ICACHE_FLASH_ATTR
vTaskPlaceOnEventListRestricted( xList * const pxEventList, portTickType xTicksToWait )
void vTaskPlaceOnEventListRestricted( xList * const pxEventList, portTickType xTicksToWait )
{
portTickType xTimeToWake;
@ -1974,8 +1936,7 @@ portTickType xTimeToWake;
#endif /* configUSE_TIMERS */
/*-----------------------------------------------------------*/
signed portBASE_TYPE
xTaskRemoveFromEventList( const xList * const pxEventList )
signed portBASE_TYPE xTaskRemoveFromEventList( const xList * const pxEventList )
{
tskTCB *pxUnblockedTCB;
portBASE_TYPE xReturn;
@ -2026,8 +1987,7 @@ portBASE_TYPE xReturn;
}
/*-----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskSetTimeOutState( xTimeOutType * const pxTimeOut )
void vTaskSetTimeOutState( xTimeOutType * const pxTimeOut )
{
configASSERT( pxTimeOut );
pxTimeOut->xOverflowCount = xNumOfOverflows;
@ -2035,8 +1995,7 @@ vTaskSetTimeOutState( xTimeOutType * const pxTimeOut )
}
/*-----------------------------------------------------------*/
portBASE_TYPE ICACHE_FLASH_ATTR
xTaskCheckForTimeOut( xTimeOutType * const pxTimeOut, portTickType * const pxTicksToWait )
portBASE_TYPE xTaskCheckForTimeOut( xTimeOutType * const pxTimeOut, portTickType * const pxTicksToWait )
{
portBASE_TYPE xReturn;
@ -2085,8 +2044,7 @@ portBASE_TYPE xReturn;
}
/*-----------------------------------------------------------*/
void ICACHE_FLASH_ATTR
vTaskMissedYield( void )
void vTaskMissedYield( void )
{
xYieldPending = pdTRUE;
}
@ -2094,8 +2052,7 @@ vTaskMissedYield( void )
#if ( configUSE_TRACE_FACILITY == 1 )
unsigned portBASE_TYPE ICACHE_FLASH_ATTR
uxTaskGetTaskNumber( xTaskHandle xTask )
unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask )
{
unsigned portBASE_TYPE uxReturn;
tskTCB *pxTCB;
@ -2118,8 +2075,7 @@ vTaskMissedYield( void )
#if ( configUSE_TRACE_FACILITY == 1 )
void ICACHE_FLASH_ATTR
vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle )
void vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle )
{
tskTCB *pxTCB;
@ -2143,8 +2099,7 @@ vTaskMissedYield( void )
* void prvIdleTask( void *pvParameters );
*
*/
static ICACHE_FLASH_ATTR
portTASK_FUNCTION( prvIdleTask, pvParameters )
static portTASK_FUNCTION( prvIdleTask, pvParameters )
{
/* Stop warnings. */
( void ) pvParameters;
@ -2237,8 +2192,7 @@ portTASK_FUNCTION( prvIdleTask, pvParameters )
#if configUSE_TICKLESS_IDLE != 0
eSleepModeStatus ICACHE_FLASH_ATTR
eTaskConfirmSleepModeStatus( void )
eSleepModeStatus eTaskConfirmSleepModeStatus( void )
{
eSleepModeStatus eReturn = eStandardSleep;
@ -2276,8 +2230,7 @@ portTASK_FUNCTION( prvIdleTask, pvParameters )
#endif /* configUSE_TICKLESS_IDLE */
/*-----------------------------------------------------------*/
static void ICACHE_FLASH_ATTR
prvInitialiseTCBVariables( tskTCB *pxTCB, const signed char * const pcName, unsigned portBASE_TYPE uxPriority, const xMemoryRegion * const xRegions, unsigned short usStackDepth )
static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed char * const pcName, unsigned portBASE_TYPE uxPriority, const xMemoryRegion * const xRegions, unsigned short usStackDepth )
{
unsigned portBASE_TYPE x;
@ -2364,8 +2317,7 @@ unsigned portBASE_TYPE x;
#if ( portUSING_MPU_WRAPPERS == 1 )
void ICACHE_FLASH_ATTR
vTaskAllocateMPURegions( xTaskHandle xTaskToModify, const xMemoryRegion * const xRegions )
void vTaskAllocateMPURegions( xTaskHandle xTaskToModify, const xMemoryRegion * const xRegions )
{
tskTCB *pxTCB;
@ -2378,8 +2330,7 @@ unsigned portBASE_TYPE x;
#endif /* portUSING_MPU_WRAPPERS */
/*-----------------------------------------------------------*/
static void ICACHE_FLASH_ATTR
prvInitialiseTaskLists( void )
static void prvInitialiseTaskLists( void )
{
unsigned portBASE_TYPE uxPriority;
@ -2411,8 +2362,7 @@ unsigned portBASE_TYPE uxPriority;
}
/*-----------------------------------------------------------*/
static void ICACHE_FLASH_ATTR
prvCheckTasksWaitingTermination( void )
static void prvCheckTasksWaitingTermination( void )
{
#if ( INCLUDE_vTaskDelete == 1 )
{
@ -2447,8 +2397,7 @@ prvCheckTasksWaitingTermination( void )
}
/*-----------------------------------------------------------*/
static void ICACHE_FLASH_ATTR
prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
static void prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
{
/* The list item will be inserted in wake time order. */
listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xGenericListItem ), xTimeToWake );
@ -2474,8 +2423,7 @@ prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
}
/*-----------------------------------------------------------*/
static tskTCB * ICACHE_FLASH_ATTR
prvAllocateTCBAndStack( unsigned short usStackDepth, portSTACK_TYPE *puxStackBuffer )
static tskTCB *prvAllocateTCBAndStack( unsigned short usStackDepth, portSTACK_TYPE *puxStackBuffer )
{
tskTCB *pxNewTCB;
@ -2489,6 +2437,7 @@ tskTCB *pxNewTCB;
The base of the stack memory stored in the TCB so the task can
be deleted later if required. */
pxNewTCB->pxStack = ( portSTACK_TYPE * ) pvPortMallocAligned( ( ( ( size_t ) usStackDepth ) * sizeof( portSTACK_TYPE ) ), puxStackBuffer ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */
if( pxNewTCB->pxStack == NULL )
{
/* Could not allocate the stack. Delete the allocated TCB. */
@ -2508,8 +2457,7 @@ tskTCB *pxNewTCB;
#if ( configUSE_TRACE_FACILITY == 1 )
static unsigned portBASE_TYPE ICACHE_FLASH_ATTR
prvListTaskWithinSingleList( xTaskStatusType *pxTaskStatusArray, xList *pxList, eTaskState eState )
static unsigned portBASE_TYPE prvListTaskWithinSingleList( xTaskStatusType *pxTaskStatusArray, xList *pxList, eTaskState eState )
{
volatile tskTCB *pxNextTCB, *pxFirstTCB;
unsigned portBASE_TYPE uxTask = 0;
@ -2575,8 +2523,7 @@ tskTCB *pxNewTCB;
#if ( ( configUSE_TRACE_FACILITY == 1 ) || ( INCLUDE_uxTaskGetStackHighWaterMark == 1 ) )
static unsigned short ICACHE_FLASH_ATTR
prvTaskCheckFreeStackSpace( const unsigned char * pucStackByte )
static unsigned short prvTaskCheckFreeStackSpace( const unsigned char * pucStackByte )
{
register unsigned short usCount = 0U;
@ -2596,8 +2543,7 @@ tskTCB *pxNewTCB;
#if ( INCLUDE_uxTaskGetStackHighWaterMark == 1 )
unsigned portBASE_TYPE ICACHE_FLASH_ATTR
uxTaskGetStackHighWaterMark( xTaskHandle xTask )
unsigned portBASE_TYPE uxTaskGetStackHighWaterMark( xTaskHandle xTask )
{
tskTCB *pxTCB;
unsigned char *pcEndOfStack;
@ -2625,8 +2571,7 @@ tskTCB *pxNewTCB;
#if ( INCLUDE_vTaskDelete == 1 )
static void ICACHE_FLASH_ATTR
prvDeleteTCB( tskTCB *pxTCB )
static void prvDeleteTCB( tskTCB *pxTCB )
{
/* This call is required specifically for the TriCore port. It must be
above the vPortFree() calls. The call is also used by ports/demos that
@ -2644,8 +2589,7 @@ tskTCB *pxNewTCB;
#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) )
xTaskHandle ICACHE_FLASH_ATTR
xTaskGetCurrentTaskHandle( void )
xTaskHandle xTaskGetCurrentTaskHandle( void )
{
xTaskHandle xReturn;
@ -2662,8 +2606,7 @@ tskTCB *pxNewTCB;
#if ( ( INCLUDE_xTaskGetSchedulerState == 1 ) || ( configUSE_TIMERS == 1 ) )
portBASE_TYPE ICACHE_FLASH_ATTR
xTaskGetSchedulerState( void )
portBASE_TYPE xTaskGetSchedulerState( void )
{
portBASE_TYPE xReturn;
@ -2691,8 +2634,7 @@ tskTCB *pxNewTCB;
#if ( configUSE_MUTEXES == 1 )
void ICACHE_FLASH_ATTR
vTaskPriorityInherit( xTaskHandle const pxMutexHolder )
void vTaskPriorityInherit( xTaskHandle const pxMutexHolder )
{
tskTCB * const pxTCB = ( tskTCB * ) pxMutexHolder;
@ -2734,8 +2676,7 @@ tskTCB *pxNewTCB;
#if ( configUSE_MUTEXES == 1 )
void
vTaskPriorityDisinherit( xTaskHandle const pxMutexHolder )
void vTaskPriorityDisinherit( xTaskHandle const pxMutexHolder )
{
tskTCB * const pxTCB = ( tskTCB * ) pxMutexHolder;
@ -2765,11 +2706,10 @@ tskTCB *pxNewTCB;
#if ( portCRITICAL_NESTING_IN_TCB == 1 )
void ICACHE_FLASH_ATTR
vTaskEnterCritical( void )
void vTaskEnterCritical( void )
{
//portDISABLE_INTERRUPTS();
PortDisableInt_NoNest();
portDISABLE_INTERRUPTS();
if( xSchedulerRunning != pdFALSE )
{
( pxCurrentTCB->uxCriticalNesting )++;
@ -2781,8 +2721,7 @@ PortDisableInt_NoNest();
#if ( portCRITICAL_NESTING_IN_TCB == 1 )
void ICACHE_FLASH_ATTR
vTaskExitCritical( void )
void vTaskExitCritical( void )
{
if( xSchedulerRunning != pdFALSE )
{
@ -2792,8 +2731,7 @@ PortDisableInt_NoNest();
if( pxCurrentTCB->uxCriticalNesting == 0U )
{
//portENABLE_INTERRUPTS();
PortEnableInt_NoNest();
portENABLE_INTERRUPTS();
}
}
}
@ -2804,8 +2742,7 @@ PortDisableInt_NoNest();
#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) )
void ICACHE_FLASH_ATTR
vTaskList( signed char *pcWriteBuffer )
void vTaskList( signed char *pcWriteBuffer )
{
xTaskStatusType *pxTaskStatusArray;
volatile unsigned portBASE_TYPE uxArraySize, x;
@ -2888,8 +2825,7 @@ PortDisableInt_NoNest();
#if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) )
void ICACHE_FLASH_ATTR
vTaskGetRunTimeStats( signed char *pcWriteBuffer )
void vTaskGetRunTimeStats( signed char *pcWriteBuffer )
{
xTaskStatusType *pxTaskStatusArray;
volatile unsigned portBASE_TYPE uxArraySize, x;