summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/arch/z80/src/z180/z180_mmu.c2
-rw-r--r--nuttx/binfmt/binfmt_execmodule.c2
-rw-r--r--nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c2
-rw-r--r--nuttx/include/nuttx/fs/fat.h2
-rw-r--r--nuttx/include/nuttx/mm/gran.h (renamed from nuttx/include/nuttx/gran.h)8
-rw-r--r--nuttx/include/nuttx/shm.h2
-rw-r--r--nuttx/include/nuttx/usb/usbdev.h2
-rw-r--r--nuttx/mm/README.txt2
-rw-r--r--nuttx/mm/mm_gran/mm_gran.h2
-rw-r--r--nuttx/mm/mm_gran/mm_granalloc.c2
-rw-r--r--nuttx/mm/mm_gran/mm_grancritical.c2
-rw-r--r--nuttx/mm/mm_gran/mm_granfree.c2
-rw-r--r--nuttx/mm/mm_gran/mm_graninit.c2
-rw-r--r--nuttx/mm/mm_gran/mm_granmark.c2
-rw-r--r--nuttx/mm/mm_gran/mm_granrelease.c2
-rw-r--r--nuttx/mm/mm_gran/mm_granreserve.c2
-rw-r--r--nuttx/mm/mm_gran/mm_pgalloc.c2
-rw-r--r--nuttx/mm/shm/shm_initialize.c2
18 files changed, 21 insertions, 21 deletions
diff --git a/nuttx/arch/z80/src/z180/z180_mmu.c b/nuttx/arch/z80/src/z180/z180_mmu.c
index 0f888e961..730f8472b 100644
--- a/nuttx/arch/z80/src/z180/z180_mmu.c
+++ b/nuttx/arch/z80/src/z180/z180_mmu.c
@@ -44,7 +44,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <arch/irq.h>
#include <arch/io.h>
diff --git a/nuttx/binfmt/binfmt_execmodule.c b/nuttx/binfmt/binfmt_execmodule.c
index e4ef0b785..849ee08cc 100644
--- a/nuttx/binfmt/binfmt_execmodule.c
+++ b/nuttx/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/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c b/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
index 4d13cda10..dfa061e9d 100644
--- a/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
+++ b/nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c
@@ -56,7 +56,7 @@
#include <nuttx/sdio.h>
#include <nuttx/mmcsd.h>
#include <nuttx/analog/adc.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <stm32.h>
#include "board_config.h"
diff --git a/nuttx/include/nuttx/fs/fat.h b/nuttx/include/nuttx/fs/fat.h
index 98c3d510a..739a8c59e 100644
--- a/nuttx/include/nuttx/fs/fat.h
+++ b/nuttx/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/nuttx/include/nuttx/gran.h b/nuttx/include/nuttx/mm/gran.h
index 2012fb06a..d6f1d8133 100644
--- a/nuttx/include/nuttx/gran.h
+++ b/nuttx/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/nuttx/include/nuttx/shm.h b/nuttx/include/nuttx/shm.h
index 2bd0a7e27..9259f01a6 100644
--- a/nuttx/include/nuttx/shm.h
+++ b/nuttx/include/nuttx/shm.h
@@ -44,7 +44,7 @@
#include <debug.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#ifdef CONFIG_MM_SHM
diff --git a/nuttx/include/nuttx/usb/usbdev.h b/nuttx/include/nuttx/usb/usbdev.h
index 2e35244e8..6ee3d1f36 100644
--- a/nuttx/include/nuttx/usb/usbdev.h
+++ b/nuttx/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/nuttx/mm/README.txt b/nuttx/mm/README.txt
index 3d0ec9eec..e604cee7e 100644
--- a/nuttx/mm/README.txt
+++ b/nuttx/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/nuttx/mm/mm_gran/mm_gran.h b/nuttx/mm/mm_gran/mm_gran.h
index cb9316ae4..20229216b 100644
--- a/nuttx/mm/mm_gran/mm_gran.h
+++ b/nuttx/mm/mm_gran/mm_gran.h
@@ -46,7 +46,7 @@
#include <semaphore.h>
#include <arch/types.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/mm/mm_gran/mm_granalloc.c b/nuttx/mm/mm_gran/mm_granalloc.c
index cc4a9cb6d..2910f8286 100644
--- a/nuttx/mm/mm_gran/mm_granalloc.c
+++ b/nuttx/mm/mm_gran/mm_granalloc.c
@@ -41,7 +41,7 @@
#include <assert.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_grancritical.c b/nuttx/mm/mm_gran/mm_grancritical.c
index 04d2de35c..ae16a3984 100644
--- a/nuttx/mm/mm_gran/mm_grancritical.c
+++ b/nuttx/mm/mm_gran/mm_grancritical.c
@@ -44,7 +44,7 @@
#include <errno.h>
#include <arch/irq.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_granfree.c b/nuttx/mm/mm_gran/mm_granfree.c
index 707dbaa2d..d2df5cd4d 100644
--- a/nuttx/mm/mm_gran/mm_granfree.c
+++ b/nuttx/mm/mm_gran/mm_granfree.c
@@ -41,7 +41,7 @@
#include <assert.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_graninit.c b/nuttx/mm/mm_gran/mm_graninit.c
index 79d288370..0d4bf18b7 100644
--- a/nuttx/mm/mm_gran/mm_graninit.c
+++ b/nuttx/mm/mm_gran/mm_graninit.c
@@ -42,7 +42,7 @@
#include <assert.h>
#include <errno.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <nuttx/kmalloc.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_granmark.c b/nuttx/mm/mm_gran/mm_granmark.c
index 805dbc1da..91bfdb097 100644
--- a/nuttx/mm/mm_gran/mm_granmark.c
+++ b/nuttx/mm/mm_gran/mm_granmark.c
@@ -41,7 +41,7 @@
#include <assert.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_granrelease.c b/nuttx/mm/mm_gran/mm_granrelease.c
index 1c228fa53..a7b8c25a0 100644
--- a/nuttx/mm/mm_gran/mm_granrelease.c
+++ b/nuttx/mm/mm_gran/mm_granrelease.c
@@ -42,7 +42,7 @@
#include <assert.h>
#include <errno.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <nuttx/kmalloc.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_granreserve.c b/nuttx/mm/mm_gran/mm_granreserve.c
index bf73671c3..6becbd0f0 100644
--- a/nuttx/mm/mm_gran/mm_granreserve.c
+++ b/nuttx/mm/mm_gran/mm_granreserve.c
@@ -41,7 +41,7 @@
#include <assert.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/mm_gran/mm_pgalloc.c b/nuttx/mm/mm_gran/mm_pgalloc.c
index 67e8653f4..6f7b33acd 100644
--- a/nuttx/mm/mm_gran/mm_pgalloc.c
+++ b/nuttx/mm/mm_gran/mm_pgalloc.c
@@ -41,7 +41,7 @@
#include <assert.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <nuttx/pgalloc.h>
#include "mm_gran/mm_gran.h"
diff --git a/nuttx/mm/shm/shm_initialize.c b/nuttx/mm/shm/shm_initialize.c
index de942793c..af3170c47 100644
--- a/nuttx/mm/shm/shm_initialize.c
+++ b/nuttx/mm/shm/shm_initialize.c
@@ -44,7 +44,7 @@
#include <nuttx/addrenv.h>
#include <nuttx/sched.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
#include <nuttx/pgalloc.h>
#include <nuttx/shm.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 05:24:47 +0000