diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-12-16 20:59:06 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2009-12-16 20:59:06 +0000 |
commit | 0d145f036c0d13edc123c8095cf1628914094dd6 (patch) | |
tree | 6ad8b287c156c844116acc3dc4f55ec9069fd180 /nuttx/arch/sh | |
parent | b1903dba1e54a5d5cacf1ae243bd23eb90c2dd14 (diff) |
Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@2361 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/sh')
-rwxr-xr-x | nuttx/arch/sh/src/m16c/m16c_dumpstate.c | 28 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_lowputc.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_serial.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_serial.c | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c index ff451e9b4d..eeae392d4f 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 b5d32d9151..4651e617ed 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 9f569ec166..d18b4af599 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 */ diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c index 69fda986a0..3f87ee4db9 100644 --- a/nuttx/arch/sh/src/sh1/sh1_serial.c +++ b/nuttx/arch/sh/src/sh1/sh1_serial.c @@ -373,7 +373,7 @@ static inline void up_setbrr(struct up_dev_s *priv, unsigned int baud) */ uint32_t brr = ((((SH1_CLOCK + 16) / 32) + (baud >> 1)) / baud) - 1; - up_serialout(priv, SH1_SCI_BRR_OFFSET, (uint16_t))brr); + up_serialout(priv, SH1_SCI_BRR_OFFSET, (uint16_t)brr); } /**************************************************************************** |