From 471b50c5f8f0f49ce8abfb8f0085d05cfe32edaa Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 16 Dec 2009 20:59:06 +0000 Subject: Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2361 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/sh/src/m16c/m16c_dumpstate.c | 28 ++++++++++++++-------------- nuttx/arch/sh/src/m16c/m16c_lowputc.c | 2 +- nuttx/arch/sh/src/m16c/m16c_serial.c | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'nuttx/arch/sh/src/m16c') diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c index ff451e9b4..eeae392d4 100755 --- a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c +++ b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c @@ -77,9 +77,9 @@ * Name: m16c_getsp ****************************************************************************/ -static inline uint16_t) m16c_getsp(void) +static inline uint16_t m16c_getsp(void) { - uint16_t) sp; + uint16_t sp; __asm__ __volatile__ ( @@ -96,10 +96,10 @@ static inline uint16_t) m16c_getsp(void) ****************************************************************************/ #if CONFIG_ARCH_INTERRUPTSTACK > 3 -static inline uint16_t) m16c_getusersp(void) +static inline uint16_t m16c_getusersp(void) { uint8_t *ptr = (uint8_t*) current_regs; - return (uint16_t))ptr[REG_SP] << 8 | ptr[REG_SP+1]; + return (uint16_t)ptr[REG_SP] << 8 | ptr[REG_SP+1]; } #endif @@ -107,9 +107,9 @@ static inline uint16_t) m16c_getusersp(void) * Name: m16c_stackdump ****************************************************************************/ -static void m16c_stackdump(uint16_t) sp, uint16_t) stack_base) +static void m16c_stackdump(uint16_t sp, uint16_t stack_base) { - uint16_t) stack; + uint16_t stack; for (stack = sp & ~7; stack < stack_base; stack += 8) { @@ -158,13 +158,13 @@ static inline void m16c_registerdump(void) void up_dumpstate(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; - uint16_t) sp = m16c_getsp(); - uint16_t) ustackbase; - uint16_t) ustacksize; + _TCB *rtcb = (_TCB*)g_readytorun.head; + uint16_t sp = m16c_getsp(); + uint16_t ustackbase; + uint16_t ustacksize; #if CONFIG_ARCH_INTERRUPTSTACK > 3 - uint16_t) istackbase; - uint16_t) istacksize; + uint16_t istackbase; + uint16_t istacksize; #endif /* Get the limits on the user stack memory */ @@ -176,8 +176,8 @@ void up_dumpstate(void) } else { - ustackbase = (uint16_t))rtcb->adj_stack_ptr; - ustacksize = (uint16_t))rtcb->adj_stack_size; + ustackbase = (uint16_t)rtcb->adj_stack_ptr; + ustacksize = (uint16_t)rtcb->adj_stack_size; } /* Get the limits on the interrupt stack memory. The near RAM memory map is as follows: diff --git a/nuttx/arch/sh/src/m16c/m16c_lowputc.c b/nuttx/arch/sh/src/m16c/m16c_lowputc.c index b5d32d915..4651e617e 100644 --- a/nuttx/arch/sh/src/m16c/m16c_lowputc.c +++ b/nuttx/arch/sh/src/m16c/m16c_lowputc.c @@ -308,7 +308,7 @@ void up_lowputc(char ch) /* Write the data to the transmit buffer */ - putreg16((uint16_t))ch, M16C_UART_BASE + M16C_UART_TB); + putreg16((uint16_t)ch, M16C_UART_BASE + M16C_UART_TB); #endif } #endif diff --git a/nuttx/arch/sh/src/m16c/m16c_serial.c b/nuttx/arch/sh/src/m16c/m16c_serial.c index 9f569ec16..d18b4af59 100644 --- a/nuttx/arch/sh/src/m16c/m16c_serial.c +++ b/nuttx/arch/sh/src/m16c/m16c_serial.c @@ -836,7 +836,7 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status) static void m16c_rxint(struct up_dev_s *dev, bool enable) { irqstate_t flags; - uint16_t)_t regaddr; + uint16_t regaddr; uint8_t regvalue; /* Disable interrupts to prevent asynchronous accesses */ @@ -991,7 +991,7 @@ static void up_send(struct uart_dev_s *dev, int ch) static void m16c_txint(struct up_dev_s *dev, bool enable) { irqstate_t flags; - uint16_t)_t regaddr; + uint16_t regaddr; uint8_t regvalue; /* Disable interrupts to prevent asynchronous accesses */ -- cgit v1.2.3