sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix several compile errors for logic added for CONFIG_BUILD_KERNEL, but which cause problems for other configurations

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-03 09:21:59 -06:00
parent ee96ed963c
commit 67d516d9d1
14 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nuttx/mm.h
View File

@ -262,8 +262,8 @@ extern "C"
#define EXTERN extern
#endif
#if (!defined(CONFIG_ARCH_ADDRENV) || !defined(CONFIG_BUILD_KERNEL)) && \
(defined(CONFIG_BUILD_KERNEL) && !defined(__KERNEL__))
#if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \
(defined(CONFIG_BUILD_DEFINED) && !defined(__KERNEL__))
/* User heap structure:
*
* - Flat build: In the FLAT build, the user heap structure is a globally
@ -272,7 +272,7 @@ extern "C"
* in user space.
* - Kernel build: There are multiple heaps, one per process. The heap
* structure is associated with the address environment and there is
* no global user heap structure.
* no global user heap structure.
*/
EXTERN struct mm_heap_s g_mmheap;

6
mm/umm_addregion.c
View File

@ -41,7 +41,7 @@
#include <nuttx/mm.h>
#ifdef MM_KERNEL_USRHEAP_INTF
#ifdef MM_KERNEL_USRHEAP_INIT
/************************************************************************
* Pre-processor definition
@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/************************************************************************
@ -102,4 +102,4 @@ void umm_addregion(FAR void *heap_start, size_t heap_size)
mm_addregion(USR_HEAP, heap_start, heap_size);
}
#endif /* MM_KERNEL_USRHEAP_INTF */
#endif /* MM_KERNEL_USRHEAP_INIT */

2
mm/umm_brkaddr.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_calloc.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_extend.c
View File

@ -59,7 +59,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_free.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

11
mm/umm_initialize.c
View File

@ -39,9 +39,11 @@
#include <nuttx/config.h>
#include <assert.h>
#include <nuttx/mm.h>
#ifdef MM_KERNEL_USRHEAP_INTF
#ifdef MM_KERNEL_USRHEAP_INIT
/************************************************************************
* Pre-processor definition
@ -70,7 +72,7 @@
/* Otherwise, the user heap data structures are in common .bss */
struct mm_heap_s g_mmheap;
#define USR_HEAP &g_mmheap;
#define USR_HEAP &g_mmheap
#endif
/************************************************************************
@ -100,8 +102,11 @@ struct mm_heap_s g_mmheap;
void umm_initialize(FAR void *heap_start, size_t heap_size)
{
#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
DEBUGASSERT(ARCH_DATA_RESERVE_SIZE >= sizeof(struct addrenv_reserve_s));
#endif
mm_initialize(USR_HEAP, heap_start, heap_size);
}
#endif /* MM_KERNEL_USRHEAP_INTF */
#endif /* MM_KERNEL_USRHEAP_INIT */

2
mm/umm_mallinfo.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_malloc.c
View File

@ -62,7 +62,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_memalign.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_realloc.c
View File

@ -61,7 +61,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_sbrk.c
View File

@ -65,7 +65,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************

2
mm/umm_sem.c
View File

@ -59,7 +59,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/************************************************************************

2
mm/umm_zalloc.c
View File

@ -62,7 +62,7 @@
#else
/* Otherwise, the user heap data structures are in common .bss */
# define USR_HEAP &g_mmheap;
# define USR_HEAP &g_mmheap
#endif
/****************************************************************************