diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-31 17:59:22 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-31 17:59:22 +0000 |
| commit | 8a99a139ba3683e981c9e71c57f7fce313d92cae (patch) | |
| tree | 2dfeb694139cc0dbfcbb69bcbaae8ff6ddecbdd3 /nuttx/arch | |
| parent | b1fd89b2e088a49381c698ef69904124605e81dc (diff) | |
| download | px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.tar.gz px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.tar.bz2 px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.zip | |
Z16F integration changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@595 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/z16/src/common/up_registerdump.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_schedulesigaction.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/common/up_sigdeliver.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/z16/src/common/up_registerdump.c b/nuttx/arch/z16/src/common/up_registerdump.c index 5164dd0a6..b854f4882 100644 --- a/nuttx/arch/z16/src/common/up_registerdump.c +++ b/nuttx/arch/z16/src/common/up_registerdump.c @@ -76,7 +76,7 @@ #ifdef CONFIG_ARCH_STACKDUMP static void up_registerdump(void) { - uint32 *regs32 = (uint32*)current_regs; + FAR uint32 *regs32 = (FAR uint32*)current_regs; lldbg("R0 :%08x R1 :%08x R2 :%08x R3 :%08x " "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n" regs32[REG_R0/2], regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2], diff --git a/nuttx/arch/z16/src/common/up_schedulesigaction.c b/nuttx/arch/z16/src/common/up_schedulesigaction.c index 3284fd1bf..f085b2e95 100644 --- a/nuttx/arch/z16/src/common/up_schedulesigaction.c +++ b/nuttx/arch/z16/src/common/up_schedulesigaction.c @@ -104,7 +104,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) { /* Refuse to handle nested signal actions */ - dbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (chipreg_t)sigdeliver); + dbg("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32)sigdeliver); if (!tcb->xcp.sigdeliver) { @@ -141,7 +141,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) else { - uint32 *current_pc = (uint32*)¤t_regs[REG_PC]; + FAR uint32 *current_pc = (FAR uint32*)¤t_regs[REG_PC]; /* Save the return address and interrupt state. * These will be restored by the signal trampoline after diff --git a/nuttx/arch/z16/src/common/up_sigdeliver.c b/nuttx/arch/z16/src/common/up_sigdeliver.c index ce94d1a40..09bcd14ac 100644 --- a/nuttx/arch/z16/src/common/up_sigdeliver.c +++ b/nuttx/arch/z16/src/common/up_sigdeliver.c @@ -82,9 +82,9 @@ void up_sigdeliver(void) { #ifndef CONFIG_DISABLE_SIGNALS - _TCB *rtcb = (_TCB*)g_readytorun.head; + FAR _TCB *rtcb = (_TCB*)g_readytorun.head; chipreg_t regs[XCPTCONTEXT_REGS]; - uint32 *regs32 = (uint32*)regs; + FAR uint32 *regs32 = (FAR uint32*)regs; sig_deliver_t sigdeliver; /* Save the errno. This must be preserved throughout the signal handling |