Ensure both one-shot and auto-reload are written consistently with a hyphen in comments.

[freertos] / FreeRTOS / Demo / CORTEX_MPU_Simulator_Keil_GCC / main.c

diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c
index 82b51a1b5352223393163c6d769c6f71a4985d3a..185ac7ba7069c4a171adbca7c17b914d63ab14b3 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS Kernel V10.1.1\r
- * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ * FreeRTOS Kernel V10.2.1\r
+ * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
  * this software and associated documentation files (the "Software"), to deal in\r
@@ -776,6 +776,9 @@ static void prvTaskToDelete( void *pvParameters )
        /* For code coverage test purposes it is deleted by the Idle task. */\r
        configASSERT( uxTaskGetStackHighWaterMark( NULL ) > 0 );\r
        configASSERT( uxTaskGetStackHighWaterMark2( NULL ) > 0 );\r
+       /* Run time stats are not being gathered - this is just to exercise\r
+       API. */\r
+       configASSERT( xTaskGetIdleRunTimeCounter() == 0 ); \r
        vTaskSuspend( NULL );\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -783,7 +786,7 @@ static void prvTaskToDelete( void *pvParameters )
 static void prvPendedFunctionCall( void *pvParameter1, uint32_t ulParameter2 )\r
 {\r
 uint32_t *pulCounter = ( uint32_t * ) pvParameter1;\r
-       \r
+\r
        /* Increment the paramater to show the pended function has executed. */\r
        ( *pulCounter )++;\r
 }\r
@@ -792,7 +795,7 @@ uint32_t *pulCounter = ( uint32_t * ) pvParameter1;
 static void prvTestTimerCallback( TimerHandle_t xTimer )\r
 {\r
 uint32_t ulTimerID;\r
-       \r
+\r
        /* Increment the timer's ID to show the callback has executed. */\r
        ulTimerID = ( uint32_t ) pvTimerGetTimerID( xTimer );\r
        ulTimerID++;\r
@@ -804,43 +807,42 @@ static void prvExerciseTimerAPI( void )
 {\r
 TimerHandle_t xTimer;\r
 const char * const pcTimerName = "TestTimer";\r
-const TickType_t x10ms = pdMS_TO_TICKS( 3 );\r
+const TickType_t x3ms = pdMS_TO_TICKS( 3 );\r
 uint32_t ulValueForTesting = 0;\r
-       \r
-       xTimer = xTimerCreate(  pcTimerName, \r
-                                                       x10ms,\r
-                                                       pdFALSE, /* Created as a one shot timer. */\r
+\r
+       xTimer = xTimerCreate(  pcTimerName,\r
+                                                       x3ms,\r
+                                                       pdFALSE, /* Created as a one-shot timer. */\r
                                                        0,\r
                                                        prvTestTimerCallback );\r
-       configASSERT( xTimer ); \r
+       configASSERT( xTimer );\r
        configASSERT( xTimerIsTimerActive( xTimer ) == pdFALSE );\r
        configASSERT( xTimerGetTimerDaemonTaskHandle() != NULL );\r
        configASSERT( strcmp( pcTimerName, pcTimerGetName( xTimer ) ) == 0 );\r
-       configASSERT( xTimerGetPeriod( xTimer ) == x10ms );\r
-       configASSERT( xTimerGetExpiryTime( xTimer ) == 0 ); /* The timer has been created only. */\r
-       \r
+       configASSERT( xTimerGetPeriod( xTimer ) == x3ms );\r
+\r
        /* Pend a function then wait for it to execute.  All it does is increment\r
        its parameter. */\r
        xTimerPendFunctionCall( prvPendedFunctionCall, &ulValueForTesting, 0, 0 );\r
-       vTaskDelay( x10ms );\r
+       vTaskDelay( x3ms );\r
        configASSERT( ulValueForTesting == 1 );\r
-       \r
-       /* Timer was created as a one shot timer.  Its callback just increments the\r
+\r
+       /* Timer was created as a one-shot timer.  Its callback just increments the\r
        timer's ID - so set the ID to 0, let the timer run for a number of timeout\r
        periods, then check the timer has only executed once. */\r
        vTimerSetTimerID( xTimer, ( void * ) 0 );\r
        xTimerStart( xTimer, 0 );\r
-       vTaskDelay( 3UL * x10ms );\r
+       vTaskDelay( 3UL * x3ms );\r
        configASSERT( ( ( uint32_t ) ( pvTimerGetTimerID( xTimer ) ) ) == 1UL );\r
-       \r
-       /* Now change the timer to be an autoreload timer and check it executes\r
+\r
+       /* Now change the timer to be an auto-reload timer and check it executes\r
        the expected number of times. */\r
        vTimerSetReloadMode( xTimer, pdTRUE );\r
        xTimerStart( xTimer, 0 );\r
-       vTaskDelay( 3UL * x10ms );\r
+       vTaskDelay( 3UL * x3ms );\r
        configASSERT( ( uint32_t ) ( pvTimerGetTimerID( xTimer ) ) > 3UL );\r
        configASSERT( xTimerStop( xTimer, 0 ) != pdFAIL );\r
-       \r
+\r
        /* Clean up at the end. */\r
        xTimerDelete( xTimer, portMAX_DELAY );\r
 }\r