Move include/nuttx/gran.h to include/nuttx/mm/gran.h

This commit is contained in:
Gregory Nutt
2014-09-24 06:55:26 -06:00
parent 322416e472
commit 2fa7431ee7
18 changed files with 21 additions and 21 deletions
+1 -1
View File
@@ -44,7 +44,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <arch/irq.h> #include <arch/irq.h>
#include <arch/io.h> #include <arch/io.h>
+1 -1
View File
@@ -233,7 +233,7 @@ int exec_module(FAR const struct binary_s *binp)
#if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_SHM) #if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_SHM)
/* Initialize the shared memory virtual page allocator */ /* Initialize the shared memory virtual page allocator */
ret = shm_group_initialize(&tcb->cmn.group); ret = shm_group_initialize(tcb->cmn.group);
if (ret < 0) if (ret < 0)
{ {
bdbg("ERROR: shm_group_initialize() failed: %d\n", ret); bdbg("ERROR: shm_group_initialize() failed: %d\n", ret);
@@ -56,7 +56,7 @@
#include <nuttx/sdio.h> #include <nuttx/sdio.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
#include <nuttx/analog/adc.h> #include <nuttx/analog/adc.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <stm32.h> #include <stm32.h>
#include "board_config.h" #include "board_config.h"
+1 -1
View File
@@ -105,7 +105,7 @@ EXTERN int fat_setattrib(const char *path, fat_attrib_t setbits, fat_attrib_t cl
* capable memory. * capable memory.
* *
* This functions may be simple wrappers around gran_alloc() and gran_free() * This functions may be simple wrappers around gran_alloc() and gran_free()
* (See nuttx/gran.h). * (See nuttx/mm/gran.h).
* *
****************************************************************************/ ****************************************************************************/
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* include/nuttx/gran.h * include/nuttx/mm/gran.h
* General purpose granule memory allocator. * General purpose granule memory allocator.
* *
* Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __INCLUDE_NUTTX_GRAN_H #ifndef __INCLUDE_NUTTX_MM_GRAN_H
#define __INCLUDE_NUTTX_GRAN_H #define __INCLUDE_NUTTX_MM_GRAN_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@@ -250,4 +250,4 @@ void gran_free(GRAN_HANDLE handle, FAR void *memory, size_t size);
#endif #endif
#endif /* CONFIG_GRAN */ #endif /* CONFIG_GRAN */
#endif /* __INCLUDE_NUTTX_GRAN_H */ #endif /* __INCLUDE_NUTTX_MM_GRAN_H */
+1 -1
View File
@@ -44,7 +44,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#ifdef CONFIG_MM_SHM #ifdef CONFIG_MM_SHM
+1 -1
View File
@@ -378,7 +378,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver);
* called to free the DMA-capable memory. * called to free the DMA-capable memory.
* *
* This functions may be simple wrappers around gran_alloc() and * 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 * does require the size of the allocation to be freed; that would need
* to be managed in the board-specific logic. * to be managed in the board-specific logic.
* *
+1 -1
View File
@@ -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"). granule allocator allocates memory in units of a fixed sized block ("granule").
Allocations may be aligned to a user-provided address boundary. 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: The granule allocator consists of these files in this directory:
mm_gran.h, mm_granalloc.c, mm_grancritical.c, mm_granfree.c mm_gran.h, mm_granalloc.c, mm_grancritical.c, mm_granfree.c
+1 -1
View File
@@ -46,7 +46,7 @@
#include <semaphore.h> #include <semaphore.h>
#include <arch/types.h> #include <arch/types.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
+1 -1
View File
@@ -41,7 +41,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -44,7 +44,7 @@
#include <errno.h> #include <errno.h>
#include <arch/irq.h> #include <arch/irq.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -41,7 +41,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -42,7 +42,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -41,7 +41,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -42,7 +42,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -41,7 +41,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -41,7 +41,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <nuttx/pgalloc.h> #include <nuttx/pgalloc.h>
#include "mm_gran/mm_gran.h" #include "mm_gran/mm_gran.h"
+1 -1
View File
@@ -44,7 +44,7 @@
#include <nuttx/addrenv.h> #include <nuttx/addrenv.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
#include <nuttx/gran.h> #include <nuttx/mm/gran.h>
#include <nuttx/pgalloc.h> #include <nuttx/pgalloc.h>
#include <nuttx/shm.h> #include <nuttx/shm.h>