|
257 | 257 | configSTACK_DEPTH_TYPE uxTimerTaskStackSize; |
258 | 258 |
|
259 | 259 | vApplicationGetTimerTaskMemory( &pxTimerTaskTCBBuffer, &pxTimerTaskStackBuffer, &uxTimerTaskStackSize ); |
260 | | - xTimerTaskHandle = xTaskCreateStaticAffinitySet( prvTimerTask, |
| 260 | + xTimerTaskHandle = xTaskCreateStaticAffinitySet( &prvTimerTask, |
261 | 261 | configTIMER_SERVICE_TASK_NAME, |
262 | 262 | uxTimerTaskStackSize, |
263 | 263 | NULL, |
|
273 | 273 | } |
274 | 274 | #else /* if ( configSUPPORT_STATIC_ALLOCATION == 1 ) */ |
275 | 275 | { |
276 | | - xReturn = xTaskCreateAffinitySet( prvTimerTask, |
| 276 | + xReturn = xTaskCreateAffinitySet( &prvTimerTask, |
277 | 277 | configTIMER_SERVICE_TASK_NAME, |
278 | 278 | configTIMER_TASK_STACK_DEPTH, |
279 | 279 | NULL, |
|
292 | 292 | configSTACK_DEPTH_TYPE uxTimerTaskStackSize; |
293 | 293 |
|
294 | 294 | vApplicationGetTimerTaskMemory( &pxTimerTaskTCBBuffer, &pxTimerTaskStackBuffer, &uxTimerTaskStackSize ); |
295 | | - xTimerTaskHandle = xTaskCreateStatic( prvTimerTask, |
| 295 | + xTimerTaskHandle = xTaskCreateStatic( &prvTimerTask, |
296 | 296 | configTIMER_SERVICE_TASK_NAME, |
297 | 297 | uxTimerTaskStackSize, |
298 | 298 | NULL, |
|
307 | 307 | } |
308 | 308 | #else /* if ( configSUPPORT_STATIC_ALLOCATION == 1 ) */ |
309 | 309 | { |
310 | | - xReturn = xTaskCreate( prvTimerTask, |
| 310 | + xReturn = xTaskCreate( &prvTimerTask, |
311 | 311 | configTIMER_SERVICE_TASK_NAME, |
312 | 312 | configTIMER_TASK_STACK_DEPTH, |
313 | 313 | NULL, |
|
462 | 462 |
|
463 | 463 | /* Send a message to the timer service task to perform a particular action |
464 | 464 | * on a particular timer definition. */ |
465 | | - if( xTimerQueue != NULL ) |
| 465 | + if( ( xTimerQueue != NULL ) && ( xTimer != NULL ) ) |
466 | 466 | { |
467 | 467 | /* Send a command to the timer service task to start the xTimer timer. */ |
468 | 468 | xMessage.xMessageID = xCommandID; |
|
513 | 513 |
|
514 | 514 | /* Send a message to the timer service task to perform a particular action |
515 | 515 | * on a particular timer definition. */ |
516 | | - if( xTimerQueue != NULL ) |
| 516 | + if( ( xTimerQueue != NULL ) && ( xTimer != NULL ) ) |
517 | 517 | { |
518 | 518 | /* Send a command to the timer service task to start the xTimer timer. */ |
519 | 519 | xMessage.xMessageID = xCommandID; |
|
974 | 974 | * software timer. */ |
975 | 975 | pxTimer = xMessage.u.xTimerParameters.pxTimer; |
976 | 976 |
|
977 | | - if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE ) |
| 977 | + if( pxTimer != NULL ) |
978 | 978 | { |
979 | | - /* The timer is in a list, remove it. */ |
980 | | - ( void ) uxListRemove( &( pxTimer->xTimerListItem ) ); |
981 | | - } |
982 | | - else |
983 | | - { |
984 | | - mtCOVERAGE_TEST_MARKER(); |
985 | | - } |
| 979 | + if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE ) |
| 980 | + { |
| 981 | + /* The timer is in a list, remove it. */ |
| 982 | + ( void ) uxListRemove( &( pxTimer->xTimerListItem ) ); |
| 983 | + } |
| 984 | + else |
| 985 | + { |
| 986 | + mtCOVERAGE_TEST_MARKER(); |
| 987 | + } |
986 | 988 |
|
987 | | - traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.u.xTimerParameters.xMessageValue ); |
| 989 | + traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.u.xTimerParameters.xMessageValue ); |
988 | 990 |
|
989 | | - /* In this case the xTimerListsWereSwitched parameter is not used, but |
990 | | - * it must be present in the function call. prvSampleTimeNow() must be |
991 | | - * called after the message is received from xTimerQueue so there is no |
992 | | - * possibility of a higher priority task adding a message to the message |
993 | | - * queue with a time that is ahead of the timer daemon task (because it |
994 | | - * pre-empted the timer daemon task after the xTimeNow value was set). */ |
995 | | - xTimeNow = prvSampleTimeNow( &xTimerListsWereSwitched ); |
| 991 | + /* In this case the xTimerListsWereSwitched parameter is not used, but |
| 992 | + * it must be present in the function call. prvSampleTimeNow() must be |
| 993 | + * called after the message is received from xTimerQueue so there is no |
| 994 | + * possibility of a higher priority task adding a message to the message |
| 995 | + * queue with a time that is ahead of the timer daemon task (because it |
| 996 | + * pre-empted the timer daemon task after the xTimeNow value was set). */ |
| 997 | + xTimeNow = prvSampleTimeNow( &xTimerListsWereSwitched ); |
996 | 998 |
|
997 | | - switch( xMessage.xMessageID ) |
998 | | - { |
999 | | - case tmrCOMMAND_START: |
1000 | | - case tmrCOMMAND_START_FROM_ISR: |
1001 | | - case tmrCOMMAND_RESET: |
1002 | | - case tmrCOMMAND_RESET_FROM_ISR: |
1003 | | - /* Start or restart a timer. */ |
1004 | | - pxTimer->ucStatus |= ( uint8_t ) tmrSTATUS_IS_ACTIVE; |
1005 | | - |
1006 | | - if( prvInsertTimerInActiveList( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow, xMessage.u.xTimerParameters.xMessageValue ) != pdFALSE ) |
1007 | | - { |
1008 | | - /* The timer expired before it was added to the active |
1009 | | - * timer list. Process it now. */ |
1010 | | - if( ( pxTimer->ucStatus & tmrSTATUS_IS_AUTORELOAD ) != 0U ) |
| 999 | + switch( xMessage.xMessageID ) |
| 1000 | + { |
| 1001 | + case tmrCOMMAND_START: |
| 1002 | + case tmrCOMMAND_START_FROM_ISR: |
| 1003 | + case tmrCOMMAND_RESET: |
| 1004 | + case tmrCOMMAND_RESET_FROM_ISR: |
| 1005 | + /* Start or restart a timer. */ |
| 1006 | + pxTimer->ucStatus |= ( uint8_t ) tmrSTATUS_IS_ACTIVE; |
| 1007 | + |
| 1008 | + if( prvInsertTimerInActiveList( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow, xMessage.u.xTimerParameters.xMessageValue ) != pdFALSE ) |
1011 | 1009 | { |
1012 | | - prvReloadTimer( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow ); |
| 1010 | + /* The timer expired before it was added to the active |
| 1011 | + * timer list. Process it now. */ |
| 1012 | + if( ( pxTimer->ucStatus & tmrSTATUS_IS_AUTORELOAD ) != 0U ) |
| 1013 | + { |
| 1014 | + prvReloadTimer( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow ); |
| 1015 | + } |
| 1016 | + else |
| 1017 | + { |
| 1018 | + pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
| 1019 | + } |
| 1020 | + |
| 1021 | + /* Call the timer callback. */ |
| 1022 | + traceTIMER_EXPIRED( pxTimer ); |
| 1023 | + pxTimer->pxCallbackFunction( ( TimerHandle_t ) pxTimer ); |
1013 | 1024 | } |
1014 | 1025 | else |
1015 | 1026 | { |
1016 | | - pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
| 1027 | + mtCOVERAGE_TEST_MARKER(); |
1017 | 1028 | } |
1018 | 1029 |
|
1019 | | - /* Call the timer callback. */ |
1020 | | - traceTIMER_EXPIRED( pxTimer ); |
1021 | | - pxTimer->pxCallbackFunction( ( TimerHandle_t ) pxTimer ); |
1022 | | - } |
1023 | | - else |
1024 | | - { |
1025 | | - mtCOVERAGE_TEST_MARKER(); |
1026 | | - } |
1027 | | - |
1028 | | - break; |
1029 | | - |
1030 | | - case tmrCOMMAND_STOP: |
1031 | | - case tmrCOMMAND_STOP_FROM_ISR: |
1032 | | - /* The timer has already been removed from the active list. */ |
1033 | | - pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
1034 | | - break; |
1035 | | - |
1036 | | - case tmrCOMMAND_CHANGE_PERIOD: |
1037 | | - case tmrCOMMAND_CHANGE_PERIOD_FROM_ISR: |
1038 | | - pxTimer->ucStatus |= ( uint8_t ) tmrSTATUS_IS_ACTIVE; |
1039 | | - pxTimer->xTimerPeriodInTicks = xMessage.u.xTimerParameters.xMessageValue; |
1040 | | - configASSERT( ( pxTimer->xTimerPeriodInTicks > 0 ) ); |
1041 | | - |
1042 | | - /* The new period does not really have a reference, and can |
1043 | | - * be longer or shorter than the old one. The command time is |
1044 | | - * therefore set to the current time, and as the period cannot |
1045 | | - * be zero the next expiry time can only be in the future, |
1046 | | - * meaning (unlike for the xTimerStart() case above) there is |
1047 | | - * no fail case that needs to be handled here. */ |
1048 | | - ( void ) prvInsertTimerInActiveList( pxTimer, ( xTimeNow + pxTimer->xTimerPeriodInTicks ), xTimeNow, xTimeNow ); |
1049 | | - break; |
1050 | | - |
1051 | | - case tmrCOMMAND_DELETE: |
1052 | | - #if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) |
1053 | | - { |
1054 | | - /* The timer has already been removed from the active list, |
1055 | | - * just free up the memory if the memory was dynamically |
1056 | | - * allocated. */ |
1057 | | - if( ( pxTimer->ucStatus & tmrSTATUS_IS_STATICALLY_ALLOCATED ) == ( uint8_t ) 0 ) |
| 1030 | + break; |
| 1031 | + |
| 1032 | + case tmrCOMMAND_STOP: |
| 1033 | + case tmrCOMMAND_STOP_FROM_ISR: |
| 1034 | + /* The timer has already been removed from the active list. */ |
| 1035 | + pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
| 1036 | + break; |
| 1037 | + |
| 1038 | + case tmrCOMMAND_CHANGE_PERIOD: |
| 1039 | + case tmrCOMMAND_CHANGE_PERIOD_FROM_ISR: |
| 1040 | + pxTimer->ucStatus |= ( uint8_t ) tmrSTATUS_IS_ACTIVE; |
| 1041 | + pxTimer->xTimerPeriodInTicks = xMessage.u.xTimerParameters.xMessageValue; |
| 1042 | + configASSERT( ( pxTimer->xTimerPeriodInTicks > 0 ) ); |
| 1043 | + |
| 1044 | + /* The new period does not really have a reference, and can |
| 1045 | + * be longer or shorter than the old one. The command time is |
| 1046 | + * therefore set to the current time, and as the period cannot |
| 1047 | + * be zero the next expiry time can only be in the future, |
| 1048 | + * meaning (unlike for the xTimerStart() case above) there is |
| 1049 | + * no fail case that needs to be handled here. */ |
| 1050 | + ( void ) prvInsertTimerInActiveList( pxTimer, ( xTimeNow + pxTimer->xTimerPeriodInTicks ), xTimeNow, xTimeNow ); |
| 1051 | + break; |
| 1052 | + |
| 1053 | + case tmrCOMMAND_DELETE: |
| 1054 | + #if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) |
1058 | 1055 | { |
1059 | | - vPortFree( pxTimer ); |
| 1056 | + /* The timer has already been removed from the active list, |
| 1057 | + * just free up the memory if the memory was dynamically |
| 1058 | + * allocated. */ |
| 1059 | + if( ( pxTimer->ucStatus & tmrSTATUS_IS_STATICALLY_ALLOCATED ) == ( uint8_t ) 0 ) |
| 1060 | + { |
| 1061 | + vPortFree( pxTimer ); |
| 1062 | + } |
| 1063 | + else |
| 1064 | + { |
| 1065 | + pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
| 1066 | + } |
1060 | 1067 | } |
1061 | | - else |
| 1068 | + #else /* if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) */ |
1062 | 1069 | { |
| 1070 | + /* If dynamic allocation is not enabled, the memory |
| 1071 | + * could not have been dynamically allocated. So there is |
| 1072 | + * no need to free the memory - just mark the timer as |
| 1073 | + * "not active". */ |
1063 | 1074 | pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
1064 | 1075 | } |
1065 | | - } |
1066 | | - #else /* if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) */ |
1067 | | - { |
1068 | | - /* If dynamic allocation is not enabled, the memory |
1069 | | - * could not have been dynamically allocated. So there is |
1070 | | - * no need to free the memory - just mark the timer as |
1071 | | - * "not active". */ |
1072 | | - pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE ); |
1073 | | - } |
1074 | | - #endif /* configSUPPORT_DYNAMIC_ALLOCATION */ |
1075 | | - break; |
| 1076 | + #endif /* configSUPPORT_DYNAMIC_ALLOCATION */ |
| 1077 | + break; |
1076 | 1078 |
|
1077 | | - default: |
1078 | | - /* Don't expect to get here. */ |
1079 | | - break; |
| 1079 | + default: |
| 1080 | + /* Don't expect to get here. */ |
| 1081 | + break; |
| 1082 | + } |
| 1083 | + } |
| 1084 | + else |
| 1085 | + { |
| 1086 | + mtCOVERAGE_TEST_MARKER(); |
1080 | 1087 | } |
1081 | 1088 | } |
1082 | 1089 | } |
|
0 commit comments