diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-25 22:28:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-25 22:28:46 +0000 |
| commit | 28898b80bc259a37f940e1727ad4bd8495a03982 (patch) | |
| tree | e7f4ff0efc04d2daa0541100beead13fe6643373 /nuttx/arch/z16/src/common | |
| parent | 347fa8f13710529e0306c2d894e3ea4f05534918 (diff) | |
| download | px4-nuttx-28898b80bc259a37f940e1727ad4bd8495a03982.tar.gz px4-nuttx-28898b80bc259a37f940e1727ad4bd8495a03982.tar.bz2 px4-nuttx-28898b80bc259a37f940e1727ad4bd8495a03982.zip | |
Initial Z61F debug
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@565 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z16/src/common')
| -rw-r--r-- | nuttx/arch/z16/src/common/up_allocateheap.c | 8 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_initialize.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_initialstate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_sigdeliver.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/z16/src/common/up_allocateheap.c b/nuttx/arch/z16/src/common/up_allocateheap.c index 015b6c978..62d96e0b3 100644 --- a/nuttx/arch/z16/src/common/up_allocateheap.c +++ b/nuttx/arch/z16/src/common/up_allocateheap.c @@ -57,13 +57,13 @@ */ #ifndef CONFIG_HEAP1_BASE - extern _Far unsigned long far_heaptop; - #define CONFIG_HEAP1_BASE ((unsigned long)&far_heaptop) + extern _Far unsigned long far_heapbot; + #define CONFIG_HEAP1_BASE ((unsigned long)&far_heapbot) #endif #ifndef CONFIG_HEAP1_END - extern _Far unsigned long far_heapbot; - #define CONFIG_HEAP1_END ((unsigned long)&far_heapbot) + extern _Far unsigned long far_heaptop; + #define CONFIG_HEAP1_END ((unsigned long)&far_heaptop) #endif /**************************************************************************** diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c index 0f54beb4f..8a30d33ad 100644 --- a/nuttx/arch/z16/src/common/up_initialize.c +++ b/nuttx/arch/z16/src/common/up_initialize.c @@ -66,7 +66,7 @@ * interrupt processing. */ -chipreg_t *current_regs; +FAR chipreg_t *current_regs; /**************************************************************************** * Private Types diff --git a/nuttx/arch/z16/src/common/up_initialstate.c b/nuttx/arch/z16/src/common/up_initialstate.c index acb5c31f1..d41e303bd 100644 --- a/nuttx/arch/z16/src/common/up_initialstate.c +++ b/nuttx/arch/z16/src/common/up_initialstate.c @@ -84,7 +84,7 @@ void up_initial_state(_TCB *tcb) memset(&tcb->xcp, 0, sizeof(struct xcptcontext)); #ifndef CONFIG_SUPPRESS_INTERRUPTS - tcb->xcp.regs[REG_FLAGS] = (uint16)(Z16F_CNTRL_FLAGS_IRQE << 8); /* IRQE flag will enable interrupts */ + tcb->xcp.regs[REG_FLAGS] = (uint16)Z16F_CNTRL_FLAGS_IRQE; /* IRQE flag will enable interrupts */ #endif reg32[REG_SP/2] = (uint32)tcb->adj_stack_ptr; reg32[REG_PC/2] = (uint32)tcb->start; diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h index 206fdc98a..f6acb97a6 100644 --- a/nuttx/arch/z16/src/common/up_internal.h +++ b/nuttx/arch/z16/src/common/up_internal.h @@ -85,7 +85,7 @@ typedef void (*up_vector_t)(void); * interrupt processing. */ -extern chipreg_t *current_regs; +extern FAR chipreg_t *current_regs; #endif /**************************************************************************** diff --git a/nuttx/arch/z16/src/common/up_sigdeliver.c b/nuttx/arch/z16/src/common/up_sigdeliver.c index 8360b032a..59b40715d 100644 --- a/nuttx/arch/z16/src/common/up_sigdeliver.c +++ b/nuttx/arch/z16/src/common/up_sigdeliver.c @@ -118,7 +118,7 @@ void up_sigdeliver(void) /* Then restore the task interrupt state. */ - if ((reg[REG_FLAGS] & (Z16F_CNTRL_FLAGS_IRQE << 8)) != 0) + if ((reg[REG_FLAGS] & Z16F_CNTRL_FLAGS_IRQE) != 0) { EI(); } |