diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 07:29:09 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 07:29:09 -0600 |
| commit | afb3f6070fd68709530e9c10aa53b53488f575b8 (patch) | |
| tree | 35c56b8aeeaffba4b7d8544ef77bdea3d4031538 /nuttx/mm | |
| parent | b09d57f7fbf5bdf2b96a46707ef3db069f5bccbf (diff) | |
| download | px4-nuttx-afb3f6070fd68709530e9c10aa53b53488f575b8.tar.gz px4-nuttx-afb3f6070fd68709530e9c10aa53b53488f575b8.tar.bz2 px4-nuttx-afb3f6070fd68709530e9c10aa53b53488f575b8.zip | |
Move include/nuttx/mm.h to include/nuttx/mm/mm.h
Diffstat (limited to 'nuttx/mm')
43 files changed, 45 insertions, 45 deletions
diff --git a/nuttx/mm/README.txt b/nuttx/mm/README.txt index e604cee7e..0e9a4e7d2 100644 --- a/nuttx/mm/README.txt +++ b/nuttx/mm/README.txt @@ -40,11 +40,11 @@ This directory contains the NuttX memory management logic. This include: This allocator can be used to manage multiple heaps (albeit with some non-standard interfaces). A heap is represented by struct mm_heap_s - as defined in the file include/nuttx/mm.h. To create another heap + as defined in the file include/nuttx/mm/mm.h. To create another heap instance, you would allocate a heap structure, most likely statically in memory: - include <nuttx/mm.h> + include <nuttx/mm/mm.h> static struct mm_heap_s g_myheap; Then initialize the heap using: @@ -52,7 +52,7 @@ This directory contains the NuttX memory management logic. This include: mm_initialize(&g_myheap, myheap_start, myheap_size); Where mm_initialize() and all related interfaces are prototyped in the - header file include/nuttx/mm.h. + header file include/nuttx/mm/mm.h. After the new heap instance has been initialized, it can then be used with these almost familiar interfaces: mm_malloc(), mm_realloc(), mm_free(), diff --git a/nuttx/mm/kmm_heap/kmm_addregion.c b/nuttx/mm/kmm_heap/kmm_addregion.c index da1068cee..cccb20269 100644 --- a/nuttx/mm/kmm_heap/kmm_addregion.c +++ b/nuttx/mm/kmm_heap/kmm_addregion.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_brkaddr.c b/nuttx/mm/kmm_heap/kmm_brkaddr.c index 34c8855df..a04032e83 100644 --- a/nuttx/mm/kmm_heap/kmm_brkaddr.c +++ b/nuttx/mm/kmm_heap/kmm_brkaddr.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_calloc.c b/nuttx/mm/kmm_heap/kmm_calloc.c index 070ed568c..2da8e815c 100644 --- a/nuttx/mm/kmm_heap/kmm_calloc.c +++ b/nuttx/mm/kmm_heap/kmm_calloc.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_extend.c b/nuttx/mm/kmm_heap/kmm_extend.c index e0a6c701f..0a05ccd8d 100644 --- a/nuttx/mm/kmm_heap/kmm_extend.c +++ b/nuttx/mm/kmm_heap/kmm_extend.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_free.c b/nuttx/mm/kmm_heap/kmm_free.c index 15b9f8ac4..1b300158b 100644 --- a/nuttx/mm/kmm_heap/kmm_free.c +++ b/nuttx/mm/kmm_heap/kmm_free.c @@ -42,7 +42,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_heapmember.c b/nuttx/mm/kmm_heap/kmm_heapmember.c index 2a1ca7c00..d87228872 100644 --- a/nuttx/mm/kmm_heap/kmm_heapmember.c +++ b/nuttx/mm/kmm_heap/kmm_heapmember.c @@ -41,7 +41,7 @@ #include <stdbool.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG) diff --git a/nuttx/mm/kmm_heap/kmm_initialize.c b/nuttx/mm/kmm_heap/kmm_initialize.c index deeb0e25f..ed4cbc926 100644 --- a/nuttx/mm/kmm_heap/kmm_initialize.c +++ b/nuttx/mm/kmm_heap/kmm_initialize.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_mallinfo.c b/nuttx/mm/kmm_heap/kmm_mallinfo.c index 8a0ddf0e8..2ad3d26df 100644 --- a/nuttx/mm/kmm_heap/kmm_mallinfo.c +++ b/nuttx/mm/kmm_heap/kmm_mallinfo.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_malloc.c b/nuttx/mm/kmm_heap/kmm_malloc.c index 22b5d4894..a92e5e544 100644 --- a/nuttx/mm/kmm_heap/kmm_malloc.c +++ b/nuttx/mm/kmm_heap/kmm_malloc.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_memalign.c b/nuttx/mm/kmm_heap/kmm_memalign.c index b74c40866..40327e1d8 100644 --- a/nuttx/mm/kmm_heap/kmm_memalign.c +++ b/nuttx/mm/kmm_heap/kmm_memalign.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_realloc.c b/nuttx/mm/kmm_heap/kmm_realloc.c index f41e69182..3f553c071 100644 --- a/nuttx/mm/kmm_heap/kmm_realloc.c +++ b/nuttx/mm/kmm_heap/kmm_realloc.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_sbrk.c b/nuttx/mm/kmm_heap/kmm_sbrk.c index 59dd810e9..3cee21b42 100755 --- a/nuttx/mm/kmm_heap/kmm_sbrk.c +++ b/nuttx/mm/kmm_heap/kmm_sbrk.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if defined(CONFIG_BUILD_KERNEL) && defined(__KERNEL__) diff --git a/nuttx/mm/kmm_heap/kmm_sem.c b/nuttx/mm/kmm_heap/kmm_sem.c index 3a274bc04..47fce18d4 100644 --- a/nuttx/mm/kmm_heap/kmm_sem.c +++ b/nuttx/mm/kmm_heap/kmm_sem.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/kmm_heap/kmm_zalloc.c b/nuttx/mm/kmm_heap/kmm_zalloc.c index af70afe9c..c09f32904 100644 --- a/nuttx/mm/kmm_heap/kmm_zalloc.c +++ b/nuttx/mm/kmm_heap/kmm_zalloc.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/nuttx/mm/mm_heap/mm_addfreechunk.c b/nuttx/mm/mm_heap/mm_addfreechunk.c index 86ecfa129..64b503dd7 100644 --- a/nuttx/mm/mm_heap/mm_addfreechunk.c +++ b/nuttx/mm/mm_heap/mm_addfreechunk.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_brkaddr.c b/nuttx/mm/mm_heap/mm_brkaddr.c index 74f9facc7..1d7b22680 100644 --- a/nuttx/mm/mm_heap/mm_brkaddr.c +++ b/nuttx/mm/mm_heap/mm_brkaddr.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_calloc.c b/nuttx/mm/mm_heap/mm_calloc.c index 4d23512ac..fe94ff033 100644 --- a/nuttx/mm/mm_heap/mm_calloc.c +++ b/nuttx/mm/mm_heap/mm_calloc.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_extend.c b/nuttx/mm/mm_heap/mm_extend.c index d8a7f72f4..46c1fe0fe 100644 --- a/nuttx/mm/mm_heap/mm_extend.c +++ b/nuttx/mm/mm_heap/mm_extend.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_free.c b/nuttx/mm/mm_heap/mm_free.c index e3613484e..ae0f50d3c 100644 --- a/nuttx/mm/mm_heap/mm_free.c +++ b/nuttx/mm/mm_heap/mm_free.c @@ -42,7 +42,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_initialize.c b/nuttx/mm/mm_heap/mm_initialize.c index cfddc8d2a..f2d02d64b 100644 --- a/nuttx/mm/mm_heap/mm_initialize.c +++ b/nuttx/mm/mm_heap/mm_initialize.c @@ -43,7 +43,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_mallinfo.c b/nuttx/mm/mm_heap/mm_mallinfo.c index 5426b1eee..9b97760dd 100644 --- a/nuttx/mm/mm_heap/mm_mallinfo.c +++ b/nuttx/mm/mm_heap/mm_mallinfo.c @@ -43,7 +43,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_malloc.c b/nuttx/mm/mm_heap/mm_malloc.c index 6aa76a3d4..20b1916c8 100644 --- a/nuttx/mm/mm_heap/mm_malloc.c +++ b/nuttx/mm/mm_heap/mm_malloc.c @@ -42,7 +42,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_memalign.c b/nuttx/mm/mm_heap/mm_memalign.c index 0aeaf2c78..aa7971c0c 100644 --- a/nuttx/mm/mm_heap/mm_memalign.c +++ b/nuttx/mm/mm_heap/mm_memalign.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_realloc.c b/nuttx/mm/mm_heap/mm_realloc.c index 21a0f7d5d..f41d019b5 100644 --- a/nuttx/mm/mm_heap/mm_realloc.c +++ b/nuttx/mm/mm_heap/mm_realloc.c @@ -44,7 +44,7 @@ #include <stdio.h> #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_sbrk.c b/nuttx/mm/mm_heap/mm_sbrk.c index 6a4677060..a0f868012 100644 --- a/nuttx/mm/mm_heap/mm_sbrk.c +++ b/nuttx/mm/mm_heap/mm_sbrk.c @@ -44,7 +44,7 @@ #include <errno.h> #include <nuttx/arch.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #include <nuttx/pgalloc.h> #ifdef CONFIG_BUILD_KERNEL diff --git a/nuttx/mm/mm_heap/mm_sem.c b/nuttx/mm/mm_heap/mm_sem.c index baec83732..4be65b623 100644 --- a/nuttx/mm/mm_heap/mm_sem.c +++ b/nuttx/mm/mm_heap/mm_sem.c @@ -43,7 +43,7 @@ #include <errno.h> #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_shrinkchunk.c b/nuttx/mm/mm_heap/mm_shrinkchunk.c index 58cffb9fd..05fc3a7a0 100644 --- a/nuttx/mm/mm_heap/mm_shrinkchunk.c +++ b/nuttx/mm/mm_heap/mm_shrinkchunk.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_size2ndx.c b/nuttx/mm/mm_heap/mm_size2ndx.c index 2989e6c07..e3273767e 100644 --- a/nuttx/mm/mm_heap/mm_size2ndx.c +++ b/nuttx/mm/mm_heap/mm_size2ndx.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/mm_heap/mm_zalloc.c b/nuttx/mm/mm_heap/mm_zalloc.c index 2706c44af..deb3408d6 100644 --- a/nuttx/mm/mm_heap/mm_zalloc.c +++ b/nuttx/mm/mm_heap/mm_zalloc.c @@ -41,7 +41,7 @@ #include <string.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/mm/umm_heap/umm_addregion.c b/nuttx/mm/umm_heap/umm_addregion.c index 5f266fffe..3e756a999 100644 --- a/nuttx/mm/umm_heap/umm_addregion.c +++ b/nuttx/mm/umm_heap/umm_addregion.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_brkaddr.c b/nuttx/mm/umm_heap/umm_brkaddr.c index 900d75ea2..217f00641 100644 --- a/nuttx/mm/umm_heap/umm_brkaddr.c +++ b/nuttx/mm/umm_heap/umm_brkaddr.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_calloc.c b/nuttx/mm/umm_heap/umm_calloc.c index 25932bacd..9e75c0b82 100644 --- a/nuttx/mm/umm_heap/umm_calloc.c +++ b/nuttx/mm/umm_heap/umm_calloc.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_extend.c b/nuttx/mm/umm_heap/umm_extend.c index 62ee64f8b..c95c57d6b 100644 --- a/nuttx/mm/umm_heap/umm_extend.c +++ b/nuttx/mm/umm_heap/umm_extend.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_free.c b/nuttx/mm/umm_heap/umm_free.c index 42c95d8e7..0230273d6 100644 --- a/nuttx/mm/umm_heap/umm_free.c +++ b/nuttx/mm/umm_heap/umm_free.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_initialize.c b/nuttx/mm/umm_heap/umm_initialize.c index 07c82ce23..8efb0cc87 100644 --- a/nuttx/mm/umm_heap/umm_initialize.c +++ b/nuttx/mm/umm_heap/umm_initialize.c @@ -41,7 +41,7 @@ #include <assert.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_mallinfo.c b/nuttx/mm/umm_heap/umm_mallinfo.c index fd48c3696..14f83cd92 100644 --- a/nuttx/mm/umm_heap/umm_mallinfo.c +++ b/nuttx/mm/umm_heap/umm_mallinfo.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_malloc.c b/nuttx/mm/umm_heap/umm_malloc.c index 87cd55de2..e2cea6e3a 100644 --- a/nuttx/mm/umm_heap/umm_malloc.c +++ b/nuttx/mm/umm_heap/umm_malloc.c @@ -42,7 +42,7 @@ #include <stdlib.h> #include <unistd.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_memalign.c b/nuttx/mm/umm_heap/umm_memalign.c index 6fa91c0bc..fefd5ce21 100644 --- a/nuttx/mm/umm_heap/umm_memalign.c +++ b/nuttx/mm/umm_heap/umm_memalign.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_realloc.c b/nuttx/mm/umm_heap/umm_realloc.c index a67ecf6fe..925c28d3d 100644 --- a/nuttx/mm/umm_heap/umm_realloc.c +++ b/nuttx/mm/umm_heap/umm_realloc.c @@ -41,7 +41,7 @@ #include <stdlib.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_sbrk.c b/nuttx/mm/umm_heap/umm_sbrk.c index 787166d81..dcb9be932 100644 --- a/nuttx/mm/umm_heap/umm_sbrk.c +++ b/nuttx/mm/umm_heap/umm_sbrk.c @@ -41,7 +41,7 @@ #include <unistd.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #include <nuttx/addrenv.h> #include <nuttx/pgalloc.h> diff --git a/nuttx/mm/umm_heap/umm_sem.c b/nuttx/mm/umm_heap/umm_sem.c index 9051737e6..387266ae5 100644 --- a/nuttx/mm/umm_heap/umm_sem.c +++ b/nuttx/mm/umm_heap/umm_sem.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/nuttx/mm/umm_heap/umm_zalloc.c b/nuttx/mm/umm_heap/umm_zalloc.c index de6790f88..37b602dd9 100644 --- a/nuttx/mm/umm_heap/umm_zalloc.c +++ b/nuttx/mm/umm_heap/umm_zalloc.c @@ -42,7 +42,7 @@ #include <stdlib.h> #include <string.h> -#include <nuttx/mm.h> +#include <nuttx/mm/mm.h> #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) |