Changed the MicroBlaze demo back to using heap_3.c having updated the linker script...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1550 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
index cd78c1e89b6aeea9118a04fc50764a4c391059b7..3ed26c6336303934cac6e2529489fae65982c434 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
@@ -68,7 +68,7 @@ IF EXIST FreeRTOS_Source Goto END
     copy %FREERTOS_SOURCE%\portable\MemMang\heap_3.c FreeRTOS_Source\portable\MemMang\r
 \r
     REM Copy the basic memory allocation files into the BSP directory\r
-    copy %FREERTOS_SOURCE%\portable\MemMang\heap_2.c %BSP_SOURCE%\portable\MemMang\r
+    copy %FREERTOS_SOURCE%\portable\MemMang\heap_3.c %BSP_SOURCE%\portable\MemMang\r
 \r
     REM Copy the files that define the common demo tasks.\r
     copy %COMMON_SOURCE%\dynamic.c         Demo_Source\r

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
index 73af0591f8c7e828efba8300f2877b06abed208f..1f04da041987ca433f2d9dae444efc9a22fdb83c 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/main-blinky.c
@@ -422,29 +422,37 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
 \r
 void vApplicationIdleHook( void )\r
 {\r
-volatile size_t xFreeHeapSpace;\r
-\r
-       /* vApplicationIdleHook() will only be called if configUSE_IDLE_HOOK is set \r
-       to 1 in FreeRTOSConfig.h.  It will be called on each iteration of the idle \r
-       task.  It is essential that code added to this hook function never attempts \r
-       to block in any way (for example, call xQueueReceive() with a block time \r
-       specified, or call vTaskDelay()).  If the application makes use of the \r
-       vTaskDelete() API function (as this demo application does) then it is also \r
-       important that vApplicationIdleHook() is permitted to return to its calling \r
-       function, because it is the responsibility of the idle task to clean up \r
-       memory allocated by the kernel to any task that has since been deleted. */\r
-\r
-       /* This implementation of vApplicationIdleHook() simply demonstrates how\r
-       the xPortGetFreeHeapSize() function can be used. */\r
-       xFreeHeapSpace = xPortGetFreeHeapSize();\r
-\r
-       if( xFreeHeapSpace > 100 )\r
-       {\r
-               /* By now, the kernel has allocated everything it is going to, so\r
-               if there is a lot of heap remaining unallocated then\r
-               the value of configTOTAL_HEAP_SIZE in FreeRTOSConfig.h can be\r
-               reduced accordingly. */\r
-       }\r
+#ifdef EXAMPLE_CODE_ONLY\r
+\r
+       The following code can only be included if heap_1.c or heap_2.c is used in\r
+       the project.  By default, heap_3.c is used, so the example code is\r
+       excluded.  See http://www.freertos.org/a00111.html for more information on\r
+       memory management options.\r
+\r
+       volatile size_t xFreeHeapSpace;\r
+\r
+               /* vApplicationIdleHook() will only be called if configUSE_IDLE_HOOK is set\r
+               to 1 in FreeRTOSConfig.h.  It will be called on each iteration of the idle\r
+               task.  It is essential that code added to this hook function never attempts\r
+               to block in any way (for example, call xQueueReceive() with a block time\r
+               specified, or call vTaskDelay()).  If the application makes use of the\r
+               vTaskDelete() API function (as this demo application does) then it is also\r
+               important that vApplicationIdleHook() is permitted to return to its calling\r
+               function, because it is the responsibility of the idle task to clean up\r
+               memory allocated by the kernel to any task that has since been deleted. */\r
+\r
+               /* This implementation of vApplicationIdleHook() simply demonstrates how\r
+               the xPortGetFreeHeapSize() function can be used. */\r
+               xFreeHeapSpace = xPortGetFreeHeapSize();\r
+\r
+               if( xFreeHeapSpace > 100 )\r
+               {\r
+                       /* By now, the kernel has allocated everything it is going to, so\r
+                       if there is a lot of heap remaining unallocated then\r
+                       the value of configTOTAL_HEAP_SIZE in FreeRTOSConfig.h can be\r
+                       reduced accordingly. */\r
+               }\r
+#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/src/lscript.ld b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/src/lscript.ld
index c076755fbb016d7bc239bbf1506fed87a378a509..76fb76b28834cc10edd7d8c535d3a463724d7407 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/src/lscript.ld
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/src/lscript.ld
@@ -11,7 +11,7 @@
 /*******************************************************************/\r
 \r
 _STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;\r
-_HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x8;\r
+_HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x10400;\r
 \r
 /* Define Memories in the system */\r
 \r