From 54c5a707659390bf1423750ff6639bf728cd7139 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 17 Dec 2009 18:47:48 +0000 Subject: [PATCH] Missed uint32 type conversions git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2372 42af7a65-404d-4744-a932-0658087f49c3 --- arch/z16/src/common/up_initialstate.c | 2 +- arch/z16/src/common/up_registerdump.c | 2 +- arch/z16/src/common/up_schedulesigaction.c | 4 ++-- arch/z16/src/common/up_sigdeliver.c | 2 +- binfmt/libnxflat/libnxflat_read.c | 2 +- configs/stm3210e-eval/RIDE/bigfatstub.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/z16/src/common/up_initialstate.c b/arch/z16/src/common/up_initialstate.c index b6b3ced50a..c01c18e89c 100644 --- a/arch/z16/src/common/up_initialstate.c +++ b/arch/z16/src/common/up_initialstate.c @@ -78,7 +78,7 @@ void up_initial_state(_TCB *tcb) { - uint32 *reg32 = (uint32_t*)tcb->xcp.regs; + uint32_t *reg32 = (uint32_t*)tcb->xcp.regs; /* Initialize the initial exception register context structure */ diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c index 63a875c56b..90c7d79c52 100644 --- a/arch/z16/src/common/up_registerdump.c +++ b/arch/z16/src/common/up_registerdump.c @@ -76,7 +76,7 @@ #ifdef CONFIG_ARCH_STACKDUMP static void up_registerdump(void) { - FAR uint32 *regs32 = (FAR uint32_t*)current_regs; + FAR uint32_t *regs32 = (FAR uint32_t*)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/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c index 9ed9c4fb59..e76a8c4ffd 100644 --- a/arch/z16/src/common/up_schedulesigaction.c +++ b/arch/z16/src/common/up_schedulesigaction.c @@ -141,7 +141,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) else { - FAR uint32 *current_pc = (FAR uint32_t*)¤t_regs[REG_PC]; + FAR uint32_t *current_pc = (FAR uint32_t*)¤t_regs[REG_PC]; /* Save the return address and interrupt state. These will be * restored by the signal trampoline after the signals have @@ -174,7 +174,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) else { - FAR uint32 *saved_pc = (FAR uint32_t*)&tcb->xcp.regs[REG_PC]; + FAR uint32_t *saved_pc = (FAR uint32_t*)&tcb->xcp.regs[REG_PC]; /* Save the return lr and cpsr and one scratch register * These will be restored by the signal trampoline after diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c index ae04fa54df..85f3e972d9 100644 --- a/arch/z16/src/common/up_sigdeliver.c +++ b/arch/z16/src/common/up_sigdeliver.c @@ -83,7 +83,7 @@ void up_sigdeliver(void) #ifndef CONFIG_DISABLE_SIGNALS FAR _TCB *rtcb = (_TCB*)g_readytorun.head; chipreg_t regs[XCPTCONTEXT_REGS]; - FAR uint32 *regs32 = (FAR uint32_t*)regs; + FAR uint32_t *regs32 = (FAR uint32_t*)regs; sig_deliver_t sigdeliver; /* Save the errno. This must be preserved throughout the signal handling diff --git a/binfmt/libnxflat/libnxflat_read.c b/binfmt/libnxflat/libnxflat_read.c index 95e62bbb24..8f1650e873 100644 --- a/binfmt/libnxflat/libnxflat_read.c +++ b/binfmt/libnxflat/libnxflat_read.c @@ -73,7 +73,7 @@ #if defined(NXFLAT_DUMP_READDATA) static inline void nxflat_dumpreaddata(char *buffer, int buflen) { - uint32 *buf32 = (uint32_t*)buffer; + uint32_t *buf32 = (uint32_t*)buffer; int i; int j; diff --git a/configs/stm3210e-eval/RIDE/bigfatstub.c b/configs/stm3210e-eval/RIDE/bigfatstub.c index 96d48052d1..b9b51dd983 100755 --- a/configs/stm3210e-eval/RIDE/bigfatstub.c +++ b/configs/stm3210e-eval/RIDE/bigfatstub.c @@ -23,7 +23,7 @@ int irq_attach(int irq, xcpt_t isr) for (;;); } -uint32 *up_doirq(int irq, uint32_t *regs) +uint32_t *up_doirq(int irq, uint32_t *regs) { up_lowputc('I'); up_lowputc('\n');