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_memalign.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_memalign.c')
| -rw-r--r-- | nuttx/mm/mm_memalign.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nuttx/mm/mm_memalign.c b/nuttx/mm/mm_memalign.c index d06964534..aa23cc9d6 100644 --- a/nuttx/mm/mm_memalign.c +++ b/nuttx/mm/mm_memalign.c @@ -37,10 +37,12 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> + +#include <stdlib.h> #include <assert.h> -#include "mm_environment.h" -#include "mm_internal.h" +#include <nuttx/mm.h> /**************************************************************************** * Pre-processor Definitions @@ -51,7 +53,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: _mm_memalign + * Name: mm_memalign * * Description: * memalign requests more than enough space from malloc, finds a region @@ -63,8 +65,11 @@ * ****************************************************************************/ -static inline FAR void *_mm_memalign(FAR struct mm_heap_s *heap, - size_t alignment, size_t size) +#ifndef CONFIG_MM_MULTIHEAP +static inline +#endif +FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, + size_t size) { FAR struct mm_allocnode_s *node; size_t rawchunk; @@ -213,7 +218,7 @@ static inline FAR void *_mm_memalign(FAR struct mm_heap_s *heap, ****************************************************************************/ /**************************************************************************** - * Name: _mm_memalign + * Name: memalign * * Description: * memalign requests more than enough space from malloc, finds a region @@ -229,7 +234,7 @@ static inline FAR void *_mm_memalign(FAR struct mm_heap_s *heap, FAR void *memalign(size_t alignment, size_t size) { - return _mm_memalign(&g_mmheap, alignment, size); + return mm_memalign(&g_mmheap, alignment, size); } #endif |