From 4918283003a6a3b3bbe94ab138a7911f5541af97 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 12 Apr 2008 09:46:19 +0000 Subject: [PATCH] Introduce the application task hook feature. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@301 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Source/tasks.c | 102 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 31 deletions(-) diff --git a/Source/tasks.c b/Source/tasks.c index 994c23387..6aae804b7 100644 --- a/Source/tasks.c +++ b/Source/tasks.c @@ -61,31 +61,6 @@ #define tskIDLE_STACK_SIZE configMINIMAL_STACK_SIZE -/* - * Default a definitions for backwards compatibility with old - * portmacro.h files. - */ -#ifndef configMAX_TASK_NAME_LEN - #define configMAX_TASK_NAME_LEN 16 -#endif - -#ifndef configIDLE_SHOULD_YIELD - #define configIDLE_SHOULD_YIELD 1 -#endif - -#if configMAX_TASK_NAME_LEN < 1 - #undef configMAX_TASK_NAME_LEN - #define configMAX_TASK_NAME_LEN 1 -#endif - -#ifndef INCLUDE_xTaskResumeFromISR - #define INCLUDE_xTaskResumeFromISR 1 -#endif - -#ifndef INCLUDE_xTaskGetSchedulerState - #define INCLUDE_xTaskGetSchedulerState 0 -#endif - /* * Task control block. A task control block (TCB) is allocated to each task, * and stores the context of the task. @@ -110,6 +85,10 @@ typedef struct tskTaskControlBlock #if ( configUSE_MUTEXES == 1 ) unsigned portBASE_TYPE uxBasePriority; #endif + + #if ( configUSE_APPLICATION_TASK_HOOK == 1 ) + pdTASK_HOOK_CODE pxTaskHook; + #endif } tskTCB; @@ -1412,6 +1391,61 @@ inline void vTaskIncrementTick( void ) #endif /*-----------------------------------------------------------*/ +#if ( configUSE_APPLICATION_TASK_HOOK == 1 ) + + void vTaskSetApplicationTaskHook( xTaskHandle xTask, pdTASK_HOOK_CODE pxHookFunction ) + { + tskTCB *xTCB; + + /* If xTask is NULL then we are setting our own task hook. */ + if( xTask == NULL ) + { + xTCB = ( tskTCB * ) pxCurrentTCB; + } + else + { + xTCB = ( tskTCB * ) xTask; + } + + /* Save the hook function in the TCB. */ + xTCB->pxTaskHook = pxHookFunction; + } + +#endif +/*-----------------------------------------------------------*/ + +#if ( configUSE_APPLICATION_TASK_HOOK == 1 ) + + portBASE_TYPE xTaskCallApplicationTaskHook( xTaskHandle xTask, void *pvParameter ) + { + tskTCB *xTCB; + portBASE_TYPE xReturn; + + /* If xTask is NULL then we are calling our own task hook. */ + if( xTask == NULL ) + { + xTCB = ( tskTCB * ) pxCurrentTCB; + } + else + { + xTCB = ( tskTCB * ) xTask; + } + + if( xTCB->pxTaskHook != NULL ) + { + xReturn = xTCB->pxTaskHook( pvParameter ); + } + else + { + xReturn = pdFAIL; + } + + return xReturn; + } + +#endif +/*-----------------------------------------------------------*/ + void vTaskSwitchContext( void ) { traceTASK_SWITCHED_OUT(); @@ -1695,12 +1729,6 @@ static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed portCHAR * co strncpy( ( char * ) pxTCB->pcTaskName, ( const char * ) pcName, ( unsigned portSHORT ) configMAX_TASK_NAME_LEN ); pxTCB->pcTaskName[ ( unsigned portSHORT ) configMAX_TASK_NAME_LEN - ( unsigned portSHORT ) 1 ] = '\0'; - #if ( portCRITICAL_NESTING_IN_TCB == 1 ) - { - pxTCB->uxCriticalNesting = ( unsigned portBASE_TYPE ) 0; - } - #endif - /* This is used as an array index so must ensure it's not too large. */ if( uxPriority >= configMAX_PRIORITIES ) { @@ -1724,6 +1752,18 @@ static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed portCHAR * co /* Event lists are always in priority order. */ listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), configMAX_PRIORITIES - ( portTickType ) uxPriority ); listSET_LIST_ITEM_OWNER( &( pxTCB->xEventListItem ), pxTCB ); + + #if ( portCRITICAL_NESTING_IN_TCB == 1 ) + { + pxTCB->uxCriticalNesting = ( unsigned portBASE_TYPE ) 0; + } + #endif + + #if ( configUSE_APPLICATION_TASK_HOOK == 1 ) + { + pxTCB->pxTaskHook = NULL; + } + #endif } /*-----------------------------------------------------------*/ -- 2.39.5