Update version number in readiness for V10.3.0 release. Sync SVN with reviewed releas...

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

diff --git a/FreeRTOS/Demo/Common/Minimal/blocktim.c b/FreeRTOS/Demo/Common/Minimal/blocktim.c
index 576f095816ef4ea8e1bd37e74941d96a26770bfd..92282fe26bdb7c75bccc395ff4a668c6f9a89835 100644 (file)
--- a/FreeRTOS/Demo/Common/Minimal/blocktim.c
+++ b/FreeRTOS/Demo/Common/Minimal/blocktim.c
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS Kernel V10.0.0\r
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ * FreeRTOS Kernel V10.3.0\r
+ * Copyright (C) 2020 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
@@ -10,8 +10,7 @@
  * subject to the following conditions:\r
  *\r
  * The above copyright notice and this permission notice shall be included in all\r
- * copies or substantial portions of the Software. If you wish to use our Amazon\r
- * FreeRTOS name, please do so in a fair use way that does not cause confusion.\r
+ * copies or substantial portions of the Software.\r
  *\r
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
@@ -40,7 +39,7 @@
 /* Demo includes. */\r
 #include "blocktim.h"\r
 \r
-/* Task priorities.  Allow these to be overridden. */\r
+/* Task priorities and stack sizes.  Allow these to be overridden. */\r
 #ifndef bktPRIMARY_PRIORITY\r
        #define bktPRIMARY_PRIORITY             ( configMAX_PRIORITIES - 3 )\r
 #endif\r
@@ -49,6 +48,10 @@
        #define bktSECONDARY_PRIORITY   ( configMAX_PRIORITIES - 4 )\r
 #endif\r
 \r
+#ifndef bktBLOCK_TIME_TASK_STACK_SIZE\r
+       #define bktBLOCK_TIME_TASK_STACK_SIZE configMINIMAL_STACK_SIZE\r
+#endif\r
+\r
 /* Task behaviour. */\r
 #define bktQUEUE_LENGTH                                ( 5 )\r
 #define bktSHORT_WAIT                          pdMS_TO_TICKS( ( TickType_t ) 20 )\r
@@ -112,8 +115,8 @@ void vCreateBlockTimeTasks( void )
                vQueueAddToRegistry( xTestQueue, "Block_Time_Queue" );\r
 \r
                /* Create the two test tasks. */\r
-               xTaskCreate( vPrimaryBlockTimeTestTask, "BTest1", configMINIMAL_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );\r
-               xTaskCreate( vSecondaryBlockTimeTestTask, "BTest2", configMINIMAL_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );\r
+               xTaskCreate( vPrimaryBlockTimeTestTask, "BTest1", bktBLOCK_TIME_TASK_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );\r
+               xTaskCreate( vSecondaryBlockTimeTestTask, "BTest2", bktBLOCK_TIME_TASK_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -475,7 +478,8 @@ const TickType_t xPeriod = 75, xCycles = 5, xAllowableMargin = ( bktALLOWABLE_MA
        high as to disrupt the timer tests. */\r
        vTaskPrioritySet( NULL, configTIMER_TASK_PRIORITY - 1 );\r
 \r
-       /* Crude check to too that vTaskDelay() blocks for the expected period. */\r
+       /* Crude check to too see that vTaskDelay() blocks for the expected\r
+       period. */\r
        xPreTime = xTaskGetTickCount();\r
        vTaskDelay( bktTIME_TO_BLOCK );\r
        xPostTime = xTaskGetTickCount();\r