Skip to content

Commit 4b7338c

Browse files
committed
Merge branch 'fix_misra_violations' of github.com:kar-rahul-aws/FreeRTOS-Kernel into fix_misra_violations
2 parents c361e68 + 4f51ec1 commit 4b7338c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

timers.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -985,11 +985,11 @@
985985
traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.u.xTimerParameters.xMessageValue );
986986

987987
/* In this case the xTimerListsWereSwitched parameter is not used, but
988-
* it must be present in the function call. prvSampleTimeNow() must be
989-
* called after the message is received from xTimerQueue so there is no
990-
* possibility of a higher priority task adding a message to the message
991-
* queue with a time that is ahead of the timer daemon task (because it
992-
* pre-empted the timer daemon task after the xTimeNow value was set). */
988+
* it must be present in the function call. prvSampleTimeNow() must be
989+
* called after the message is received from xTimerQueue so there is no
990+
* possibility of a higher priority task adding a message to the message
991+
* queue with a time that is ahead of the timer daemon task (because it
992+
* pre-empted the timer daemon task after the xTimeNow value was set). */
993993
xTimeNow = prvSampleTimeNow( &xTimerListsWereSwitched );
994994

995995
switch( xMessage.xMessageID )
@@ -1004,7 +1004,7 @@
10041004
if( prvInsertTimerInActiveList( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow, xMessage.u.xTimerParameters.xMessageValue ) != pdFALSE )
10051005
{
10061006
/* The timer expired before it was added to the active
1007-
* timer list. Process it now. */
1007+
* timer list. Process it now. */
10081008
if( ( pxTimer->ucStatus & tmrSTATUS_IS_AUTORELOAD ) != 0U )
10091009
{
10101010
prvReloadTimer( pxTimer, xMessage.u.xTimerParameters.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow );
@@ -1038,20 +1038,20 @@
10381038
configASSERT( ( pxTimer->xTimerPeriodInTicks > 0 ) );
10391039

10401040
/* The new period does not really have a reference, and can
1041-
* be longer or shorter than the old one. The command time is
1042-
* therefore set to the current time, and as the period cannot
1043-
* be zero the next expiry time can only be in the future,
1044-
* meaning (unlike for the xTimerStart() case above) there is
1045-
* no fail case that needs to be handled here. */
1041+
* be longer or shorter than the old one. The command time is
1042+
* therefore set to the current time, and as the period cannot
1043+
* be zero the next expiry time can only be in the future,
1044+
* meaning (unlike for the xTimerStart() case above) there is
1045+
* no fail case that needs to be handled here. */
10461046
( void ) prvInsertTimerInActiveList( pxTimer, ( xTimeNow + pxTimer->xTimerPeriodInTicks ), xTimeNow, xTimeNow );
10471047
break;
10481048

10491049
case tmrCOMMAND_DELETE:
10501050
#if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
10511051
{
10521052
/* The timer has already been removed from the active list,
1053-
* just free up the memory if the memory was dynamically
1054-
* allocated. */
1053+
* just free up the memory if the memory was dynamically
1054+
* allocated. */
10551055
if( ( pxTimer->ucStatus & tmrSTATUS_IS_STATICALLY_ALLOCATED ) == ( uint8_t ) 0 )
10561056
{
10571057
vPortFree( pxTimer );
@@ -1064,9 +1064,9 @@
10641064
#else /* if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) */
10651065
{
10661066
/* If dynamic allocation is not enabled, the memory
1067-
* could not have been dynamically allocated. So there is
1068-
* no need to free the memory - just mark the timer as
1069-
* "not active". */
1067+
* could not have been dynamically allocated. So there is
1068+
* no need to free the memory - just mark the timer as
1069+
* "not active". */
10701070
pxTimer->ucStatus &= ( ( uint8_t ) ~tmrSTATUS_IS_ACTIVE );
10711071
}
10721072
#endif /* configSUPPORT_DYNAMIC_ALLOCATION */

0 commit comments

Comments
 (0)