/*\r
- FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+ FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
All rights reserved\r
\r
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
\r
FreeRTOS is free software; you can redistribute it and/or modify it under\r
the terms of the GNU General Public License (version 2) as published by the\r
- Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+ Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
\r
***************************************************************************\r
>>! NOTE: The modification to the GPL is included to allow you to !<<\r
*/\r
\r
\r
-/* \r
+/*\r
* Simple demonstration of the usage of counting semaphore.\r
*/\r
\r
#define countMAX_COUNT_VALUE ( 200 )\r
\r
/* Constants used to indicate whether or not the semaphore should have been\r
-created with its maximum count value, or its minimum count value. These \r
+created with its maximum count value, or its minimum count value. These\r
numbers are used to ensure that the pointers passed in as the task parameters\r
are valid. */\r
#define countSTART_AT_MAX_COUNT ( 0xaa )\r
static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
\r
/*\r
- * Utility function to decrement the semaphore count value up from \r
+ * Utility function to decrement the semaphore count value up from\r
* countMAX_COUNT_VALUE to zero.\r
*/\r
static void prvDecrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_t *puxLoopCounter );\r
/* Set to countSTART_AT_MAX_COUNT if the semaphore should be created with\r
its count value set to its max count value, or countSTART_AT_ZERO if it\r
should have been created with its count value set to 0. */\r
- UBaseType_t uxExpectedStartCount; \r
+ UBaseType_t uxExpectedStartCount;\r
\r
/* Incremented on each cycle of the demo task. Used to detect a stalled\r
task. */\r
- UBaseType_t uxLoopCounter; \r
+ UBaseType_t uxLoopCounter;\r
} xCountSemStruct;\r
\r
/* Two structures are defined, one is passed to each test task. */\r
xParameters[ 1 ].uxExpectedStartCount = 0;\r
xParameters[ 1 ].uxLoopCounter = 0;\r
\r
- /* vQueueAddToRegistry() adds the semaphore to the registry, if one is\r
- in use. The registry is provided as a means for kernel aware \r
- debuggers to locate semaphores and has no purpose if a kernel aware debugger\r
- is not being used. The call to vQueueAddToRegistry() will be removed\r
- by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is \r
- defined to be less than 1. */\r
- vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 0 ].xSemaphore, "Counting_Sem_1" );\r
- vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 1 ].xSemaphore, "Counting_Sem_2" );\r
-\r
-\r
/* Were the semaphores created? */\r
if( ( xParameters[ 0 ].xSemaphore != NULL ) || ( xParameters[ 1 ].xSemaphore != NULL ) )\r
{\r
+ /* vQueueAddToRegistry() adds the semaphore to the registry, if one is\r
+ in use. The registry is provided as a means for kernel aware\r
+ debuggers to locate semaphores and has no purpose if a kernel aware\r
+ debugger is not being used. The call to vQueueAddToRegistry() will be\r
+ removed by the pre-processor if configQUEUE_REGISTRY_SIZE is not\r
+ defined or is defined to be less than 1. */\r
+ vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 0 ].xSemaphore, "Counting_Sem_1" );\r
+ vQueueAddToRegistry( ( QueueHandle_t ) xParameters[ 1 ].xSemaphore, "Counting_Sem_2" );\r
+\r
/* Create the demo tasks, passing in the semaphore to use as the parameter. */\r
xTaskCreate( prvCountingSemaphoreTask, "CNT1", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 0 ] ), tskIDLE_PRIORITY, NULL );\r
- xTaskCreate( prvCountingSemaphoreTask, "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL ); \r
+ xTaskCreate( prvCountingSemaphoreTask, "CNT2", configMINIMAL_STACK_SIZE, ( void * ) &( xParameters[ 1 ] ), tskIDLE_PRIORITY, NULL );\r
}\r
}\r
/*-----------------------------------------------------------*/\r
/* We should be able to 'take' the semaphore countMAX_COUNT_VALUE times. */\r
for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
{\r
+ configASSERT( uxSemaphoreGetCount( xSemaphore ) == ( countMAX_COUNT_VALUE - ux ) );\r
+\r
if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) != pdPASS )\r
{\r
/* We expected to be able to take the semaphore. */\r
taskYIELD();\r
#endif\r
\r
- /* If the semaphore count is zero then we should not be able to 'take' \r
+ /* If the semaphore count is zero then we should not be able to 'take'\r
the semaphore. */\r
+ configASSERT( uxSemaphoreGetCount( xSemaphore ) == 0 );\r
if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) == pdPASS )\r
{\r
xErrorDetected = pdTRUE;\r
{\r
UBaseType_t ux;\r
\r
- /* If the semaphore count is zero then we should not be able to 'take' \r
+ /* If the semaphore count is zero then we should not be able to 'take'\r
the semaphore. */\r
if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) == pdPASS )\r
{\r
/* We should be able to 'give' the semaphore countMAX_COUNT_VALUE times. */\r
for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
{\r
+ configASSERT( uxSemaphoreGetCount( xSemaphore ) == ux );\r
+\r
if( xSemaphoreGive( xSemaphore ) != pdPASS )\r
{\r
/* We expected to be able to take the semaphore. */\r
\r
#ifdef USE_STDIO\r
void vPrintDisplayMessage( const char * const * ppcMessageToSend );\r
- \r
+\r
const char * const pcTaskStartMsg = "Counting semaphore demo started.\r\n";\r
\r
/* Queue a message for printing to say the task has started. */\r
projects / freertos / blobdiff