diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-18 00:35:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-18 00:35:53 +0000 |
| commit | 97cd33bd846d3955b5179222310a04848a82f917 (patch) | |
| tree | 2ce31c89685b7b7035e4a88971b760f7f6361f4a /nuttx | |
| parent | ce609debf3dc1c607c9a778ae4cddb61036f5fe4 (diff) | |
| download | px4-nuttx-97cd33bd846d3955b5179222310a04848a82f917.tar.gz px4-nuttx-97cd33bd846d3955b5179222310a04848a82f917.tar.bz2 px4-nuttx-97cd33bd846d3955b5179222310a04848a82f917.zip | |
Fix various compile issues
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2864 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/arch/arm/src/arm/up_allocpage.c | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/arm/up_dataabort.c | 7 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/arm/up_prefetchabort.c | 2 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/lpc313x/Make.defs | 2 | ||||
| -rwxr-xr-x | nuttx/configs/ea3131/src/up_fillpage.c | 5 |
5 files changed, 13 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/arm/up_allocpage.c b/nuttx/arch/arm/src/arm/up_allocpage.c index 499edc9da..383de23b7 100755 --- a/nuttx/arch/arm/src/arm/up_allocpage.c +++ b/nuttx/arch/arm/src/arm/up_allocpage.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> +#include <errno.h> #include <debug.h> #include <nuttx/sched.h> @@ -105,7 +106,7 @@ * ****************************************************************************/ -int up_allocpage(FAR _TCB *tcb, FAR void **vpage); +int up_allocpage(FAR _TCB *tcb, FAR void **vpage) { # warning "Not implemented" return -ENOSYS; diff --git a/nuttx/arch/arm/src/arm/up_dataabort.c b/nuttx/arch/arm/src/arm/up_dataabort.c index b58e80a6c..52a595d6d 100644 --- a/nuttx/arch/arm/src/arm/up_dataabort.c +++ b/nuttx/arch/arm/src/arm/up_dataabort.c @@ -47,6 +47,11 @@ #include "os_internal.h" #include "up_internal.h" +#ifdef CONFIG_PAGING +# include <nuttx/page.h> +# include "arm.h" +#endif + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -139,7 +144,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) * prefetch and data aborts. */ - tcb->far = regs[REG_R15]; + tcb->xcp.far = regs[REG_R15]; /* Call pg_miss() to schedule the page fill. A consequences of this * call are: diff --git a/nuttx/arch/arm/src/arm/up_prefetchabort.c b/nuttx/arch/arm/src/arm/up_prefetchabort.c index 91ada0436..3572165b8 100644 --- a/nuttx/arch/arm/src/arm/up_prefetchabort.c +++ b/nuttx/arch/arm/src/arm/up_prefetchabort.c @@ -127,7 +127,7 @@ void up_prefetchabort(uint32_t *regs) */ FAR _TCB *tcb = (FAR _TCB *)g_readytorun.head; - tcb->far = regs[REG_R15]; + tcb->xcp.far = regs[REG_R15]; /* Call pg_miss() to schedule the page fill. A consequences of this * call are: diff --git a/nuttx/arch/arm/src/lpc313x/Make.defs b/nuttx/arch/arm/src/lpc313x/Make.defs index 66435f5b8..ebe96f38a 100755 --- a/nuttx/arch/arm/src/lpc313x/Make.defs +++ b/nuttx/arch/arm/src/lpc313x/Make.defs @@ -47,7 +47,7 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \ up_undefinedinsn.c up_usestack.c ifeq ($(CONFIG_PAGING),y) -CMN_CSRCS += up_pginitialize.c up_checkpaging.c up_allocpage.c +CMN_CSRCS += up_pginitialize.c up_checkmapping.c up_allocpage.c endif CGU_ASRCS = diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index f72b88ec9..be355fffe 100755 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/configs/ea3131/src/up_fillpage.c @@ -40,10 +40,11 @@ #include <nuttx/config.h> +#include <errno.h> #include <debug.h> -#include <arch/nuttx/sched.h> -#include <arch/nuttx/page.h> +#include <nuttx/sched.h> +#include <nuttx/page.h> #ifdef CONFIG_PAGING |