diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-02 15:58:14 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-02 15:58:14 -0600 |
commit | a608530a1a5d6f6eb694c1e1aea613db53192ebc (patch) | |
tree | 4b19c15bfe8190d1aa9fc96f6e055ff58b4090ae /nuttx/mm | |
parent | 3904a887d4aaced2f4858e2742df5f0eb5ae820a (diff) | |
download | px4-nuttx-a608530a1a5d6f6eb694c1e1aea613db53192ebc.tar.gz px4-nuttx-a608530a1a5d6f6eb694c1e1aea613db53192ebc.tar.bz2 px4-nuttx-a608530a1a5d6f6eb694c1e1aea613db53192ebc.zip |
Add support for delivery of use-mode signals in the kernel build.
Diffstat (limited to 'nuttx/mm')
-rw-r--r-- | nuttx/mm/umm_addregion.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_brkaddr.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_calloc.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_extend.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_free.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_initialize.c | 6 | ||||
-rw-r--r-- | nuttx/mm/umm_mallinfo.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_malloc.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_memalign.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_realloc.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_sbrk.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_sem.c | 4 | ||||
-rw-r--r-- | nuttx/mm/umm_zalloc.c | 4 |
13 files changed, 27 insertions, 27 deletions
diff --git a/nuttx/mm/umm_addregion.c b/nuttx/mm/umm_addregion.c index a0eb3002c..7710f2aa0 100644 --- a/nuttx/mm/umm_addregion.c +++ b/nuttx/mm/umm_addregion.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_brkaddr.c b/nuttx/mm/umm_brkaddr.c index 8bf047c56..ae1fc1c2f 100644 --- a/nuttx/mm/umm_brkaddr.c +++ b/nuttx/mm/umm_brkaddr.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_calloc.c b/nuttx/mm/umm_calloc.c index 2acf1c9d1..665720947 100644 --- a/nuttx/mm/umm_calloc.c +++ b/nuttx/mm/umm_calloc.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_extend.c b/nuttx/mm/umm_extend.c index 6982ed813..9e9f2c63e 100644 --- a/nuttx/mm/umm_extend.c +++ b/nuttx/mm/umm_extend.c @@ -50,11 +50,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_free.c b/nuttx/mm/umm_free.c index e0f9f4faf..6d1cd6bc6 100644 --- a/nuttx/mm/umm_free.c +++ b/nuttx/mm/umm_free.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_initialize.c b/nuttx/mm/umm_initialize.c index 9deaf61fa..3fdda2dde 100644 --- a/nuttx/mm/umm_initialize.c +++ b/nuttx/mm/umm_initialize.c @@ -60,11 +60,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ @@ -100,7 +100,7 @@ struct mm_heap_s g_mmheap; void umm_initialize(FAR void *heap_start, size_t heap_size) { - DEBUGASSERT(ARCH_DATA_RESERVE >= sizeof(struct mm_heap_s)); + DEBUGASSERT(ARCH_DATA_RESERVE_SIZE >= sizeof(struct addrenv_reserve_s)); mm_initialize(USR_HEAP, heap_start, heap_size); } diff --git a/nuttx/mm/umm_mallinfo.c b/nuttx/mm/umm_mallinfo.c index 3a85b3229..2ccee5973 100644 --- a/nuttx/mm/umm_mallinfo.c +++ b/nuttx/mm/umm_mallinfo.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_malloc.c b/nuttx/mm/umm_malloc.c index 8a0bdfec7..6d99e75ab 100644 --- a/nuttx/mm/umm_malloc.c +++ b/nuttx/mm/umm_malloc.c @@ -53,11 +53,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_memalign.c b/nuttx/mm/umm_memalign.c index cd098d12c..4a13bfe91 100644 --- a/nuttx/mm/umm_memalign.c +++ b/nuttx/mm/umm_memalign.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_realloc.c b/nuttx/mm/umm_realloc.c index 9fdad8fee..0652b172a 100644 --- a/nuttx/mm/umm_realloc.c +++ b/nuttx/mm/umm_realloc.c @@ -52,11 +52,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_sbrk.c b/nuttx/mm/umm_sbrk.c index 9c26a3de4..3266b09b9 100644 --- a/nuttx/mm/umm_sbrk.c +++ b/nuttx/mm/umm_sbrk.c @@ -56,11 +56,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_sem.c b/nuttx/mm/umm_sem.c index 6242f1719..98997f461 100644 --- a/nuttx/mm/umm_sem.c +++ b/nuttx/mm/umm_sem.c @@ -50,11 +50,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ diff --git a/nuttx/mm/umm_zalloc.c b/nuttx/mm/umm_zalloc.c index 0c2ddddeb..ebe232e22 100644 --- a/nuttx/mm/umm_zalloc.c +++ b/nuttx/mm/umm_zalloc.c @@ -53,11 +53,11 @@ * group. In this build configuration, the user heap structure lies * in a reserved region at the beginning of the .bss/.data address * space (CONFIG_ARCH_DATA_VBASE). The size of that region is given by - * ARCH_DATA_RESERVE + * ARCH_DATA_RESERVE_SIZE */ # include <nuttx/addrenv.h> -# define USR_HEAP ((FAR struct mm_heap_s *)CONFIG_ARCH_DATA_VBASE) +# define USR_HEAP (&ARCH_DATA_RESERVE->ar_usrheap) #else /* Otherwise, the user heap data structures are in common .bss */ |