diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 20:36:18 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 20:36:18 +0000 |
| commit | 5e160bcf59441ce40088ca089cbeb4461a0b0d6a (patch) | |
| tree | a71405922d088fd3dd1cd878ffb53e90bfe6a42e /nuttx/mm/mm_free.c | |
| parent | 6137a8aa8f69cb0c197efced18d7e49144791666 (diff) | |
| download | px4-nuttx-5e160bcf59441ce40088ca089cbeb4461a0b0d6a.tar.gz px4-nuttx-5e160bcf59441ce40088ca089cbeb4461a0b0d6a.tar.bz2 px4-nuttx-5e160bcf59441ce40088ca089cbeb4461a0b0d6a.zip | |
Add support for multiple heaps
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5720 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/mm/mm_free.c')
| -rw-r--r-- | nuttx/mm/mm_free.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nuttx/mm/mm_free.c b/nuttx/mm/mm_free.c index 7f7d92b16..220b9bca0 100644 --- a/nuttx/mm/mm_free.c +++ b/nuttx/mm/mm_free.c @@ -37,10 +37,13 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> + +#include <stdlib.h> #include <assert.h> +#include <debug.h> -#include "mm_environment.h" -#include "mm_internal.h" +#include <nuttx/mm.h> /**************************************************************************** * Pre-processor Definitions @@ -51,7 +54,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: _mm_free + * Name: mm_free * * Description: * Returns a chunk of memory to the list of free nodes, merging with @@ -59,7 +62,10 @@ * ****************************************************************************/ -static inline void _mm_free(FAR struct mm_heap_s *heap, FAR void *mem) +#ifndef CONFIG_MM_MULTIHEAP +static inline +#endif +void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) { FAR struct mm_freenode_s *node; FAR struct mm_freenode_s *prev; @@ -164,6 +170,6 @@ static inline void _mm_free(FAR struct mm_heap_s *heap, FAR void *mem) #if !defined(CONFIG_NUTTX_KERNEL) || !defined(__KERNEL__) void free(FAR void *mem) { - _mm_free(&g_mmheap, mem); + mm_free(&g_mmheap, mem); } #endif |