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

[freertos] / FreeRTOS / Demo / WIN32-MingW / DemosModifiedForLowTickRate / recmutex.c

diff --git a/FreeRTOS/Demo/WIN32-MingW/DemosModifiedForLowTickRate/recmutex.c b/FreeRTOS/Demo/WIN32-MingW/DemosModifiedForLowTickRate/recmutex.c
index 617f8598323797c66f39d8ae9211452b579b4635..2fddfe251ea7b1b09845dacf5d9d057dd205ee73 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MingW/DemosModifiedForLowTickRate/recmutex.c
+++ b/FreeRTOS/Demo/WIN32-MingW/DemosModifiedForLowTickRate/recmutex.c
@@ -1,70 +1,29 @@
 /*\r
 /*\r

-    FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT \r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-\r
-    This file is part of the FreeRTOS distribution.\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
-    >>>NOTE<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
-    \r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
-     *                                                                       *\r
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license \r
-    and contact details.  \r
-    \r
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
-    including FreeRTOS+Trace - an indispensable productivity tool.\r
-\r
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
-*/\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
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * 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.\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
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r

 \r
 /*\r
        The tasks defined on this page demonstrate the use of recursive mutexes.\r
 \r
 /*\r
        The tasks defined on this page demonstrate the use of recursive mutexes.\r


@@ -123,8 +82,8 @@ a chance of executing - this is basically achieved by reducing the number
 of times the loop that takes/gives the recursive mutex executes. */\r
 #define recmuMAX_COUNT                                 ( 2 )\r
 #define recmuSHORT_DELAY                               ( 20 )\r
 of times the loop that takes/gives the recursive mutex executes. */\r
 #define recmuMAX_COUNT                                 ( 2 )\r
 #define recmuSHORT_DELAY                               ( 20 )\r

-#define recmuNO_DELAY                                  ( ( portTickType ) 0 )\r
-#define recmuFIVE_TICK_DELAY                   ( ( portTickType ) 5 )\r
+#define recmuNO_DELAY                                  ( ( TickType_t ) 0 )\r
+#define recmuFIVE_TICK_DELAY                   ( ( TickType_t ) 5 )\r

 \r
 /* The three tasks as described at the top of this file. */\r
 static void prvRecursiveMutexControllingTask( void *pvParameters );\r
 \r
 /* The three tasks as described at the top of this file. */\r
 static void prvRecursiveMutexControllingTask( void *pvParameters );\r


@@ -132,7 +91,7 @@ static void prvRecursiveMutexBlockingTask( void *pvParameters );
 static void prvRecursiveMutexPollingTask( void *pvParameters );\r
 \r
 /* The mutex used by the demo. */\r
 static void prvRecursiveMutexPollingTask( void *pvParameters );\r
 \r
 /* The mutex used by the demo. */\r

-static xSemaphoreHandle xMutex;\r
+static SemaphoreHandle_t xMutex;\r

 \r
 /* Variables used to detect and latch errors. */\r
 static volatile portBASE_TYPE xErrorOccurred = pdFALSE, xControllingIsSuspended = pdFALSE, xBlockingIsSuspended = pdFALSE;\r
 \r
 /* Variables used to detect and latch errors. */\r
 static volatile portBASE_TYPE xErrorOccurred = pdFALSE, xControllingIsSuspended = pdFALSE, xBlockingIsSuspended = pdFALSE;\r


@@ -140,7 +99,7 @@ static volatile unsigned portBASE_TYPE uxControllingCycles = 0, uxBlockingCycles
 \r
 /* Handles of the two higher priority tasks, required so they can be resumed \r
 (unsuspended). */\r
 \r
 /* Handles of the two higher priority tasks, required so they can be resumed \r
 (unsuspended). */\r

-static xTaskHandle xControllingTaskHandle, xBlockingTaskHandle;\r
+static TaskHandle_t xControllingTaskHandle, xBlockingTaskHandle, xPollingTaskHandle;\r

 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r


@@ -156,14 +115,14 @@ void vStartRecursiveMutexTasks( void )
        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
        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( ( xQueueHandle ) xMutex, ( signed portCHAR * ) "Recursive_Mutex" );\r
+       vQueueAddToRegistry( ( QueueHandle_t ) xMutex, "Recursive_Mutex" );\r

 \r
 \r
        if( xMutex != NULL )\r
        {\r
 \r
 \r
        if( xMutex != NULL )\r
        {\r

-               xTaskCreate( prvRecursiveMutexControllingTask, ( signed portCHAR * ) "Rec1Ctrl", configMINIMAL_STACK_SIZE, NULL, recmuCONTROLLING_TASK_PRIORITY, &xControllingTaskHandle );\r
-        xTaskCreate( prvRecursiveMutexBlockingTask, ( signed portCHAR * ) "Rec2Blck", configMINIMAL_STACK_SIZE, NULL, recmuBLOCKING_TASK_PRIORITY, &xBlockingTaskHandle );\r
-        xTaskCreate( prvRecursiveMutexPollingTask, ( signed portCHAR * ) "Rec3Poll", configMINIMAL_STACK_SIZE, NULL, recmuPOLLING_TASK_PRIORITY, NULL );\r
+               xTaskCreate( prvRecursiveMutexControllingTask, "Rec1Ctrl", configMINIMAL_STACK_SIZE, NULL, recmuCONTROLLING_TASK_PRIORITY, &xControllingTaskHandle );\r
+        xTaskCreate( prvRecursiveMutexBlockingTask, "Rec2Blck", configMINIMAL_STACK_SIZE, NULL, recmuBLOCKING_TASK_PRIORITY, &xBlockingTaskHandle );\r
+        xTaskCreate( prvRecursiveMutexPollingTask, "Rec3Poll", configMINIMAL_STACK_SIZE, NULL, recmuPOLLING_TASK_PRIORITY, &xPollingTaskHandle );\r

        }\r
 }\r
 /*-----------------------------------------------------------*/\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r


@@ -226,6 +185,10 @@ unsigned portBASE_TYPE ux;
                        {\r
                                xErrorOccurred = pdTRUE;\r
                        }\r
                        {\r
                                xErrorOccurred = pdTRUE;\r
                        }\r

+\r
+                       #if configUSE_PREEMPTION == 0\r
+                               taskYIELD();\r
+                       #endif\r

                }\r
 \r
                /* Having given it back the same number of times as it was taken, we\r
                }\r
 \r
                /* Having given it back the same number of times as it was taken, we\r


@@ -332,10 +295,17 @@ static void prvRecursiveMutexPollingTask( void *pvParameters )
                                block indefinitely when it attempts to obtain the mutex, the\r
                                Controlling task will only block for a fixed period and an\r
                                error will be latched if the polling task has not returned the\r
                                block indefinitely when it attempts to obtain the mutex, the\r
                                Controlling task will only block for a fixed period and an\r
                                error will be latched if the polling task has not returned the\r

-                               mutex by the time this fixed period has expired. */\r
+                               mutex by the time this fixed period has expired. */                             \r

                                vTaskResume( xBlockingTaskHandle );\r
                                vTaskResume( xBlockingTaskHandle );\r

-                vTaskResume( xControllingTaskHandle );\r
-                       \r
+                               #if configUSE_PREEMPTION == 0\r
+                                       taskYIELD();\r
+                               #endif\r
+\r
+                               vTaskResume( xControllingTaskHandle );\r
+                               #if configUSE_PREEMPTION == 0\r
+                                       taskYIELD();\r
+                               #endif\r
+\r

                                /* The other two tasks should now have executed and no longer\r
                                be suspended. */\r
                                if( ( xBlockingIsSuspended == pdTRUE ) || ( xControllingIsSuspended == pdTRUE ) )\r
                                /* The other two tasks should now have executed and no longer\r
                                be suspended. */\r
                                if( ( xBlockingIsSuspended == pdTRUE ) || ( xControllingIsSuspended == pdTRUE ) )\r


@@ -348,6 +318,10 @@ static void prvRecursiveMutexPollingTask( void *pvParameters )
                                {\r
                                        xErrorOccurred = pdTRUE;\r
                                }\r
                                {\r
                                        xErrorOccurred = pdTRUE;\r
                                }\r

+\r
+                               #if configUSE_PREEMPTION == 0\r
+                                       taskYIELD();\r
+                               #endif\r

                        }\r
                }\r
 \r
                        }\r
                }\r
 \r