X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FWIN32-MSVC%2Fmain.c;h=21332acc3af3c76eceb8b53f43d98210f0577f0d;hb=9da84ad61903f51213117867366f22c3f9e63c7e;hp=917f642dc149bd2282edd26c23bf49a4e73d9c8f;hpb=01b0b5bd98770d9046145309f15c3eca37d2f8cb;p=freertos diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c index 917f642dc..21332acc3 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd. + FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. All rights reserved VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. @@ -112,9 +112,9 @@ that make up the total heap. This is only done to provide an example of heap_5 being used as this demo could easily create one large heap region instead of multiple smaller heap regions - in which case heap_4.c would be the more appropriate choice. */ -#define mainREGION_1_SIZE 2001 -#define mainREGION_2_SIZE 18005 -#define mainREGION_3_SIZE 1007 +#define mainREGION_1_SIZE 4001 +#define mainREGION_2_SIZE 18105 +#define mainREGION_3_SIZE 1807 /* * main_blinky() is used when mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1. @@ -297,7 +297,7 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0; ( void ) ulLine; ( void ) pcFileName; - taskENTER_CRITICAL(); + taskENTER_CRITICAL(); { /* Stop the trace recording. */ if( xPrinted == pdFALSE ) @@ -367,6 +367,10 @@ const HeapRegion_t xHeapRegions[] = array. */ configASSERT( ( ulAdditionalOffset + mainREGION_1_SIZE + mainREGION_2_SIZE + mainREGION_3_SIZE ) < configTOTAL_HEAP_SIZE ); + /* Prevent compiler warnings when configASSERT() is not defined. */ + ( void ) ulAdditionalOffset; + vPortDefineHeapRegions( xHeapRegions ); } +/*-----------------------------------------------------------*/