diff --git a/arch/arm/src/stm32/stm32_ccm.h b/arch/arm/src/stm32/stm32_ccm.h index 9b5041bc1ed..91b3303879a 100755 --- a/arch/arm/src/stm32/stm32_ccm.h +++ b/arch/arm/src/stm32/stm32_ccm.h @@ -43,7 +43,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c index 256a7b7429d..ccc20063cb0 100644 --- a/binfmt/binfmt_execmodule.c +++ b/binfmt/binfmt_execmodule.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/configs/mikroe-stm32f4/kernel/up_userspace.c b/configs/mikroe-stm32f4/kernel/up_userspace.c index 614ae3b8992..ed2f7d8a954 100644 --- a/configs/mikroe-stm32f4/kernel/up_userspace.c +++ b/configs/mikroe-stm32f4/kernel/up_userspace.c @@ -43,7 +43,7 @@ #include #include -#include +#include #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) @@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .signal_handler = up_signal_handler, #endif - /* Memory manager entry points (declared in include/nuttx/mm.h) */ + /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */ .mm_initialize = umm_initialize, .mm_addregion = umm_addregion, diff --git a/configs/open1788/kernel/up_userspace.c b/configs/open1788/kernel/up_userspace.c index ffcd8db480a..48413ec159b 100644 --- a/configs/open1788/kernel/up_userspace.c +++ b/configs/open1788/kernel/up_userspace.c @@ -43,7 +43,7 @@ #include #include -#include +#include #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) @@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .signal_handler = up_signal_handler, #endif - /* Memory manager entry points (declared in include/nuttx/mm.h) */ + /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */ .mm_initialize = umm_initialize, .mm_addregion = umm_addregion, diff --git a/configs/sam3u-ek/kernel/up_userspace.c b/configs/sam3u-ek/kernel/up_userspace.c index 51ed83b6fe1..7a71c8ad16c 100644 --- a/configs/sam3u-ek/kernel/up_userspace.c +++ b/configs/sam3u-ek/kernel/up_userspace.c @@ -43,7 +43,7 @@ #include #include -#include +#include #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) @@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .signal_handler = up_signal_handler, #endif - /* Memory manager entry points (declared in include/nuttx/mm.h) */ + /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */ .mm_initialize = umm_initialize, .mm_addregion = umm_addregion, diff --git a/configs/stm3240g-eval/kernel/up_userspace.c b/configs/stm3240g-eval/kernel/up_userspace.c index c5aecd02e50..7947c99de44 100644 --- a/configs/stm3240g-eval/kernel/up_userspace.c +++ b/configs/stm3240g-eval/kernel/up_userspace.c @@ -43,7 +43,7 @@ #include #include -#include +#include #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) @@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .signal_handler = up_signal_handler, #endif - /* Memory manager entry points (declared in include/nuttx/mm.h) */ + /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */ .mm_initialize = umm_initialize, .mm_addregion = umm_addregion, diff --git a/configs/stm32f4discovery/kernel/up_userspace.c b/configs/stm32f4discovery/kernel/up_userspace.c index 19fda356d3d..36065bdaede 100644 --- a/configs/stm32f4discovery/kernel/up_userspace.c +++ b/configs/stm32f4discovery/kernel/up_userspace.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include @@ -115,7 +115,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = .signal_handler = up_signal_handler, #endif - /* Memory manager entry points (declared in include/nuttx/mm.h) */ + /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */ .mm_initialize = umm_initialize, .mm_addregion = umm_addregion, diff --git a/include/nuttx/addrenv.h b/include/nuttx/addrenv.h index 4aaa2d550ec..0cb854376f2 100644 --- a/include/nuttx/addrenv.h +++ b/include/nuttx/addrenv.h @@ -44,7 +44,7 @@ #ifdef CONFIG_BUILD_KERNEL # include -# include +# include #endif #ifdef CONFIG_ARCH_ADDRENV diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h index 44ebf9746ee..43d9f344c1a 100644 --- a/include/nuttx/kmalloc.h +++ b/include/nuttx/kmalloc.h @@ -46,7 +46,7 @@ #include #include -#include +#include #include #if !defined(CONFIG_BUILD_PROTECTED) || defined(__KERNEL__) @@ -151,7 +151,7 @@ extern "C" # define kmm_free(p) umm_free(p) #else -/* Otherwise, the kernel-space allocators are declared in include/nuttx/mm.h +/* Otherwise, the kernel-space allocators are declared in include/nuttx/mm/mm.h * and we can call them directly. */ diff --git a/include/nuttx/mm.h b/include/nuttx/mm/mm.h similarity index 99% rename from include/nuttx/mm.h rename to include/nuttx/mm/mm.h index b748c16b4d9..05968f62583 100644 --- a/include/nuttx/mm.h +++ b/include/nuttx/mm/mm.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/mm.h + * include/nuttx/mm/mm.h * * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_MM_H -#define __INCLUDE_NUTTX_MM_H +#ifndef __INCLUDE_NUTTX_MM_MM_H +#define __INCLUDE_NUTTX_MM_MM_H /**************************************************************************** * Included Files @@ -488,4 +488,4 @@ int mm_size2ndx(size_t size); } #endif -#endif /* __INCLUDE_NUTTX_MM_H */ +#endif /* __INCLUDE_NUTTX_MM_MM_H */ diff --git a/mm/README.txt b/mm/README.txt index e604cee7ed8..0e9a4e7d228 100644 --- a/mm/README.txt +++ b/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 + include 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/mm/kmm_heap/kmm_addregion.c b/mm/kmm_heap/kmm_addregion.c index da1068ceed8..cccb202699e 100644 --- a/mm/kmm_heap/kmm_addregion.c +++ b/mm/kmm_heap/kmm_addregion.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_brkaddr.c b/mm/kmm_heap/kmm_brkaddr.c index 34c8855dfe2..a04032e8320 100644 --- a/mm/kmm_heap/kmm_brkaddr.c +++ b/mm/kmm_heap/kmm_brkaddr.c @@ -41,7 +41,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_calloc.c b/mm/kmm_heap/kmm_calloc.c index 070ed568cdc..2da8e815c88 100644 --- a/mm/kmm_heap/kmm_calloc.c +++ b/mm/kmm_heap/kmm_calloc.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_extend.c b/mm/kmm_heap/kmm_extend.c index e0a6c701fe5..0a05ccd8d60 100644 --- a/mm/kmm_heap/kmm_extend.c +++ b/mm/kmm_heap/kmm_extend.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_free.c b/mm/kmm_heap/kmm_free.c index 15b9f8ac41e..1b300158b39 100644 --- a/mm/kmm_heap/kmm_free.c +++ b/mm/kmm_heap/kmm_free.c @@ -42,7 +42,7 @@ #include #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_heapmember.c b/mm/kmm_heap/kmm_heapmember.c index 2a1ca7c00bc..d872288721f 100644 --- a/mm/kmm_heap/kmm_heapmember.c +++ b/mm/kmm_heap/kmm_heapmember.c @@ -41,7 +41,7 @@ #include -#include +#include #if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG) diff --git a/mm/kmm_heap/kmm_initialize.c b/mm/kmm_heap/kmm_initialize.c index deeb0e25fc6..ed4cbc926a8 100644 --- a/mm/kmm_heap/kmm_initialize.c +++ b/mm/kmm_heap/kmm_initialize.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_mallinfo.c b/mm/kmm_heap/kmm_mallinfo.c index 8a0ddf0e86f..2ad3d26df6c 100644 --- a/mm/kmm_heap/kmm_mallinfo.c +++ b/mm/kmm_heap/kmm_mallinfo.c @@ -41,7 +41,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_malloc.c b/mm/kmm_heap/kmm_malloc.c index 22b5d4894b1..a92e5e54496 100644 --- a/mm/kmm_heap/kmm_malloc.c +++ b/mm/kmm_heap/kmm_malloc.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_memalign.c b/mm/kmm_heap/kmm_memalign.c index b74c4086626..40327e1d828 100644 --- a/mm/kmm_heap/kmm_memalign.c +++ b/mm/kmm_heap/kmm_memalign.c @@ -41,7 +41,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_realloc.c b/mm/kmm_heap/kmm_realloc.c index f41e69182de..3f553c07169 100644 --- a/mm/kmm_heap/kmm_realloc.c +++ b/mm/kmm_heap/kmm_realloc.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_sbrk.c b/mm/kmm_heap/kmm_sbrk.c index 59dd810e9f4..3cee21b4261 100755 --- a/mm/kmm_heap/kmm_sbrk.c +++ b/mm/kmm_heap/kmm_sbrk.c @@ -39,7 +39,7 @@ #include -#include +#include #if defined(CONFIG_BUILD_KERNEL) && defined(__KERNEL__) diff --git a/mm/kmm_heap/kmm_sem.c b/mm/kmm_heap/kmm_sem.c index 3a274bc0410..47fce18d41a 100644 --- a/mm/kmm_heap/kmm_sem.c +++ b/mm/kmm_heap/kmm_sem.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/kmm_heap/kmm_zalloc.c b/mm/kmm_heap/kmm_zalloc.c index af70afe9ce0..c09f3290457 100644 --- a/mm/kmm_heap/kmm_zalloc.c +++ b/mm/kmm_heap/kmm_zalloc.c @@ -39,7 +39,7 @@ #include -#include +#include #ifdef CONFIG_MM_KERNEL_HEAP diff --git a/mm/mm_heap/mm_addfreechunk.c b/mm/mm_heap/mm_addfreechunk.c index 86ecfa1297b..64b503dd749 100644 --- a/mm/mm_heap/mm_addfreechunk.c +++ b/mm/mm_heap/mm_addfreechunk.c @@ -39,7 +39,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_brkaddr.c b/mm/mm_heap/mm_brkaddr.c index 74f9facc7af..1d7b22680c9 100644 --- a/mm/mm_heap/mm_brkaddr.c +++ b/mm/mm_heap/mm_brkaddr.c @@ -41,7 +41,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_calloc.c b/mm/mm_heap/mm_calloc.c index 4d23512acbd..fe94ff0338e 100644 --- a/mm/mm_heap/mm_calloc.c +++ b/mm/mm_heap/mm_calloc.c @@ -39,7 +39,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_extend.c b/mm/mm_heap/mm_extend.c index d8a7f72f448..46c1fe0feb0 100644 --- a/mm/mm_heap/mm_extend.c +++ b/mm/mm_heap/mm_extend.c @@ -41,7 +41,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_free.c b/mm/mm_heap/mm_free.c index e3613484e4a..ae0f50d3c74 100644 --- a/mm/mm_heap/mm_free.c +++ b/mm/mm_heap/mm_free.c @@ -42,7 +42,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index cfddc8d2a64..f2d02d64bd7 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_mallinfo.c b/mm/mm_heap/mm_mallinfo.c index 5426b1eee3a..9b97760dd8b 100644 --- a/mm/mm_heap/mm_mallinfo.c +++ b/mm/mm_heap/mm_mallinfo.c @@ -43,7 +43,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c index 6aa76a3d49b..20b1916c8bc 100644 --- a/mm/mm_heap/mm_malloc.c +++ b/mm/mm_heap/mm_malloc.c @@ -42,7 +42,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_memalign.c b/mm/mm_heap/mm_memalign.c index 0aeaf2c787c..aa7971c0cb8 100644 --- a/mm/mm_heap/mm_memalign.c +++ b/mm/mm_heap/mm_memalign.c @@ -41,7 +41,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_realloc.c b/mm/mm_heap/mm_realloc.c index 21a0f7d5d7c..f41d019b5ef 100644 --- a/mm/mm_heap/mm_realloc.c +++ b/mm/mm_heap/mm_realloc.c @@ -44,7 +44,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_sbrk.c b/mm/mm_heap/mm_sbrk.c index 6a467706068..a0f868012eb 100644 --- a/mm/mm_heap/mm_sbrk.c +++ b/mm/mm_heap/mm_sbrk.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #ifdef CONFIG_BUILD_KERNEL diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c index baec83732e2..4be65b623c2 100644 --- a/mm/mm_heap/mm_sem.c +++ b/mm/mm_heap/mm_sem.c @@ -43,7 +43,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_shrinkchunk.c b/mm/mm_heap/mm_shrinkchunk.c index 58cffb9fd32..05fc3a7a0db 100644 --- a/mm/mm_heap/mm_shrinkchunk.c +++ b/mm/mm_heap/mm_shrinkchunk.c @@ -41,7 +41,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_size2ndx.c b/mm/mm_heap/mm_size2ndx.c index 2989e6c0751..e3273767e95 100644 --- a/mm/mm_heap/mm_size2ndx.c +++ b/mm/mm_heap/mm_size2ndx.c @@ -39,7 +39,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_heap/mm_zalloc.c b/mm/mm_heap/mm_zalloc.c index 2706c44affc..deb3408d673 100644 --- a/mm/mm_heap/mm_zalloc.c +++ b/mm/mm_heap/mm_zalloc.c @@ -41,7 +41,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/umm_heap/umm_addregion.c b/mm/umm_heap/umm_addregion.c index 5f266fffefd..3e756a999ae 100644 --- a/mm/umm_heap/umm_addregion.c +++ b/mm/umm_heap/umm_addregion.c @@ -39,7 +39,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_brkaddr.c b/mm/umm_heap/umm_brkaddr.c index 900d75ea28a..217f00641bf 100644 --- a/mm/umm_heap/umm_brkaddr.c +++ b/mm/umm_heap/umm_brkaddr.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_calloc.c b/mm/umm_heap/umm_calloc.c index 25932bacd1d..9e75c0b827d 100644 --- a/mm/umm_heap/umm_calloc.c +++ b/mm/umm_heap/umm_calloc.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_extend.c b/mm/umm_heap/umm_extend.c index 62ee64f8ba4..c95c57d6bf6 100644 --- a/mm/umm_heap/umm_extend.c +++ b/mm/umm_heap/umm_extend.c @@ -39,7 +39,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_free.c b/mm/umm_heap/umm_free.c index 42c95d8e736..0230273d676 100644 --- a/mm/umm_heap/umm_free.c +++ b/mm/umm_heap/umm_free.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_initialize.c b/mm/umm_heap/umm_initialize.c index 07c82ce23c2..8efb0cc87a8 100644 --- a/mm/umm_heap/umm_initialize.c +++ b/mm/umm_heap/umm_initialize.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_mallinfo.c b/mm/umm_heap/umm_mallinfo.c index fd48c3696c5..14f83cd9283 100644 --- a/mm/umm_heap/umm_mallinfo.c +++ b/mm/umm_heap/umm_mallinfo.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_malloc.c b/mm/umm_heap/umm_malloc.c index 87cd55de20f..e2cea6e3ad3 100644 --- a/mm/umm_heap/umm_malloc.c +++ b/mm/umm_heap/umm_malloc.c @@ -42,7 +42,7 @@ #include #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_memalign.c b/mm/umm_heap/umm_memalign.c index 6fa91c0bc9f..fefd5ce2187 100644 --- a/mm/umm_heap/umm_memalign.c +++ b/mm/umm_heap/umm_memalign.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_realloc.c b/mm/umm_heap/umm_realloc.c index a67ecf6fe27..925c28d3d01 100644 --- a/mm/umm_heap/umm_realloc.c +++ b/mm/umm_heap/umm_realloc.c @@ -41,7 +41,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_sbrk.c b/mm/umm_heap/umm_sbrk.c index 787166d81d6..dcb9be932c4 100644 --- a/mm/umm_heap/umm_sbrk.c +++ b/mm/umm_heap/umm_sbrk.c @@ -41,7 +41,7 @@ #include -#include +#include #include #include diff --git a/mm/umm_heap/umm_sem.c b/mm/umm_heap/umm_sem.c index 9051737e6d1..387266ae538 100644 --- a/mm/umm_heap/umm_sem.c +++ b/mm/umm_heap/umm_sem.c @@ -39,7 +39,7 @@ #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/mm/umm_heap/umm_zalloc.c b/mm/umm_heap/umm_zalloc.c index de6790f8825..37b602dd94c 100644 --- a/mm/umm_heap/umm_zalloc.c +++ b/mm/umm_heap/umm_zalloc.c @@ -42,7 +42,7 @@ #include #include -#include +#include #if !defined(CONFIG_BUILD_PROTECTED) || !defined(__KERNEL__) diff --git a/sched/init/os_start.c b/sched/init/os_start.c index e2c01c1cede..ca0fdb21f5e 100644 --- a/sched/init/os_start.c +++ b/sched/init/os_start.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include