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

16 files changed, 64 insertions, 24 deletions

diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index 65c061c2e..50dd83b5f 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -67,16 +67,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += mm_sbrk.c
 endif
 
-# User 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
-
+include umm_heap/Make.defs
 include kmm_heap/Make.defs
 include mm_gran/Make.defs
 
diff --git a/nuttx/mm/kmm_heap/Make.defs b/nuttx/mm/kmm_heap/Make.defs
index 3dcb08aad..cf7053e54 100644
--- a/nuttx/mm/kmm_heap/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/mm/umm_heap/Make.defs b/nuttx/mm/umm_heap/Make.defs
new file mode 100644
index 000000000..f29870d21
--- /dev/null
+++ b/nuttx/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
diff --git a/nuttx/mm/umm_addregion.c b/nuttx/mm/umm_heap/umm_addregion.c
index 5cef04b01..5f266fffe 100644
--- a/nuttx/mm/umm_addregion.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_brkaddr.c b/nuttx/mm/umm_heap/umm_brkaddr.c
index 25e399542..900d75ea2 100644
--- a/nuttx/mm/umm_brkaddr.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_calloc.c b/nuttx/mm/umm_heap/umm_calloc.c
index ed1a2d606..25932bacd 100644
--- a/nuttx/mm/umm_calloc.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_extend.c b/nuttx/mm/umm_heap/umm_extend.c
index af1bb18d3..62ee64f8b 100644
--- a/nuttx/mm/umm_extend.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_free.c b/nuttx/mm/umm_heap/umm_free.c
index 6c6d59be7..42c95d8e7 100644
--- a/nuttx/mm/umm_free.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_initialize.c b/nuttx/mm/umm_heap/umm_initialize.c
index fb812d5c5..07c82ce23 100644
--- a/nuttx/mm/umm_initialize.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_mallinfo.c b/nuttx/mm/umm_heap/umm_mallinfo.c
index c7ea241c0..fd48c3696 100644
--- a/nuttx/mm/umm_mallinfo.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_malloc.c b/nuttx/mm/umm_heap/umm_malloc.c
index 972b214de..87cd55de2 100644
--- a/nuttx/mm/umm_malloc.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_memalign.c b/nuttx/mm/umm_heap/umm_memalign.c
index 3659606f3..6fa91c0bc 100644
--- a/nuttx/mm/umm_memalign.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_realloc.c b/nuttx/mm/umm_heap/umm_realloc.c
index 45da6e7ec..a67ecf6fe 100644
--- a/nuttx/mm/umm_realloc.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_sbrk.c b/nuttx/mm/umm_heap/umm_sbrk.c
index 9eff1a4b6..787166d81 100644
--- a/nuttx/mm/umm_sbrk.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_sem.c b/nuttx/mm/umm_heap/umm_sem.c
index baa992ebb..9051737e6 100644
--- a/nuttx/mm/umm_sem.c
+++ b/nuttx/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>
diff --git a/nuttx/mm/umm_zalloc.c b/nuttx/mm/umm_heap/umm_zalloc.c
index 06d9d1047..de6790f88 100644
--- a/nuttx/mm/umm_zalloc.c
+++ b/nuttx/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>