Kernel changes:

[freertos] / FreeRTOS / Demo / WIN32-MSVC / main.c

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c
index 917f642dc149bd2282edd26c23bf49a4e73d9c8f..21332acc3af3c76eceb8b53f43d98210f0577f0d 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -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\r
 multiple smaller heap regions - in which case heap_4.c would be the more\r
 appropriate choice. */\r
-#define mainREGION_1_SIZE      2001\r
-#define mainREGION_2_SIZE      18005\r
-#define mainREGION_3_SIZE      1007\r
+#define mainREGION_1_SIZE      4001\r
+#define mainREGION_2_SIZE      18105\r
+#define mainREGION_3_SIZE      1807\r
 \r
 /*\r
  * main_blinky() is used when mainCREATE_SIMPLE_BLINKY_DEMO_ONLY is set to 1.\r
@@ -297,7 +297,7 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0;
        ( void ) ulLine;\r
        ( void ) pcFileName;\r
 \r
-       taskENTER_CRITICAL();\r
+       taskENTER_CRITICAL();\r
        {\r
                /* Stop the trace recording. */\r
                if( xPrinted == pdFALSE )\r
@@ -367,6 +367,10 @@ const HeapRegion_t xHeapRegions[] =
        array. */\r
        configASSERT( ( ulAdditionalOffset + mainREGION_1_SIZE + mainREGION_2_SIZE + mainREGION_3_SIZE ) < configTOTAL_HEAP_SIZE );\r
 \r
+       /* Prevent compiler warnings when configASSERT() is not defined. */\r
+       ( void ) ulAdditionalOffset;\r
+\r
        vPortDefineHeapRegions( xHeapRegions );\r
 }\r
+/*-----------------------------------------------------------*/\r
 \r