Remove unnecessary ';' characters from a couple of macro definitions in the IAR MSP43...

[freertos] / Source / queue.c

diff --git a/Source/queue.c b/Source/queue.c
index 8bb4f9089e855fbfa78da6b25a1d570892840646..e08cc2878797bb03b1152e50ed3aa9d83f635cbb 100644 (file)
--- a/Source/queue.c
+++ b/Source/queue.c
@@ -1,41 +1,46 @@
 /*\r
 /*\r

-    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
+    FreeRTOS V6.1.0 - Copyright (C) 2010 Real Time Engineers Ltd.\r
+\r
+    ***************************************************************************\r
+    *                                                                         *\r
+    * If you are:                                                             *\r
+    *                                                                         *\r
+    *    + New to FreeRTOS,                                                   *\r
+    *    + Wanting to learn FreeRTOS or multitasking in general quickly       *\r
+    *    + Looking for basic training,                                        *\r
+    *    + Wanting to improve your FreeRTOS skills and productivity           *\r
+    *                                                                         *\r
+    * then take a look at the FreeRTOS books - available as PDF or paperback  *\r
+    *                                                                         *\r
+    *        "Using the FreeRTOS Real Time Kernel - a Practical Guide"        *\r
+    *                  http://www.FreeRTOS.org/Documentation                  *\r
+    *                                                                         *\r
+    * A pdf reference manual is also available.  Both are usually delivered   *\r
+    * to your inbox within 20 minutes to two hours when purchased between 8am *\r
+    * and 8pm GMT (although please allow up to 24 hours in case of            *\r
+    * exceptional circumstances).  Thank you for your support!                *\r
+    *                                                                         *\r
+    ***************************************************************************\r

 \r
     This file is part of the FreeRTOS distribution.\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
+    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
     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 exception to the GPL is included to allow you to distribute a\r
-    combined work that includes FreeRTOS without being obliged to provide the\r
+    Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
+    ***NOTE*** The exception to the GPL is included to allow you to distribute\r
+    a combined work that includes FreeRTOS without being obliged to provide the\r

     source code for proprietary components outside of the FreeRTOS kernel.\r
     source code for proprietary components outside of the FreeRTOS kernel.\r

-    Alternative commercial license and support terms are also available upon\r
-    request.  See the licensing section of http://www.FreeRTOS.org for full\r
-    license details.\r
-\r
-    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT\r
+    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r

     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r

-    more details.\r
-\r
-    You should have received a copy of the GNU General Public License along\r
-    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
-    Temple Place, Suite 330, Boston, MA  02111-1307  USA.\r
-\r
-\r
-    ***************************************************************************\r
-    *                                                                         *\r
-    * The FreeRTOS eBook and reference manual are available to purchase for a *\r
-    * small fee. Help yourself get started quickly while also helping the     *\r
-    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *\r
-    *                                                                         *\r
-    ***************************************************************************\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
     1 tab == 4 spaces!\r
 \r

-    Please ensure to read the configuration and relevant port sections of the\r
-    online documentation.\r
-\r

     http://www.FreeRTOS.org - Documentation, latest information, license and\r
     contact details.\r
 \r
     http://www.FreeRTOS.org - Documentation, latest information, license and\r
     contact details.\r
 \r


@@ -410,6 +415,10 @@ size_t xQueueSizeInBytes;
                        {\r
                                ( pxMutex->uxRecursiveCallCount )++;\r
                        }\r
                        {\r
                                ( pxMutex->uxRecursiveCallCount )++;\r
                        }\r

+                       else\r
+                       {\r
+                               traceTAKE_MUTEX_RECURSIVE_FAILED( pxMutex );\r
+                       }\r

                }\r
 \r
                return xReturn;\r
                }\r
 \r
                return xReturn;\r