Move the user heap allocator front-end from mm/. to mm/umm_heap/.

mm/Makefile

@@ -67,16 +67,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += mm_sbrk.c
 endif
 
-# User allocator
+include umm_heap/Make.defs
-
-CSRCS += umm_initialize.c umm_addregion.c umm_sem.c
-CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
-CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c
-
-ifeq ($(CONFIG_BUILD_KERNEL),y)
-CSRCS += umm_sbrk.c
-endif
-
 include kmm_heap/Make.defs
 include mm_gran/Make.defs
 

mm/kmm_heap/Make.defs

@@ -48,7 +48,7 @@ ifeq ($(CONFIG_DEBUG),y)
 CSRCS += kmm_heapmember.c
 endif
 
-# Add the kernal heap directory to the build
+# Add the kernel heap directory to the build
 
 DEPPATH += --dep-path kmm_heap
 VPATH += :kmm_heap

mm/umm_heap/Make.defs

@@ -0,0 +1,49 @@
+############################################################################
+# mm/umm_heap/Make.defs
+#
+#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# User heap allocator
+
+CSRCS += umm_initialize.c umm_addregion.c umm_sem.c
+CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
+CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c
+
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+CSRCS += umm_sbrk.c
+endif
+
+# Add the user heap directory to the build
+
+DEPPATH += --dep-path umm_heap
+VPATH += :umm_heap

mm/umm_heap/umm_addregion.c

@@ -1,5 +1,5 @@
 /************************************************************************
- * mm/umm_addregion.c
+ * mm/umm_heap/umm_addregion.c
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_brkaddr.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_breakaddr.c
+ * mm/umm_heap/umm_breakaddr.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_calloc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_calloc.c
+ * mm/umm_heap/umm_calloc.c
  *
  *   Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_extend.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_extend.c
+ * mm/umm_heap/umm_extend.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_free.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_free.c
+ * mm/umm_heap/umm_free.c
  *
  *   Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_initialize.c

@@ -1,5 +1,5 @@
 /************************************************************************
- * mm/umm_initialize.c
+ * mm/umm_heap/umm_initialize.c
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_mallinfo.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_mallinfo.c
+ * mm/umm_heap/umm_mallinfo.c
  *
  *   Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_malloc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_malloc.c
+ * mm/umm_heap/umm_malloc.c
  *
  *   Copyright (C) 2007, 2009, 2013-2014  Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_memalign.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_memalign.c
+ * mm/umm_heap/umm_memalign.c
  *
  *   Copyright (C) 2007, 2009, 2011, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_realloc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/mm_realloc.c
+ * mm/umm_heap/umm_realloc.c
  *
  *   Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_sbrk.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/umm_sbrk.c
+ * mm/umm_heap/umm_sbrk.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_sem.c

@@ -1,5 +1,5 @@
 /************************************************************************
- * mm/umm_sem.c
+ * mm/umm_heap/umm_sem.c
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

mm/umm_heap/umm_zalloc.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * mm/mm_zalloc.c
+ * mm/umm/umm_zalloc.c
  *
  *   Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>