Kernel changes:

[freertos] / FreeRTOS / Demo / Common / Minimal / countsem.c

diff --git a/FreeRTOS/Demo/Common/Minimal/countsem.c b/FreeRTOS/Demo/Common/Minimal/countsem.c
index bbf797d1c26cbc57234e70c6d0388b7525971fcf..bf6f2bbb803ffd133993f527e24335a53b82de22 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/countsem.c
+++ b/FreeRTOS/Demo/Common/Minimal/countsem.c
@@ -68,7 +68,7 @@
 */\r
 \r
 \r
-/* \r
+/*\r
  * Simple demonstration of the usage of counting semaphore.\r
  */\r
 \r
@@ -84,7 +84,7 @@
 #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
@@ -118,7 +118,7 @@ static void prvCountingSemaphoreTask( void *pvParameters );
 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
@@ -134,11 +134,11 @@ typedef struct COUNT_SEM_STRUCT
        /* 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
@@ -160,10 +160,10 @@ void vStartCountingSemaphoreTasks( void )
        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
+       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
+       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
@@ -174,7 +174,7 @@ void vStartCountingSemaphoreTasks( void )
        {\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
@@ -193,6 +193,8 @@ UBaseType_t ux;
        /* We should be able to 'take' the semaphore countMAX_COUNT_VALUE times. */\r
        for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
        {\r
+               configASSERT( xSemaphoreGetCount( 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
@@ -206,8 +208,9 @@ UBaseType_t ux;
                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( xSemaphoreGetCount( xSemaphore ) == 0 );\r
        if( xSemaphoreTake( xSemaphore, countDONT_BLOCK ) == pdPASS )\r
        {\r
                xErrorDetected = pdTRUE;\r
@@ -219,7 +222,7 @@ static void prvIncrementSemaphoreCount( SemaphoreHandle_t xSemaphore, UBaseType_
 {\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
@@ -229,6 +232,8 @@ UBaseType_t ux;
        /* We should be able to 'give' the semaphore countMAX_COUNT_VALUE times. */\r
        for( ux = 0; ux < countMAX_COUNT_VALUE; ux++ )\r
        {\r
+               configASSERT( xSemaphoreGetCount( xSemaphore ) == ux );\r
+\r
                if( xSemaphoreGive( xSemaphore ) != pdPASS )\r
                {\r
                        /* We expected to be able to take the semaphore. */\r
@@ -257,7 +262,7 @@ xCountSemStruct *pxParameter;
 \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