@ -301,7 +301,7 @@ BaseType_t xReturn = pdFAIL;
return pxNewTimer ;
return pxNewTimer ;
}
}
# endif /* configSUPPORT_ STAT IC_ALLOCATION */
# endif /* configSUPPORT_ DYNAM IC_ALLOCATION */
/*-----------------------------------------------------------*/
/*-----------------------------------------------------------*/
# if( configSUPPORT_STATIC_ALLOCATION == 1 )
# if( configSUPPORT_STATIC_ALLOCATION == 1 )
@ -820,6 +820,8 @@ TickType_t xTimeNow;
break ;
break ;
case tmrCOMMAND_DELETE :
case tmrCOMMAND_DELETE :
# if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
{
/* The timer has already been removed from the active list,
/* The timer has already been removed from the active list,
just free up the memory if the memory was dynamically
just free up the memory if the memory was dynamically
allocated . */
allocated . */
@ -831,6 +833,16 @@ TickType_t xTimeNow;
{
{
pxTimer - > ucStatus & = ~ tmrSTATUS_IS_ACTIVE ;
pxTimer - > ucStatus & = ~ tmrSTATUS_IS_ACTIVE ;
}
}
}
# else
{
/* If dynamic allocation is not enabled, the memory
could not have been dynamically allocated . So there is
no need to free the memory - just mark the timer as
" not active " . */
pxTimer - > ucStatus & = ~ tmrSTATUS_IS_ACTIVE ;
}
# endif /* configSUPPORT_DYNAMIC_ALLOCATION */
break ;
break ;
default :
default :