diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 10:54:55 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 10:54:55 -0600 |
commit | d646bcf4f5e2d0662b5b7261ff08d8f99457e261 (patch) | |
tree | c7b1c76b9e30faa72f2cd7600cafa112c2b75b4c /nuttx/mm/umm_malloc.c | |
parent | 2a8958c4efcab8dcc8fda9cd31bdcf462801669d (diff) | |
download | px4-nuttx-d646bcf4f5e2d0662b5b7261ff08d8f99457e261.tar.gz px4-nuttx-d646bcf4f5e2d0662b5b7261ff08d8f99457e261.tar.bz2 px4-nuttx-d646bcf4f5e2d0662b5b7261ff08d8f99457e261.zip |
Remove CONFIG_MM_MULTIHEAP. Non-multiheap operation is no longer supported
Diffstat (limited to 'nuttx/mm/umm_malloc.c')
-rw-r--r-- | nuttx/mm/umm_malloc.c | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/nuttx/mm/umm_malloc.c b/nuttx/mm/umm_malloc.c new file mode 100644 index 000000000..6d08fbc29 --- /dev/null +++ b/nuttx/mm/umm_malloc.c @@ -0,0 +1,91 @@ +/**************************************************************************** + * mm/umm_malloc.c + * + * Copyright (C) 2007, 2009, 2013-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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdlib.h> + +#include <nuttx/mm.h> + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: malloc + * + * Description: + * Allocate memory from the user heap. + * + * Parameters: + * size - Size (in bytes) of the memory region to be allocated. + * + * Return Value: + * The address of the allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *malloc(size_t size) +{ + return mm_malloc(&g_mmheap, size); +} + +#endif /* CONFIG_MM_USER_HEAP */ |