diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-11 19:38:37 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-11 19:38:37 +0000 |
| commit | 64adcc078494d2b019866353c43c952de9050dcd (patch) | |
| tree | 0089e4ab39c10d6c8f2be70ea828257e858a14ff /nuttx/arch/sh/src | |
| parent | 085539aebda5932c178545b905365c29fc8ea434 (diff) | |
| download | px4-nuttx-64adcc078494d2b019866353c43c952de9050dcd.tar.gz px4-nuttx-64adcc078494d2b019866353c43c952de9050dcd.tar.bz2 px4-nuttx-64adcc078494d2b019866353c43c952de9050dcd.zip | |
cosmetic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1198 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sh/src')
| -rw-r--r-- | nuttx/arch/sh/src/common/up_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_lowputc.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_vector.S | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/sh/src/common/up_internal.h b/nuttx/arch/sh/src/common/up_internal.h index c1debc9fe..9241bb0e7 100644 --- a/nuttx/arch/sh/src/common/up_internal.h +++ b/nuttx/arch/sh/src/common/up_internal.h @@ -52,7 +52,7 @@ #undef CONFIG_SUPPRESS_INTERRUPTS /* DEFINED: Do not enable interrupts */ #undef CONFIG_SUPPRESS_TIMER_INTS /* DEFINED: No timer */ #undef CONFIG_SUPPRESS_SERIAL_INTS /* DEFINED: Console will poll */ -#undef CONFIG_SUPPRESS_SCI_CONFIG /* DEFINED: Do not reconfig SCI */ +#undef CONFIG_SUPPRESS_SCI_CONFIG /* DEFINED: Do not reconfig SCI */ #undef CONFIG_DUMP_ON_EXIT /* DEFINED: Dump task state on exit */ /* Determine which (if any) console driver to use */ diff --git a/nuttx/arch/sh/src/sh1/sh1_lowputc.c b/nuttx/arch/sh/src/sh1/sh1_lowputc.c index 816a84835..bae3f5bbd 100644 --- a/nuttx/arch/sh/src/sh1/sh1_lowputc.c +++ b/nuttx/arch/sh/src/sh1/sh1_lowputc.c @@ -174,9 +174,9 @@ **************************************************************************/ #ifdef HAVE_CONSOLE -int inline up_txready(void) +static inline int up_txready(void) { - return getreg8(SH1_SCI_BASE + SH1_SCI_SSR_OFFSET) & SH1_SCISSR_TDRE; + return (getreg8(SH1_SCI_BASE + SH1_SCI_SSR_OFFSET) & SH1_SCISSR_TDRE != 0); } #endif diff --git a/nuttx/arch/sh/src/sh1/sh1_vector.S b/nuttx/arch/sh/src/sh1/sh1_vector.S index 2dab495d1..3e6a32029 100644 --- a/nuttx/arch/sh/src/sh1/sh1_vector.S +++ b/nuttx/arch/sh/src/sh1/sh1_vector.S @@ -339,7 +339,7 @@ _up_vector: #if CONFIG_ARCH_INTERRUPTSTACK > 3 mov.l .Lintstack, r15 /* SP = interrupt stack base */ - mov.l r5, @sp /* Save the user stack pointer (pre-decremented) */ + mov.l r5, @r15 /* Save the user stack pointer (pre-decremented) */ /* Dispatch the interrupt */ @@ -349,7 +349,7 @@ _up_vector: /* Recover the user stack point */ - mov.l @sp, r15 + mov.l @15, r15 #else /* Dispatch the interrupt */ |