Target (FreeRTOS_Demo), 0x0004 // Tools: 'ARM-ADS'\r
GRPOPT 1,(Demo_Source),1,0,0\r
GRPOPT 2,(Libraries),1,0,0\r
-GRPOPT 3,(RTOS_Source),0,0,0\r
+GRPOPT 3,(RTOS_Source),1,0,0\r
GRPOPT 4,(Documentation),1,0,0\r
\r
OPTFFF 1,1,2,0,0,0,0,0,<.\startup_rvmdk.S><startup_rvmdk.S> \r
OPTFFF 1,5,1,989855744,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> \r
OPTFFF 1,6,1,939524096,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> \r
OPTFFF 1,7,1,201326592,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> \r
-OPTFFF 1,8,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> \r
+OPTFFF 1,8,1,0,0,0,0,0,<.\heap\heap_1.c><heap_1.c> \r
OPTFFF 2,9,4,0,0,0,0,0,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><driverlib.lib> \r
-OPTFFF 3,10,1,503316481,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
+OPTFFF 3,10,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> \r
OPTFFF 3,11,1,0,0,0,0,0,<..\..\Source\list.c><list.c> \r
OPTFFF 3,12,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> \r
OPTFFF 3,13,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> \r
OPTKEY 0,(DLGTARM)()\r
OPTKEY 0,(ARMDBGFLAGS)(-T5F)\r
OPTKEY 0,(LMIDK-AGDI)(-B0 -O1792)\r
- OPTBB 0,0,106,1,3002,0,0,0,0,1,<main.c>()()\r
OPTDF 0x84\r
OPTLE <>\r
OPTLC <>\r
Group (RTOS_Source)\r
Group (Documentation)\r
\r
-File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x44FB12E0 \r
-File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c> 0x44F9AFC1 \r
-File 1,1,<.\main.c><main.c> 0x44FC00B0 \r
-File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x44F30401 \r
-File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x44F30401 \r
-File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x44F30401 \r
-File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x44F30403 \r
-File 1,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 0x44F30418 \r
+File 1,2,<.\startup_rvmdk.S><startup_rvmdk.S> 0x45431C95 \r
+File 1,1,<.\LuminaryCode\osram96x16.c><osram96x16.c> 0x452BAD20 \r
+File 1,1,<.\main.c><main.c> 0x452A35C1 \r
+File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x452A35D8 \r
+File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x452A35D8 \r
+File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x452A35D8 \r
+File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x4538ECC1 \r
+File 1,1,<.\heap\heap_1.c><heap_1.c> 0x45431CD6 \r
File 2,4,<C:\Devtools\Keil\ARM\RV30\LIB\Luminary\driverlib.lib><driverlib.lib> 0x44F892D1 \r
-File 3,1,<..\..\Source\tasks.c><tasks.c> 0x44F303D7 \r
-File 3,1,<..\..\Source\list.c><list.c> 0x44F303E1 \r
-File 3,1,<..\..\Source\queue.c><queue.c> 0x44F303E0 \r
-File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x44F30423 \r
+File 3,1,<..\..\Source\tasks.c><tasks.c> 0x452A35A8 \r
+File 3,1,<..\..\Source\list.c><list.c> 0x452A35BA \r
+File 3,1,<..\..\Source\queue.c><queue.c> 0x452A35BA \r
+File 3,1,<..\..\Source\portable\RVDS\ARM_CM3\port.c><port.c> 0x452A35FB \r
File 4,5,<.\readme.txt><readme.txt> 0x44FC00DA \r
\r
\r
BrunUsr 1 0 <>\r
SVCSID <>\r
GLFLAGS=1790\r
- ADSFLGA { 16,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
+ ADSFLGA { 176,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
ACPUTYP (Cortex-M3)\r
ADSTFLGA { 0,12,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }\r
ADSLDSC ()\r
ADSLDIB ()\r
ADSLDIC ()\r
- ADSLDMC (--entry Reset_Handler)\r
+ ADSLDMC (--entry Reset_Handler --last xHeap)\r
ADSLDIF ()\r
ADSLDDW ()\r
OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S811)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S811)\r
--- /dev/null
+/*\r
+ FreeRTOS.org V4.1.2 - Copyright (C) 2003-2006 Richard Barry.\r
+\r
+ This file is part of the FreeRTOS.org distribution.\r
+\r
+ FreeRTOS.org is free software; you can redistribute it and/or modify\r
+ it under the terms of the GNU General Public License as published by\r
+ the Free Software Foundation; either version 2 of the License, or\r
+ (at your option) any later version.\r
+\r
+ FreeRTOS.org is distributed in the hope that it will be useful,\r
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ GNU General Public License for more details.\r
+\r
+ You should have received a copy of the GNU General Public License\r
+ along with FreeRTOS.org; if not, write to the Free Software\r
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\r
+\r
+ A special exception to the GPL can be applied should you wish to distribute\r
+ a combined work that includes FreeRTOS.org, without being obliged to provide\r
+ the source code for any proprietary components. See the licensing section \r
+ of http://www.FreeRTOS.org for full details of how and when the exception\r
+ can be applied.\r
+\r
+ ***************************************************************************\r
+ See http://www.FreeRTOS.org for documentation, latest information, license \r
+ and contact details. Please ensure to read the configuration and relevant \r
+ port sections of the online documentation.\r
+ ***************************************************************************\r
+*/\r
+\r
+\r
+\r
+/*\r
+ * The simplest possible implementation of pvPortMalloc(). Note that this\r
+ * implementation does NOT allow allocated memory to be freed again.\r
+ *\r
+ * See heap_2.c and heap_3.c for alternative implementations, and the memory\r
+ * management pages of http://www.FreeRTOS.org for more information.\r
+ */\r
+#include <stdlib.h>\r
+#include "FreeRTOS.h"\r
+#include "task.h"\r
+\r
+/* Setup the correct byte alignment mask for the defined byte alignment. */\r
+#if portBYTE_ALIGNMENT == 4\r
+ #define heapBYTE_ALIGNMENT_MASK ( ( size_t ) 0x0003 )\r
+#endif\r
+\r
+#if portBYTE_ALIGNMENT == 2\r
+ #define heapBYTE_ALIGNMENT_MASK ( ( size_t ) 0x0001 )\r
+#endif\r
+\r
+#if portBYTE_ALIGNMENT == 1 \r
+ #define heapBYTE_ALIGNMENT_MASK ( ( size_t ) 0x0000 )\r
+#endif\r
+\r
+#ifndef heapBYTE_ALIGNMENT_MASK\r
+ #error "Invalid portBYTE_ALIGNMENT definition"\r
+#endif\r
+\r
+/* Allocate the memory for the heap. The struct is used to force byte\r
+alignment without using any non-portable code. */\r
+extern struct xRTOS_HEAP\r
+{\r
+ unsigned portLONG ulDummy;\r
+ unsigned portCHAR ucHeap[ configTOTAL_HEAP_SIZE ];\r
+} xHeap;\r
+\r
+static size_t xNextFreeByte = ( size_t ) 0;\r
+/*-----------------------------------------------------------*/\r
+\r
+void *pvPortMalloc( size_t xWantedSize )\r
+{\r
+void *pvReturn = NULL; \r
+\r
+ /* Ensure that blocks are always aligned to the required number of bytes. */\r
+ #if portBYTE_ALIGNMENT != 1\r
+ if( xWantedSize & heapBYTE_ALIGNMENT_MASK )\r
+ {\r
+ /* Byte alignment required. */\r
+ xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & heapBYTE_ALIGNMENT_MASK ) );\r
+ }\r
+ #endif\r
+\r
+ vTaskSuspendAll();\r
+ {\r
+ /* Check there is enough room left for the allocation. */\r
+ if( ( ( xNextFreeByte + xWantedSize ) < configTOTAL_HEAP_SIZE ) &&\r
+ ( ( xNextFreeByte + xWantedSize ) > xNextFreeByte ) )/* Check for overflow. */\r
+ {\r
+ /* Return the next free byte then increment the index past this\r
+ block. */\r
+ pvReturn = &( xHeap.ucHeap[ xNextFreeByte ] );\r
+ xNextFreeByte += xWantedSize; \r
+ } \r
+ }\r
+ xTaskResumeAll();\r
+\r
+ return pvReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vPortFree( void *pv )\r
+{\r
+ /* Memory cannot be freed using this scheme. See heap_2.c and heap_3.c \r
+ for alternative implementations, and the memory management pages of \r
+ http://www.FreeRTOS.org for more information. */\r
+ ( void ) pv;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vPortInitialiseBlocks( void )\r
+{\r
+ /* Only required when static memory is not cleared. */\r
+ xNextFreeByte = ( size_t ) 0;\r
+}\r
+\r
+\r
;******************************************************************************\r
ALIGN\r
\r
+; Note: \r
+; Using READWRITE places Section .RTOSHeap in Region ER_RW.\r
+; Using NOINIT places Section .RTOSHeap in Region ER_ZI,which means\r
+; "ZEROINITIALIZE" (sic), and which is the last region in memory. Then\r
+; we need to make this section the last section, which is somewhat tricky,\r
+; because we cannot use the sectionname, but need to use a defined symbol:\r
+; Linker option: "--last xHeap"\r
+\r
+ EXPORT xHeap\r
+\r
+ AREA RTOSHeap, DATA, NOINIT\r
+xHeap\r
+\r
;******************************************************************************\r
;\r
; Tell the assembler that we're done.\r
projects / freertos / commitdiff