mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-11 16:47:42 -04:00
manual uncrustify to minimize diffs. The file is already non-compliant with the .cfg we use for AFR
This commit is contained in:
parent
057701d574
commit
3fae5206ad
3 changed files with 21 additions and 21 deletions
|
@ -167,8 +167,8 @@ typedef struct xLIST
|
|||
volatile UBaseType_t uxNumberOfItems;
|
||||
ListItem_t * configLIST_VOLATILE pxIndex; /*< Used to walk through the list. Points to the last item returned by a call to listGET_OWNER_OF_NEXT_ENTRY (). */
|
||||
MiniListItem_t xListEnd; /*< List item that contains the maximum possible item value meaning it is always at the end of the list and is therefore used as a marker. */
|
||||
void* pvOwner; /* Pointer to the object that owns the list (normally an RTOS object) */
|
||||
listSECOND_LIST_INTEGRITY_CHECK_VALUE /*< Set to a known value if configUSE_LIST_DATA_INTEGRITY_CHECK_BYTES is set to 1. */
|
||||
void * pvOwner; /* Pointer to the object that owns the list (normally an RTOS object) */
|
||||
listSECOND_LIST_INTEGRITY_CHECK_VALUE /*< Set to a known value if configUSE_LIST_DATA_INTEGRITY_CHECK_BYTES is set to 1. */
|
||||
} List_t;
|
||||
|
||||
/*
|
||||
|
|
4
queue.c
4
queue.c
|
@ -446,8 +446,8 @@ static void prvInitialiseNewQueue( const UBaseType_t uxQueueLength, const UBaseT
|
|||
( void ) xQueueGenericReset( pxNewQueue, pdTRUE );
|
||||
|
||||
/* Establish two-way link with event lists */
|
||||
listSET_LIST_OWNER(&pxNewQueue->xTasksWaitingToReceive, pxNewQueue);
|
||||
listSET_LIST_OWNER(&pxNewQueue->xTasksWaitingToSend, pxNewQueue);
|
||||
listSET_LIST_OWNER( &pxNewQueue->xTasksWaitingToReceive, pxNewQueue );
|
||||
listSET_LIST_OWNER( &pxNewQueue->xTasksWaitingToSend, pxNewQueue );
|
||||
|
||||
#if ( configUSE_TRACE_FACILITY == 1 )
|
||||
{
|
||||
|
|
34
tasks.c
34
tasks.c
|
@ -5178,31 +5178,31 @@ TickType_t uxReturn;
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( INCLUDE_vTaskGetCurrentBlocker == 1 )
|
||||
void vTaskGetCurrentBlocker(TaskHandle_t xTask, TaskBlockedStatus_t* pxBlockedStatus)
|
||||
void vTaskGetCurrentBlocker( TaskHandle_t xTask, TaskBlockedStatus_t * pxBlockedStatus )
|
||||
{
|
||||
List_t const* pxStateList, * pxEventList, * pxDelayedList, * pxOverflowDelayedList;
|
||||
List_t const * pxStateList, * pxEventList, * pxDelayedList, * pxOverflowDelayedList;
|
||||
const TCB_t * const pxTCB = xTask;
|
||||
TickType_t xStateListItemValue = 0u;
|
||||
#if (configUSE_TASK_NOTIFICATIONS == 1)
|
||||
#if ( configUSE_TASK_NOTIFICATIONS == 1 )
|
||||
uint8_t ucNotifyState = 0u;
|
||||
#endif
|
||||
|
||||
memset(pxBlockedStatus, 0u, sizeof(TaskBlockedStatus_t));
|
||||
memset( pxBlockedStatus, 0u, sizeof( TaskBlockedStatus_t ) );
|
||||
pxBlockedStatus->eStatus = eNotBlocked;
|
||||
|
||||
/* Per convention NULL operates for current task.
|
||||
Current task can't be blocked if its running this function */
|
||||
if (pxTCB != pxCurrentTCB && pxTCB != NULL)
|
||||
if ( pxTCB != pxCurrentTCB && pxTCB != NULL )
|
||||
{
|
||||
/* Take a snapshot of data that could otherwise change during this function call */
|
||||
taskENTER_CRITICAL();
|
||||
{
|
||||
pxStateList = listLIST_ITEM_CONTAINER(&(pxTCB->xStateListItem));
|
||||
pxEventList = listLIST_ITEM_CONTAINER(&(pxTCB->xEventListItem));
|
||||
pxStateList = listLIST_ITEM_CONTAINER( &( pxTCB->xStateListItem ) );
|
||||
pxEventList = listLIST_ITEM_CONTAINER( &( pxTCB->xEventListItem ) );
|
||||
pxDelayedList = pxDelayedTaskList;
|
||||
pxOverflowDelayedList = pxOverflowDelayedTaskList;
|
||||
xStateListItemValue = pxTCB->xStateListItem.xItemValue;
|
||||
#if (configUSE_TASK_NOTIFICATIONS == 1)
|
||||
#if ( configUSE_TASK_NOTIFICATIONS == 1 )
|
||||
{
|
||||
ucNotifyState = pxTCB->ucNotifyState;
|
||||
}
|
||||
|
@ -5210,16 +5210,16 @@ TickType_t uxReturn;
|
|||
}
|
||||
taskEXIT_CRITICAL();
|
||||
|
||||
if (pxStateList == pxDelayedList || pxStateList == pxOverflowDelayedList)
|
||||
if ( pxStateList == pxDelayedList || pxStateList == pxOverflowDelayedList )
|
||||
{
|
||||
if (pxEventList != NULL)
|
||||
if ( pxEventList != NULL )
|
||||
{
|
||||
/* Blocked waiting for event*/
|
||||
pxBlockedStatus->eStatus = eBlockedForEvent;
|
||||
pxBlockedStatus->pxEventList = pxEventList;
|
||||
}
|
||||
#if (configUSE_TASK_NOTIFICATIONS == 1)
|
||||
else if (ucNotifyState == taskWAITING_NOTIFICATION)
|
||||
#if ( configUSE_TASK_NOTIFICATIONS == 1 )
|
||||
else if ( ucNotifyState == taskWAITING_NOTIFICATION )
|
||||
{
|
||||
/* Blocked waiting for notification*/
|
||||
pxBlockedStatus->eStatus = eBlockedForNotification;
|
||||
|
@ -5233,20 +5233,20 @@ TickType_t uxReturn;
|
|||
pxBlockedStatus->xUntilTick = xStateListItemValue;
|
||||
}
|
||||
}
|
||||
#if (INCLUDE_vTaskSuspend == 1)
|
||||
else if (pxStateList == &xSuspendedTaskList)
|
||||
#if ( INCLUDE_vTaskSuspend == 1 )
|
||||
else if ( pxStateList == &xSuspendedTaskList )
|
||||
{
|
||||
/* When prvAddCurrentTaskToDelayedLists(portMAX_DELAY, pdTRUE) and INCLUDE_vTaskSuspend == 1, the task can
|
||||
block indefinitely and is instead placed on the xSuspendTaskList. */
|
||||
if (pxEventList != NULL)
|
||||
if ( pxEventList != NULL )
|
||||
{
|
||||
pxBlockedStatus->eStatus = eBlockedForEvent;
|
||||
pxBlockedStatus->pxEventList = pxEventList;
|
||||
}
|
||||
else
|
||||
{
|
||||
#if (configUSE_TASK_NOTIFICATIONS)
|
||||
if (ucNotifyState == taskWAITING_NOTIFICATION)
|
||||
#if ( configUSE_TASK_NOTIFICATIONS )
|
||||
if ( ucNotifyState == taskWAITING_NOTIFICATION )
|
||||
{
|
||||
pxBlockedStatus->eStatus = eBlockedForNotification;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue