From 2fa7431ee790570820e9efeda507de0617ae6799 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 24 Sep 2014 06:55:26 -0600 Subject: [PATCH] Move include/nuttx/gran.h to include/nuttx/mm/gran.h --- arch/z80/src/z180/z180_mmu.c | 2 +- binfmt/binfmt_execmodule.c | 2 +- configs/px4fmu-v2_upstream/src/px4fmu2_init.c | 2 +- include/nuttx/fs/fat.h | 2 +- include/nuttx/{ => mm}/gran.h | 8 ++++---- include/nuttx/shm.h | 2 +- include/nuttx/usb/usbdev.h | 2 +- mm/README.txt | 2 +- mm/mm_gran/mm_gran.h | 2 +- mm/mm_gran/mm_granalloc.c | 2 +- mm/mm_gran/mm_grancritical.c | 2 +- mm/mm_gran/mm_granfree.c | 2 +- mm/mm_gran/mm_graninit.c | 2 +- mm/mm_gran/mm_granmark.c | 2 +- mm/mm_gran/mm_granrelease.c | 2 +- mm/mm_gran/mm_granreserve.c | 2 +- mm/mm_gran/mm_pgalloc.c | 2 +- mm/shm/shm_initialize.c | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) rename include/nuttx/{ => mm}/gran.h (98%) diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c index 0f888e96187..730f8472be2 100644 --- a/arch/z80/src/z180/z180_mmu.c +++ b/arch/z80/src/z180/z180_mmu.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c index e4ef0b78549..849ee08cc3e 100644 --- a/binfmt/binfmt_execmodule.c +++ b/binfmt/binfmt_execmodule.c @@ -233,7 +233,7 @@ int exec_module(FAR const struct binary_s *binp) #if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_SHM) /* Initialize the shared memory virtual page allocator */ - ret = shm_group_initialize(&tcb->cmn.group); + ret = shm_group_initialize(tcb->cmn.group); if (ret < 0) { bdbg("ERROR: shm_group_initialize() failed: %d\n", ret); diff --git a/configs/px4fmu-v2_upstream/src/px4fmu2_init.c b/configs/px4fmu-v2_upstream/src/px4fmu2_init.c index 4d13cda1019..dfa061e9dae 100644 --- a/configs/px4fmu-v2_upstream/src/px4fmu2_init.c +++ b/configs/px4fmu-v2_upstream/src/px4fmu2_init.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include "board_config.h" diff --git a/include/nuttx/fs/fat.h b/include/nuttx/fs/fat.h index 98c3d510a6b..739a8c59e56 100644 --- a/include/nuttx/fs/fat.h +++ b/include/nuttx/fs/fat.h @@ -105,7 +105,7 @@ EXTERN int fat_setattrib(const char *path, fat_attrib_t setbits, fat_attrib_t cl * capable memory. * * This functions may be simple wrappers around gran_alloc() and gran_free() - * (See nuttx/gran.h). + * (See nuttx/mm/gran.h). * ****************************************************************************/ diff --git a/include/nuttx/gran.h b/include/nuttx/mm/gran.h similarity index 98% rename from include/nuttx/gran.h rename to include/nuttx/mm/gran.h index 2012fb06a70..d6f1d81338d 100644 --- a/include/nuttx/gran.h +++ b/include/nuttx/mm/gran.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/gran.h + * include/nuttx/mm/gran.h * General purpose granule memory allocator. * * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_GRAN_H -#define __INCLUDE_NUTTX_GRAN_H +#ifndef __INCLUDE_NUTTX_MM_GRAN_H +#define __INCLUDE_NUTTX_MM_GRAN_H /**************************************************************************** * Included Files @@ -250,4 +250,4 @@ void gran_free(GRAN_HANDLE handle, FAR void *memory, size_t size); #endif #endif /* CONFIG_GRAN */ -#endif /* __INCLUDE_NUTTX_GRAN_H */ +#endif /* __INCLUDE_NUTTX_MM_GRAN_H */ diff --git a/include/nuttx/shm.h b/include/nuttx/shm.h index 2bd0a7e2759..9259f01a6d7 100644 --- a/include/nuttx/shm.h +++ b/include/nuttx/shm.h @@ -44,7 +44,7 @@ #include -#include +#include #ifdef CONFIG_MM_SHM diff --git a/include/nuttx/usb/usbdev.h b/include/nuttx/usb/usbdev.h index 2e35244e8b4..6ee3d1f362b 100644 --- a/include/nuttx/usb/usbdev.h +++ b/include/nuttx/usb/usbdev.h @@ -378,7 +378,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver); * called to free the DMA-capable memory. * * This functions may be simple wrappers around gran_alloc() and - * gran_free() (See nuttx/gran.h). Note that the gran_free() function + * gran_free() (See nuttx/mm/gran.h). Note that the gran_free() function * does require the size of the allocation to be freed; that would need * to be managed in the board-specific logic. * diff --git a/mm/README.txt b/mm/README.txt index 3d0ec9eec8b..e604cee7ed8 100644 --- a/mm/README.txt +++ b/mm/README.txt @@ -80,7 +80,7 @@ This directory contains the NuttX memory management logic. This include: granule allocator allocates memory in units of a fixed sized block ("granule"). Allocations may be aligned to a user-provided address boundary. - The granule allocator interfaces are defined in nuttx/include/nuttx/gran.h. + The granule allocator interfaces are defined in nuttx/include/nuttx/mm/gran.h. The granule allocator consists of these files in this directory: mm_gran.h, mm_granalloc.c, mm_grancritical.c, mm_granfree.c diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h index cb9316ae422..20229216b7c 100644 --- a/mm/mm_gran/mm_gran.h +++ b/mm/mm_gran/mm_gran.h @@ -46,7 +46,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/mm/mm_gran/mm_granalloc.c b/mm/mm_gran/mm_granalloc.c index cc4a9cb6d46..2910f82861e 100644 --- a/mm/mm_gran/mm_granalloc.c +++ b/mm/mm_gran/mm_granalloc.c @@ -41,7 +41,7 @@ #include -#include +#include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_grancritical.c b/mm/mm_gran/mm_grancritical.c index 04d2de35c1a..ae16a39844a 100644 --- a/mm/mm_gran/mm_grancritical.c +++ b/mm/mm_gran/mm_grancritical.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_granfree.c b/mm/mm_gran/mm_granfree.c index 707dbaa2da1..d2df5cd4d40 100644 --- a/mm/mm_gran/mm_granfree.c +++ b/mm/mm_gran/mm_granfree.c @@ -41,7 +41,7 @@ #include -#include +#include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_graninit.c b/mm/mm_gran/mm_graninit.c index 79d28837096..0d4bf18b7f2 100644 --- a/mm/mm_gran/mm_graninit.c +++ b/mm/mm_gran/mm_graninit.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_granmark.c b/mm/mm_gran/mm_granmark.c index 805dbc1dad0..91bfdb09719 100644 --- a/mm/mm_gran/mm_granmark.c +++ b/mm/mm_gran/mm_granmark.c @@ -41,7 +41,7 @@ #include -#include +#include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_granrelease.c b/mm/mm_gran/mm_granrelease.c index 1c228fa53d3..a7b8c25a0a2 100644 --- a/mm/mm_gran/mm_granrelease.c +++ b/mm/mm_gran/mm_granrelease.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_granreserve.c b/mm/mm_gran/mm_granreserve.c index bf73671c3ba..6becbd0f00f 100644 --- a/mm/mm_gran/mm_granreserve.c +++ b/mm/mm_gran/mm_granreserve.c @@ -41,7 +41,7 @@ #include -#include +#include #include "mm_gran/mm_gran.h" diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c index 67e8653f431..6f7b33acdf2 100644 --- a/mm/mm_gran/mm_pgalloc.c +++ b/mm/mm_gran/mm_pgalloc.c @@ -41,7 +41,7 @@ #include -#include +#include #include #include "mm_gran/mm_gran.h" diff --git a/mm/shm/shm_initialize.c b/mm/shm/shm_initialize.c index de942793c9b..af3170c4752 100644 --- a/mm/shm/shm_initialize.c +++ b/mm/shm/shm_initialize.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include