Move core heap allocator logic from mm/. to mm/mm_heap/.

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>