diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 10:42:26 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 10:42:26 -0600 |
commit | 19fa0bdcc2946fea57857ec8e16191f8ab037c18 (patch) | |
tree | c723df86d08f5b0a64eeb108e8310674e48d2cb6 /nuttx/mm | |
parent | 8d66319ddae38dbbe6e59f957843567d644af452 (diff) | |
download | px4-nuttx-19fa0bdcc2946fea57857ec8e16191f8ab037c18.tar.gz px4-nuttx-19fa0bdcc2946fea57857ec8e16191f8ab037c18.tar.bz2 px4-nuttx-19fa0bdcc2946fea57857ec8e16191f8ab037c18.zip |
Move the kernel heap allocator front-end from mm/. to mm/kmm_heap/.
Diffstat (limited to 'nuttx/mm')
-rw-r--r-- | nuttx/mm/Makefile | 19 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_addregion.c (renamed from nuttx/mm/kmm_addregion.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_brkaddr.c (renamed from nuttx/mm/kmm_brkaddr.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_calloc.c (renamed from nuttx/mm/kmm_calloc.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_extend.c (renamed from nuttx/mm/kmm_extend.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_free.c (renamed from nuttx/mm/kmm_free.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_heapmember.c (renamed from nuttx/mm/kmm_heapmember.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_initialize.c (renamed from nuttx/mm/kmm_initialize.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_kernel.c (renamed from nuttx/mm/kmm_kernel.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_mallinfo.c (renamed from nuttx/mm/kmm_mallinfo.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_malloc.c (renamed from nuttx/mm/kmm_malloc.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_memalign.c (renamed from nuttx/mm/kmm_memalign.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_realloc.c (renamed from nuttx/mm/kmm_realloc.c) | 2 | ||||
-rwxr-xr-x | nuttx/mm/kmm_heap/kmm_sbrk.c (renamed from nuttx/mm/kmm_sbrk.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_sem.c (renamed from nuttx/mm/kmm_sem.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/kmm_heap/kmm_zalloc.c (renamed from nuttx/mm/kmm_zalloc.c) | 2 |
16 files changed, 16 insertions, 33 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile index 2aa90e5e4..65c061c2e 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/mm/Makefile @@ -77,24 +77,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y) CSRCS += umm_sbrk.c endif -# Kernel allocator - -ifeq ($(CONFIG_MM_KERNEL_HEAP),y) -CSRCS += kmm_initialize.c kmm_addregion.c kmm_sem.c -CSRCS += kmm_brkaddr.c kmm_calloc.c kmm_extend.c kmm_free.c kmm_mallinfo.c -CSRCS += kmm_malloc.c kmm_memalign.c kmm_realloc.c kmm_zalloc.c - -ifeq ($(CONFIG_BUILD_KERNEL),y) -CSRCS += kmm_sbrk.c -endif - -ifeq ($(CONFIG_DEBUG),y) -CSRCS += kmm_heapmember.c -endif -endif - -# An optional granule allocator - +include kmm_heap/Make.defs include mm_gran/Make.defs BINDIR ?= bin diff --git a/nuttx/mm/kmm_addregion.c b/nuttx/mm/kmm_heap/kmm_addregion.c index 574a983f6..da1068cee 100644 --- a/nuttx/mm/kmm_addregion.c +++ b/nuttx/mm/kmm_heap/kmm_addregion.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_addregion.c + * mm/kmm_heap/kmm_addregion.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_brkaddr.c b/nuttx/mm/kmm_heap/kmm_brkaddr.c index 463744a2a..34c8855df 100644 --- a/nuttx/mm/kmm_brkaddr.c +++ b/nuttx/mm/kmm_heap/kmm_brkaddr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_breakaddr.c + * mm/kmm_heap/kmm_breakaddr.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_calloc.c b/nuttx/mm/kmm_heap/kmm_calloc.c index db8ac185f..070ed568c 100644 --- a/nuttx/mm/kmm_calloc.c +++ b/nuttx/mm/kmm_heap/kmm_calloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_calloc.c + * mm/kmm_heap/kmm_calloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_extend.c b/nuttx/mm/kmm_heap/kmm_extend.c index 1ae1e2865..e0a6c701f 100644 --- a/nuttx/mm/kmm_extend.c +++ b/nuttx/mm/kmm_heap/kmm_extend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_extend.c + * mm/kmm_heap/kmm_extend.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_free.c b/nuttx/mm/kmm_heap/kmm_free.c index 92b0059ba..15b9f8ac4 100644 --- a/nuttx/mm/kmm_free.c +++ b/nuttx/mm/kmm_heap/kmm_free.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_free.c + * mm/kmm_heap/kmm_free.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_heapmember.c b/nuttx/mm/kmm_heap/kmm_heapmember.c index a91a6a667..2a1ca7c00 100644 --- a/nuttx/mm/kmm_heapmember.c +++ b/nuttx/mm/kmm_heap/kmm_heapmember.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_heapmember.c + * mm/kmm_heap/kmm_heapmember.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_initialize.c b/nuttx/mm/kmm_heap/kmm_initialize.c index 591c76715..deeb0e25f 100644 --- a/nuttx/mm/kmm_initialize.c +++ b/nuttx/mm/kmm_heap/kmm_initialize.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_initialize.c + * mm/kmm_heap/kmm_initialize.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_kernel.c b/nuttx/mm/kmm_heap/kmm_kernel.c index 646cafa6c..4ab8e1b2b 100644 --- a/nuttx/mm/kmm_kernel.c +++ b/nuttx/mm/kmm_heap/kmm_kernel.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_kernel.c + * mm/kmm_heap/kmm_kernel.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_mallinfo.c b/nuttx/mm/kmm_heap/kmm_mallinfo.c index d7c3ab475..8a0ddf0e8 100644 --- a/nuttx/mm/kmm_mallinfo.c +++ b/nuttx/mm/kmm_heap/kmm_mallinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_mallinfo.c + * mm/kmm_heap/kmm_mallinfo.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_malloc.c b/nuttx/mm/kmm_heap/kmm_malloc.c index 65d1a5f4e..22b5d4894 100644 --- a/nuttx/mm/kmm_malloc.c +++ b/nuttx/mm/kmm_heap/kmm_malloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_malloc.c + * mm/kmm_heap/kmm_malloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_memalign.c b/nuttx/mm/kmm_heap/kmm_memalign.c index 783ea9ff4..b74c40866 100644 --- a/nuttx/mm/kmm_memalign.c +++ b/nuttx/mm/kmm_heap/kmm_memalign.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_memalign.c + * mm/kmm_heap/kmm_memalign.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_realloc.c b/nuttx/mm/kmm_heap/kmm_realloc.c index fdb77da3f..f41e69182 100644 --- a/nuttx/mm/kmm_realloc.c +++ b/nuttx/mm/kmm_heap/kmm_realloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_realloc.c + * mm/kmm_heap/kmm_realloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_sbrk.c b/nuttx/mm/kmm_heap/kmm_sbrk.c index 90c9b6627..59dd810e9 100755 --- a/nuttx/mm/kmm_sbrk.c +++ b/nuttx/mm/kmm_heap/kmm_sbrk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_sbrk.c + * mm/kmm_heap/kmm_sbrk.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_sem.c b/nuttx/mm/kmm_heap/kmm_sem.c index 7883a6e56..3a274bc04 100644 --- a/nuttx/mm/kmm_sem.c +++ b/nuttx/mm/kmm_heap/kmm_sem.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_sem.c + * mm/kmm_heap/kmm_sem.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/kmm_zalloc.c b/nuttx/mm/kmm_heap/kmm_zalloc.c index 9cbc5081a..af70afe9c 100644 --- a/nuttx/mm/kmm_zalloc.c +++ b/nuttx/mm/kmm_heap/kmm_zalloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_zalloc.c + * mm/kmm_heap/kmm_zalloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> |