diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 10:53:50 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 10:53:50 -0600 |
commit | dd81d6c508406314458185e9129469e5eb0345f2 (patch) | |
tree | 38e8d7d0398d542f90daa18b78dc40aaf227b6cf /nuttx/mm | |
parent | 59eb87ed86beddf2d90fc8eb776d43f8586b90ac (diff) | |
download | px4-nuttx-dd81d6c508406314458185e9129469e5eb0345f2.tar.gz px4-nuttx-dd81d6c508406314458185e9129469e5eb0345f2.tar.bz2 px4-nuttx-dd81d6c508406314458185e9129469e5eb0345f2.zip |
Move core heap allocator logic from mm/. to mm/mm_heap/.
Diffstat (limited to 'nuttx/mm')
-rw-r--r-- | nuttx/mm/Makefile | 12 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_addfreechunk.c (renamed from nuttx/mm/mm_addfreechunk.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_brkaddr.c (renamed from nuttx/mm/mm_brkaddr.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_calloc.c (renamed from nuttx/mm/mm_calloc.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_extend.c (renamed from nuttx/mm/mm_extend.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_free.c (renamed from nuttx/mm/mm_free.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_initialize.c (renamed from nuttx/mm/mm_initialize.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_mallinfo.c (renamed from nuttx/mm/mm_mallinfo.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_malloc.c (renamed from nuttx/mm/mm_malloc.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_memalign.c (renamed from nuttx/mm/mm_memalign.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_realloc.c (renamed from nuttx/mm/mm_realloc.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_sbrk.c (renamed from nuttx/mm/mm_sbrk.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_sem.c (renamed from nuttx/mm/mm_sem.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_shrinkchunk.c (renamed from nuttx/mm/mm_shrinkchunk.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_size2ndx.c (renamed from nuttx/mm/mm_size2ndx.c) | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_heap/mm_zalloc.c (renamed from nuttx/mm/mm_zalloc.c) | 2 |
16 files changed, 16 insertions, 26 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile index 50dd83b5f..188b6c797 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/mm/Makefile @@ -56,17 +56,7 @@ CSRCS = DEPPATH = --dep-path . VPATH = . -# Core allocator logic - -CSRCS += mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c -CSRCS += mm_shrinkchunk.c -CSRCS += mm_brkaddr.c mm_calloc.c mm_extend.c mm_free.c mm_mallinfo.c -CSRCS += mm_malloc.c mm_memalign.c mm_realloc.c mm_zalloc.c - -ifeq ($(CONFIG_BUILD_KERNEL),y) -CSRCS += mm_sbrk.c -endif - +include mm_heap/Make.defs include umm_heap/Make.defs include kmm_heap/Make.defs include mm_gran/Make.defs diff --git a/nuttx/mm/mm_addfreechunk.c b/nuttx/mm/mm_heap/mm_addfreechunk.c index 7931c59bb..86ecfa129 100644 --- a/nuttx/mm/mm_addfreechunk.c +++ b/nuttx/mm/mm_heap/mm_addfreechunk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_addfreechunk.c + * mm/mm_heap/mm_addfreechunk.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_brkaddr.c b/nuttx/mm/mm_heap/mm_brkaddr.c index 8476050c4..74f9facc7 100644 --- a/nuttx/mm/mm_brkaddr.c +++ b/nuttx/mm/mm_heap/mm_brkaddr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_brkaddr.c + * mm/mm_heap/mm_brkaddr.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_calloc.c b/nuttx/mm/mm_heap/mm_calloc.c index c78ede8d4..4d23512ac 100644 --- a/nuttx/mm/mm_calloc.c +++ b/nuttx/mm/mm_heap/mm_calloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_calloc.c + * mm/mm_heap/mm_calloc.c * * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_extend.c b/nuttx/mm/mm_heap/mm_extend.c index 834360760..d8a7f72f4 100644 --- a/nuttx/mm/mm_extend.c +++ b/nuttx/mm/mm_heap/mm_extend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_extend.c + * mm/mm_heap/mm_extend.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_free.c b/nuttx/mm/mm_heap/mm_free.c index bcc04abc9..e3613484e 100644 --- a/nuttx/mm/mm_free.c +++ b/nuttx/mm/mm_heap/mm_free.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_free.c + * mm/mm_heap/mm_free.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_initialize.c b/nuttx/mm/mm_heap/mm_initialize.c index 6107a7b7d..cfddc8d2a 100644 --- a/nuttx/mm/mm_initialize.c +++ b/nuttx/mm/mm_heap/mm_initialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_initialize.c + * mm/mm_heap/mm_initialize.c * * Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_mallinfo.c b/nuttx/mm/mm_heap/mm_mallinfo.c index 6f00a8f03..5426b1eee 100644 --- a/nuttx/mm/mm_mallinfo.c +++ b/nuttx/mm/mm_heap/mm_mallinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_mallinfo.c + * mm/mm_heap/mm_mallinfo.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_malloc.c b/nuttx/mm/mm_heap/mm_malloc.c index 47237f99f..6aa76a3d4 100644 --- a/nuttx/mm/mm_malloc.c +++ b/nuttx/mm/mm_heap/mm_malloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_malloc.c + * mm/mm_heap/mm_malloc.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_memalign.c b/nuttx/mm/mm_heap/mm_memalign.c index a45d7ffe4..0aeaf2c78 100644 --- a/nuttx/mm/mm_memalign.c +++ b/nuttx/mm/mm_heap/mm_memalign.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_memalign.c + * mm/mm_heap/mm_memalign.c * * Copyright (C) 2007, 2009, 2011, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_realloc.c b/nuttx/mm/mm_heap/mm_realloc.c index c85e12766..21a0f7d5d 100644 --- a/nuttx/mm/mm_realloc.c +++ b/nuttx/mm/mm_heap/mm_realloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_realloc.c + * mm/mm_heap/mm_realloc.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_sbrk.c b/nuttx/mm/mm_heap/mm_sbrk.c index dc4c0318e..6a4677060 100644 --- a/nuttx/mm/mm_sbrk.c +++ b/nuttx/mm/mm_heap/mm_sbrk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_sbrk.c + * mm/mm_heap/mm_sbrk.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_sem.c b/nuttx/mm/mm_heap/mm_sem.c index e72f7d796..baec83732 100644 --- a/nuttx/mm/mm_sem.c +++ b/nuttx/mm/mm_heap/mm_sem.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_sem.c + * mm/mm_heap/mm_sem.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_shrinkchunk.c b/nuttx/mm/mm_heap/mm_shrinkchunk.c index b88baa6d4..58cffb9fd 100644 --- a/nuttx/mm/mm_shrinkchunk.c +++ b/nuttx/mm/mm_heap/mm_shrinkchunk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_shrinkchunk.c + * mm/mm_heap/mm_shrinkchunk.c * * Copyright (C) 2007, 2009, 1013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_size2ndx.c b/nuttx/mm/mm_heap/mm_size2ndx.c index 038b92142..2989e6c07 100644 --- a/nuttx/mm/mm_size2ndx.c +++ b/nuttx/mm/mm_heap/mm_size2ndx.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_size2ndx.c + * mm/mm_heap/mm_size2ndx.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/mm/mm_zalloc.c b/nuttx/mm/mm_heap/mm_zalloc.c index c665adc04..2706c44af 100644 --- a/nuttx/mm/mm_zalloc.c +++ b/nuttx/mm/mm_heap/mm_zalloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/mm_zalloc.c + * mm/mm_heap/mm_zalloc.c * * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> |