Skip to content

Commit 167ea16

Browse files
authored
Minor updates to formatting and MISRA compliance of the PR used to update the vTaskDelayUntil() function to xTaskDelayUntil(). (#198)
1 parent 6375d52 commit 167ea16

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

include/task.h

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@ void vTaskDelay( const TickType_t xTicksToDelay ) PRIVILEGED_FUNCTION;
816816
* a fixed interface period.
817817
*
818818
* @return Value which can be used to check whether the task was actually delayed.
819-
* Will be pdTRUE if the task way delayed and pdFALSE otherwise.
819+
* Will be pdTRUE if the task way delayed and pdFALSE otherwise. A task will not
820+
* be delayed if the next expected wake time is in the past.
820821
*
821822
* Example usage:
822823
* <pre>
@@ -825,27 +826,29 @@ void vTaskDelay( const TickType_t xTicksToDelay ) PRIVILEGED_FUNCTION;
825826
* {
826827
* TickType_t xLastWakeTime;
827828
* const TickType_t xFrequency = 10;
829+
* BaseType_t xWasDelayed;
828830
*
829831
* // Initialise the xLastWakeTime variable with the current time.
830832
* xLastWakeTime = xTaskGetTickCount ();
831-
* for( ;; )
832-
* {
833-
* // Wait for the next cycle.
834-
* BaseType_t xWasDelayed = xTaskDelayUntil( &xLastWakeTime, xFrequency );
833+
* for( ;; )
834+
* {
835+
* // Wait for the next cycle.
836+
* xWasDelayed = xTaskDelayUntil( &xLastWakeTime, xFrequency );
835837
*
836-
* // Perform action here. xWasDelayed value can be used to determine
837-
* // whether a deadline was missed if the code here took too long.
838+
* // Perform action here. xWasDelayed value can be used to determine
839+
* // whether a deadline was missed if the code here took too long.
838840
* }
839841
* }
840842
* </pre>
841843
* \defgroup xTaskDelayUntil xTaskDelayUntil
842844
* \ingroup TaskCtrl
843845
*/
844-
BaseType_t xTaskDelayUntil( TickType_t * const pxPreviousWakeTime,
846+
BaseType_t xTaskDelayUntil( TickType_t * const pxPreviousWakeTime,
845847
const TickType_t xTimeIncrement ) PRIVILEGED_FUNCTION;
846-
#define vTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ) \
847-
{ \
848-
xTaskDelayUntil ( pxPreviousWakeTime , xTimeIncrement ); \
848+
849+
#define vTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ) \
850+
{ \
851+
( void ) xTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement ); \
849852
}
850853

851854

@@ -1594,28 +1597,28 @@ configSTACK_DEPTH_TYPE uxTaskGetStackHighWaterMark2( TaskHandle_t xTask ) PRIVIL
15941597
#endif
15951598

15961599
#if ( configCHECK_FOR_STACK_OVERFLOW > 0 )
1597-
1600+
15981601
/**
15991602
* task.h
16001603
* <pre>void vApplicationStackOverflowHook( TaskHandle_t xTask char *pcTaskName); </pre>
1601-
*
1604+
*
16021605
* The application stack overflow hook is called when a stack overflow is detected for a task.
1603-
*
1606+
*
16041607
* Details on stack overflow detection can be found here: https://www.FreeRTOS.org/Stacks-and-stack-overflow-checking.html
1605-
*
1608+
*
16061609
* @param xTask the task that just exceeded its stack boundaries.
16071610
* @param pcTaskName A character string containing the name of the offending task.
16081611
*/
16091612
void vApplicationStackOverflowHook( TaskHandle_t xTask,
1610-
char * pcTaskName );
1611-
1612-
#endif
1613-
1613+
char * pcTaskName );
1614+
1615+
#endif
1616+
16141617
#if ( configUSE_TICK_HOOK > 0 )
1615-
/**
1618+
/**
16161619
* task.h
16171620
* <pre>void vApplicationTickHook( void ); </pre>
1618-
*
1621+
*
16191622
* This hook function is called in the system tick handler after any OS work is completed.
16201623
*/
16211624
void vApplicationTickHook( void ); /*lint !e526 Symbol not defined as it is an application callback. */
@@ -1626,10 +1629,10 @@ configSTACK_DEPTH_TYPE uxTaskGetStackHighWaterMark2( TaskHandle_t xTask ) PRIVIL
16261629
/**
16271630
* task.h
16281631
* <pre>void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize ) </pre>
1629-
*
1630-
* This function is used to provide a statically allocated block of memory to FreeRTOS to hold the Idle Task TCB. This function is required when
1632+
*
1633+
* This function is used to provide a statically allocated block of memory to FreeRTOS to hold the Idle Task TCB. This function is required when
16311634
* configSUPPORT_STATIC_ALLOCATION is set. For more information see this URI: https://www.FreeRTOS.org/a00110.html#configSUPPORT_STATIC_ALLOCATION
1632-
*
1635+
*
16331636
* @param ppxIdleTaskTCBBuffer A handle to a statically allocated TCB buffer
16341637
* @param ppxIdleTaskStackBuffer A handle to a statically allocated Stack buffer for thie idle task
16351638
* @param pulIdleTaskStackSize A pointer to the number of elements that will fit in the allocated stack buffer
@@ -2467,7 +2470,7 @@ void vTaskGenericNotifyGiveFromISR( TaskHandle_t xTaskToNotify,
24672470
* task. h
24682471
* <pre>
24692472
* uint32_t ulTaskNotifyTakeIndexed( UBaseType_t uxIndexToWaitOn, BaseType_t xClearCountOnExit, TickType_t xTicksToWait );
2470-
*
2473+
*
24712474
* uint32_t ulTaskNotifyTake( BaseType_t xClearCountOnExit, TickType_t xTicksToWait );
24722475
* </pre>
24732476
*
@@ -2573,7 +2576,7 @@ uint32_t ulTaskGenericNotifyTake( UBaseType_t uxIndexToWaitOn,
25732576
* task. h
25742577
* <pre>
25752578
* BaseType_t xTaskNotifyStateClearIndexed( TaskHandle_t xTask, UBaseType_t uxIndexToCLear );
2576-
*
2579+
*
25772580
* BaseType_t xTaskNotifyStateClear( TaskHandle_t xTask );
25782581
* </pre>
25792582
*
@@ -2637,7 +2640,7 @@ BaseType_t xTaskGenericNotifyStateClear( TaskHandle_t xTask,
26372640
* task. h
26382641
* <pre>
26392642
* uint32_t ulTaskNotifyValueClearIndexed( TaskHandle_t xTask, UBaseType_t uxIndexToClear, uint32_t ulBitsToClear );
2640-
*
2643+
*
26412644
* uint32_t ulTaskNotifyValueClear( TaskHandle_t xTask, uint32_t ulBitsToClear );
26422645
* </pre>
26432646
*

0 commit comments

Comments
 (0)