Update FreeRTOS

1 files changed, 32 insertions, 28 deletions

diff --git a/src/FreeRTOS/Source/portable/MemMang/heap_1.c b/src/FreeRTOS/Source/portable/MemMang/heap_1.c
index 607395d..aeca287 100644
--- a/src/FreeRTOS/Source/portable/MemMang/heap_1.c
+++ b/src/FreeRTOS/Source/portable/MemMang/heap_1.c
@@ -1,60 +1,64 @@
 /*

-    FreeRTOS V8.0.1 - Copyright (C) 2014 Real Time Engineers Ltd.

+    FreeRTOS V8.2.3 - Copyright (C) 2015 Real Time Engineers Ltd.

     All rights reserved

 

     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.

 

-    ***************************************************************************

-     *                                                                       *

-     *    FreeRTOS provides completely free yet professionally developed,    *

-     *    robust, strictly quality controlled, supported, and cross          *

-     *    platform software that has become a de facto standard.             *

-     *                                                                       *

-     *    Help yourself get started quickly and support the FreeRTOS         *

-     *    project by purchasing a FreeRTOS tutorial book, reference          *

-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *

-     *                                                                       *

-     *    Thank you!                                                         *

-     *                                                                       *

-    ***************************************************************************

-

     This file is part of the FreeRTOS distribution.

 

     FreeRTOS is free software; you can redistribute it and/or modify it under

     the terms of the GNU General Public License (version 2) as published by the

-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.

+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.

 

+    ***************************************************************************

     >>!   NOTE: The modification to the GPL is included to allow you to     !<<

     >>!   distribute a combined work that includes FreeRTOS without being   !<<

     >>!   obliged to provide the source code for proprietary components     !<<

     >>!   outside of the FreeRTOS kernel.                                   !<<

+    ***************************************************************************

 

     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY

     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following

+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following

     link: http://www.freertos.org/a00114.html

 

-    1 tab == 4 spaces!

-

     ***************************************************************************

      *                                                                       *

-     *    Having a problem?  Start by reading the FAQ "My application does   *

-     *    not run, what could be wrong?"                                     *

+     *    FreeRTOS provides completely free yet professionally developed,    *

+     *    robust, strictly quality controlled, supported, and cross          *

+     *    platform software that is more than just the market leader, it     *

+     *    is the industry's de facto standard.                               *

      *                                                                       *

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *

+     *    Help yourself get started quickly while simultaneously helping     *

+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *

+     *    tutorial book, reference manual, or both:                          *

+     *    http://www.FreeRTOS.org/Documentation                              *

      *                                                                       *

     ***************************************************************************

 

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,

-    license and Real Time Engineers Ltd. contact details.

+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading

+    the FAQ page "My application does not run, what could be wrong?".  Have you

+    defined configASSERT()?

+

+    http://www.FreeRTOS.org/support - In return for receiving this top quality

+    embedded software for free we request you assist our global community by

+    participating in the support forum.

+

+    http://www.FreeRTOS.org/training - Investing in training allows your team to

+    be as productive as possible as early as possible.  Now you can receive

+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers

+    Ltd, and the world's leading authority on the world's leading RTOS.

 

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

     including FreeRTOS+Trace - an indispensable productivity tool, a DOS

     compatible FAT file system, and our tiny thread aware UDP/IP stack.

 

-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High

-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS

-    licenses offer ticketed support, indemnification and middleware.

+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.

+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.

+

+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High

+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS

+    licenses offer ticketed support, indemnification and commercial middleware.

 

     http://www.SafeRTOS.com - High Integrity Systems also provide a safety

     engineered and independently SIL3 certified version for use in safety and

@@ -111,7 +115,7 @@ static uint8_t *pucAlignedHeap = NULL;
 		if( pucAlignedHeap == NULL )

 		{

 			/* Ensure the heap starts on a correctly aligned boundary. */

-			pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) &ucHeap[ portBYTE_ALIGNMENT ] ) & ( ( portPOINTER_SIZE_TYPE ) ~portBYTE_ALIGNMENT_MASK ) );

+			pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) &ucHeap[ portBYTE_ALIGNMENT ] ) & ( ~( ( portPOINTER_SIZE_TYPE ) portBYTE_ALIGNMENT_MASK ) ) );

 		}

 

 		/* Check there is enough room left for the allocation. */