Fix various compile issues

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2864 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2010-08-18 00:35:53 +00:00
parent 8445b00468
commit f3f0bcd20a
5 changed files with 13 additions and 6 deletions
+2 -1
View File
@@ -40,6 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/sched.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" # warning "Not implemented"
return -ENOSYS; return -ENOSYS;
+6 -1
View File
@@ -47,6 +47,11 @@
#include "os_internal.h" #include "os_internal.h"
#include "up_internal.h" #include "up_internal.h"
#ifdef CONFIG_PAGING
# include <nuttx/page.h>
# include "arm.h"
#endif
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
@@ -139,7 +144,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
* prefetch and data aborts. * 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 pg_miss() to schedule the page fill. A consequences of this
* call are: * call are:
+1 -1
View File
@@ -127,7 +127,7 @@ void up_prefetchabort(uint32_t *regs)
*/ */
FAR _TCB *tcb = (FAR _TCB *)g_readytorun.head; 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 pg_miss() to schedule the page fill. A consequences of this
* call are: * call are:
+1 -1
View File
@@ -47,7 +47,7 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \
up_undefinedinsn.c up_usestack.c up_undefinedinsn.c up_usestack.c
ifeq ($(CONFIG_PAGING),y) 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 endif
CGU_ASRCS = CGU_ASRCS =
+3 -2
View File
@@ -40,10 +40,11 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <errno.h>
#include <debug.h> #include <debug.h>
#include <arch/nuttx/sched.h> #include <nuttx/sched.h>
#include <arch/nuttx/page.h> #include <nuttx/page.h>
#ifdef CONFIG_PAGING #ifdef CONFIG_PAGING