len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove whitespace only.

Browse source
This commit is contained in:
Richard Barry 2012-10-10 09:53:44 +00:00
parent ecdca1311b
commit 05c17e7e6d
3 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
FreeRTOS/Source/list.c
View file

@ -40,7 +40,7 @@
FreeRTOS WEB site. FreeRTOS WEB site.
1 tab == 4 spaces! 1 tab == 4 spaces!
*************************************************************************** ***************************************************************************
* * * *
* Having a problem? Start by reading the FAQ "My application does * * Having a problem? Start by reading the FAQ "My application does *
@ -50,17 +50,17 @@
* * * *
*************************************************************************** ***************************************************************************
http://www.FreeRTOS.org - Documentation, training, latest information, http://www.FreeRTOS.org - Documentation, training, latest information,
license and contact details. license and contact details.
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
including FreeRTOS+Trace - an indispensable productivity tool. including FreeRTOS+Trace - an indispensable productivity tool.
Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
the code with commercial support, indemnification, and middleware, under the code with commercial support, indemnification, and middleware, under
the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also
provide a safety engineered and independently SIL3 certified version under provide a safety engineered and independently SIL3 certified version under
the SafeRTOS brand: http://www.SafeRTOS.com. the SafeRTOS brand: http://www.SafeRTOS.com.
*/ */
@ -159,7 +159,7 @@ portTickType xValueOfInsertion;
before vTaskStartScheduler() has been called?). before vTaskStartScheduler() has been called?).
See http://www.freertos.org/FAQHelp.html for more tips. See http://www.freertos.org/FAQHelp.html for more tips.
**********************************************************************/ **********************************************************************/
for( pxIterator = ( xListItem * ) &( pxList->xListEnd ); pxIterator->pxNext->xItemValue <= xValueOfInsertion; pxIterator = pxIterator->pxNext ) for( pxIterator = ( xListItem * ) &( pxList->xListEnd ); pxIterator->pxNext->xItemValue <= xValueOfInsertion; pxIterator = pxIterator->pxNext )
{ {
/* There is nothing to do here, we are just iterating to the /* There is nothing to do here, we are just iterating to the
@ -186,7 +186,7 @@ xList * pxList;
pxItemToRemove->pxNext->pxPrevious = pxItemToRemove->pxPrevious; pxItemToRemove->pxNext->pxPrevious = pxItemToRemove->pxPrevious;
pxItemToRemove->pxPrevious->pxNext = pxItemToRemove->pxNext; pxItemToRemove->pxPrevious->pxNext = pxItemToRemove->pxNext;
/* The list item knows which list it is in. Obtain the list from the list /* The list item knows which list it is in. Obtain the list from the list
item. */ item. */
pxList = ( xList * ) pxItemToRemove->pvContainer; pxList = ( xList * ) pxItemToRemove->pvContainer;
@ -199,7 +199,7 @@ xList * pxList;
pxItemToRemove->pvContainer = NULL; pxItemToRemove->pvContainer = NULL;
( pxList->uxNumberOfItems )--; ( pxList->uxNumberOfItems )--;
return pxList->uxNumberOfItems; return pxList->uxNumberOfItems;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

30
FreeRTOS/Source/queue.c
View file

@ -40,7 +40,7 @@
FreeRTOS WEB site. FreeRTOS WEB site.
1 tab == 4 spaces! 1 tab == 4 spaces!
*************************************************************************** ***************************************************************************
* * * *
* Having a problem? Start by reading the FAQ "My application does * * Having a problem? Start by reading the FAQ "My application does *
@ -50,17 +50,17 @@
* * * *
*************************************************************************** ***************************************************************************
http://www.FreeRTOS.org - Documentation, training, latest information, http://www.FreeRTOS.org - Documentation, training, latest information,
license and contact details. license and contact details.
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
including FreeRTOS+Trace - an indispensable productivity tool. including FreeRTOS+Trace - an indispensable productivity tool.
Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
the code with commercial support, indemnification, and middleware, under the code with commercial support, indemnification, and middleware, under
the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also
provide a safety engineered and independently SIL3 certified version under provide a safety engineered and independently SIL3 certified version under
the SafeRTOS brand: http://www.SafeRTOS.com. the SafeRTOS brand: http://www.SafeRTOS.com.
*/ */
@ -135,7 +135,7 @@ typedef struct QueueDefinition
volatile signed portBASE_TYPE xRxLock; /*< Stores the number of items received from the queue (removed from the queue) while the queue was locked. Set to queueUNLOCKED when the queue is not locked. */ volatile signed portBASE_TYPE xRxLock; /*< Stores the number of items received from the queue (removed from the queue) while the queue was locked. Set to queueUNLOCKED when the queue is not locked. */
volatile signed portBASE_TYPE xTxLock; /*< Stores the number of items transmitted to the queue (added to the queue) while the queue was locked. Set to queueUNLOCKED when the queue is not locked. */ volatile signed portBASE_TYPE xTxLock; /*< Stores the number of items transmitted to the queue (added to the queue) while the queue was locked. Set to queueUNLOCKED when the queue is not locked. */
#if ( configUSE_TRACE_FACILITY == 1 ) #if ( configUSE_TRACE_FACILITY == 1 )
unsigned char ucQueueNumber; unsigned char ucQueueNumber;
unsigned char ucQueueType; unsigned char ucQueueType;
@ -291,10 +291,10 @@ portBASE_TYPE xQueueGenericReset( xQueueHandle pxQueue, portBASE_TYPE xNewQueue
if( xNewQueue == pdFALSE ) if( xNewQueue == pdFALSE )
{ {
/* If there are tasks blocked waiting to read from the queue, then /* If there are tasks blocked waiting to read from the queue, then
the tasks will remain blocked as after this function exits the queue the tasks will remain blocked as after this function exits the queue
will still be empty. If there are tasks blocked waiting to write to will still be empty. If there are tasks blocked waiting to write to
the queue, then one should be unblocked as after this function exits the queue, then one should be unblocked as after this function exits
it will be possible to write to it. */ it will be possible to write to it. */
if( listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) == pdFALSE ) if( listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) == pdFALSE )
{ {
@ -308,7 +308,7 @@ portBASE_TYPE xQueueGenericReset( xQueueHandle pxQueue, portBASE_TYPE xNewQueue
{ {
/* Ensure the event queues start in the correct state. */ /* Ensure the event queues start in the correct state. */
vListInitialise( &( pxQueue->xTasksWaitingToSend ) ); vListInitialise( &( pxQueue->xTasksWaitingToSend ) );
vListInitialise( &( pxQueue->xTasksWaitingToReceive ) ); vListInitialise( &( pxQueue->xTasksWaitingToReceive ) );
} }
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
@ -438,7 +438,7 @@ xQueueHandle xReturn = NULL;
/* This function is called by xSemaphoreGetMutexHolder(), and should not /* This function is called by xSemaphoreGetMutexHolder(), and should not
be called directly. Note: This is is a good way of determining if the be called directly. Note: This is is a good way of determining if the
calling task is the mutex holder, but not a good way of determining the calling task is the mutex holder, but not a good way of determining the
identity of the mutex holder, as the holder may change between the identity of the mutex holder, as the holder may change between the
following critical section exiting and the function returning. */ following critical section exiting and the function returning. */
taskENTER_CRITICAL(); taskENTER_CRITICAL();
{ {
@ -452,7 +452,7 @@ xQueueHandle xReturn = NULL;
} }
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
return pxReturn; return pxReturn;
} }

54
FreeRTOS/Source/timers.c
View file

@ -40,7 +40,7 @@
FreeRTOS WEB site. FreeRTOS WEB site.
1 tab == 4 spaces! 1 tab == 4 spaces!
*************************************************************************** ***************************************************************************
* * * *
* Having a problem? Start by reading the FAQ "My application does * * Having a problem? Start by reading the FAQ "My application does *
@ -50,17 +50,17 @@
* * * *
*************************************************************************** ***************************************************************************
http://www.FreeRTOS.org - Documentation, training, latest information, http://www.FreeRTOS.org - Documentation, training, latest information,
license and contact details. license and contact details.
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
including FreeRTOS+Trace - an indispensable productivity tool. including FreeRTOS+Trace - an indispensable productivity tool.
Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
the code with commercial support, indemnification, and middleware, under the code with commercial support, indemnification, and middleware, under
the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also
provide a safety engineered and independently SIL3 certified version under provide a safety engineered and independently SIL3 certified version under
the SafeRTOS brand: http://www.SafeRTOS.com. the SafeRTOS brand: http://www.SafeRTOS.com.
*/ */
@ -118,9 +118,9 @@ PRIVILEGED_DATA static xList *pxOverflowTimerList;
PRIVILEGED_DATA static xQueueHandle xTimerQueue = NULL; PRIVILEGED_DATA static xQueueHandle xTimerQueue = NULL;
#if ( INCLUDE_xTimerGetTimerDaemonTaskHandle == 1 ) #if ( INCLUDE_xTimerGetTimerDaemonTaskHandle == 1 )
PRIVILEGED_DATA static xTaskHandle xTimerTaskHandle = NULL; PRIVILEGED_DATA static xTaskHandle xTimerTaskHandle = NULL;
#endif #endif
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -200,7 +200,7 @@ portBASE_TYPE xReturn = pdFAIL;
{ {
/* Create the timer task, storing its handle in xTimerTaskHandle so /* Create the timer task, storing its handle in xTimerTaskHandle so
it can be returned by the xTimerGetTimerDaemonTaskHandle() function. */ it can be returned by the xTimerGetTimerDaemonTaskHandle() function. */
xReturn = xTaskCreate( prvTimerTask, ( const signed char * ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, &xTimerTaskHandle ); xReturn = xTaskCreate( prvTimerTask, ( const signed char * ) "Tmr Svc", ( unsigned short ) configTIMER_TASK_STACK_DEPTH, NULL, ( ( unsigned portBASE_TYPE ) configTIMER_TASK_PRIORITY ) | portPRIVILEGE_BIT, &xTimerTaskHandle );
} }
#else #else
{ {
@ -233,7 +233,7 @@ xTIMER *pxNewTimer;
/* Ensure the infrastructure used by the timer service task has been /* Ensure the infrastructure used by the timer service task has been
created/initialised. */ created/initialised. */
prvCheckForValidListAndQueue(); prvCheckForValidListAndQueue();
/* Initialise the timer structure members using the function parameters. */ /* Initialise the timer structure members using the function parameters. */
pxNewTimer->pcTimerName = pcTimerName; pxNewTimer->pcTimerName = pcTimerName;
pxNewTimer->xTimerPeriodInTicks = xTimerPeriodInTicks; pxNewTimer->xTimerPeriodInTicks = xTimerPeriodInTicks;
@ -241,7 +241,7 @@ xTIMER *pxNewTimer;
pxNewTimer->pvTimerID = pvTimerID; pxNewTimer->pvTimerID = pvTimerID;
pxNewTimer->pxCallbackFunction = pxCallbackFunction; pxNewTimer->pxCallbackFunction = pxCallbackFunction;
vListInitialiseItem( &( pxNewTimer->xTimerListItem ) ); vListInitialiseItem( &( pxNewTimer->xTimerListItem ) );
traceTIMER_CREATE( pxNewTimer ); traceTIMER_CREATE( pxNewTimer );
} }
else else
@ -249,7 +249,7 @@ xTIMER *pxNewTimer;
traceTIMER_CREATE_FAILED(); traceTIMER_CREATE_FAILED();
} }
} }
return ( xTimerHandle ) pxNewTimer; return ( xTimerHandle ) pxNewTimer;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -283,10 +283,10 @@ xTIMER_MESSAGE xMessage;
{ {
xReturn = xQueueSendToBackFromISR( xTimerQueue, &xMessage, pxHigherPriorityTaskWoken ); xReturn = xQueueSendToBackFromISR( xTimerQueue, &xMessage, pxHigherPriorityTaskWoken );
} }
traceTIMER_COMMAND_SEND( xTimer, xCommandID, xOptionalValue, xReturn ); traceTIMER_COMMAND_SEND( xTimer, xCommandID, xOptionalValue, xReturn );
} }
return xReturn; return xReturn;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -300,7 +300,7 @@ xTIMER_MESSAGE xMessage;
configASSERT( ( xTimerTaskHandle != NULL ) ); configASSERT( ( xTimerTaskHandle != NULL ) );
return xTimerTaskHandle; return xTimerTaskHandle;
} }
#endif #endif
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -357,9 +357,9 @@ portBASE_TYPE xListWasEmpty;
/* If a timer has expired, process it. Otherwise, block this task /* If a timer has expired, process it. Otherwise, block this task
until either a timer does expire, or a command is received. */ until either a timer does expire, or a command is received. */
prvProcessTimerOrBlockTask( xNextExpireTime, xListWasEmpty ); prvProcessTimerOrBlockTask( xNextExpireTime, xListWasEmpty );
/* Empty the command queue. */ /* Empty the command queue. */
prvProcessReceivedCommands(); prvProcessReceivedCommands();
} }
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -445,7 +445,7 @@ portTickType xTimeNow;
PRIVILEGED_DATA static portTickType xLastTime = ( portTickType ) 0U; PRIVILEGED_DATA static portTickType xLastTime = ( portTickType ) 0U;
xTimeNow = xTaskGetTickCount(); xTimeNow = xTaskGetTickCount();
if( xTimeNow < xLastTime ) if( xTimeNow < xLastTime )
{ {
prvSwitchTimerLists( xLastTime ); prvSwitchTimerLists( xLastTime );
@ -455,9 +455,9 @@ PRIVILEGED_DATA static portTickType xLastTime = ( portTickType ) 0U;
{ {
*pxTimerListsWereSwitched = pdFALSE; *pxTimerListsWereSwitched = pdFALSE;
} }
xLastTime = xTimeNow; xLastTime = xTimeNow;
return xTimeNow; return xTimeNow;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -468,7 +468,7 @@ portBASE_TYPE xProcessTimerNow = pdFALSE;
listSET_LIST_ITEM_VALUE( &( pxTimer->xTimerListItem ), xNextExpiryTime ); listSET_LIST_ITEM_VALUE( &( pxTimer->xTimerListItem ), xNextExpiryTime );
listSET_LIST_ITEM_OWNER( &( pxTimer->xTimerListItem ), pxTimer ); listSET_LIST_ITEM_OWNER( &( pxTimer->xTimerListItem ), pxTimer );
if( xNextExpiryTime <= xTimeNow ) if( xNextExpiryTime <= xTimeNow )
{ {
/* Has the expiry time elapsed between the command to start/reset a /* Has the expiry time elapsed between the command to start/reset a
@ -531,10 +531,10 @@ portTickType xTimeNow;
} }
traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.xMessageValue ); traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.xMessageValue );
switch( xMessage.xMessageID ) switch( xMessage.xMessageID )
{ {
case tmrCOMMAND_START : case tmrCOMMAND_START :
/* Start or restart a timer. */ /* Start or restart a timer. */
if( prvInsertTimerInActiveList( pxTimer, xMessage.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow, xMessage.xMessageValue ) == pdTRUE ) if( prvInsertTimerInActiveList( pxTimer, xMessage.xMessageValue + pxTimer->xTimerPeriodInTicks, xTimeNow, xMessage.xMessageValue ) == pdTRUE )
{ {
@ -551,7 +551,7 @@ portTickType xTimeNow;
} }
break; break;
case tmrCOMMAND_STOP : case tmrCOMMAND_STOP :
/* The timer has already been removed from the active list. /* The timer has already been removed from the active list.
There is nothing to do here. */ There is nothing to do here. */
break; break;
@ -568,7 +568,7 @@ portTickType xTimeNow;
vPortFree( pxTimer ); vPortFree( pxTimer );
break; break;
default : default :
/* Don't expect to get here. */ /* Don't expect to get here. */
break; break;
} }
@ -585,7 +585,7 @@ portBASE_TYPE xResult;
/* Remove compiler warnings if configASSERT() is not defined. */ /* Remove compiler warnings if configASSERT() is not defined. */
( void ) xLastTime; ( void ) xLastTime;
/* The tick count has overflowed. The timer lists must be switched. /* The tick count has overflowed. The timer lists must be switched.
If there are any timers still referenced from the current timer list If there are any timers still referenced from the current timer list
then they must have expired and should be processed before the lists then they must have expired and should be processed before the lists