diff options
Diffstat (limited to 'nuttx/arch/sh/src/sh1')
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_head.S | 10 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_serial.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nuttx/arch/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 15a82fcda..9a52b9bb3 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -1,8 +1,8 @@ /***************************************************************************** * arch/sh/src/sh1/sh1_head.S * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -61,7 +61,7 @@ /* Called functions */ .globl _up_lowsetup /* Early initialization of UART */ -#ifdef CONFIG_USE_EARLYSERIALINIT +#ifdef USE_EARLYSERIALINIT .globl _up_earlyconsoleinit /* Early initialization of console driver */ #endif #ifdef CONFIG_ARCH_LEDS @@ -426,7 +426,7 @@ __start0: /* Perform early console initialization */ -#ifdef CONFIG_USE_EARLYSERIALINIT +#ifdef USE_EARLYSERIALINIT mov.l .Learlyconsole, r0 /* Address of up_earlyconsoleinit */ jsr @r0 /* Call it */ or r0, r0 /* Delay slot */ @@ -481,7 +481,7 @@ __start0: .long _sbss .Lebss: .long _ebss -#ifdef CONFIG_USE_EARLYSERIALINIT +#ifdef USE_EARLYSERIALINIT .Learlyconsole: .long _up_earlyconsoleinit #endif diff --git a/nuttx/arch/sh/src/sh1/sh1_serial.c b/nuttx/arch/sh/src/sh1/sh1_serial.c index 3f87ee4db..027da35fa 100644 --- a/nuttx/arch/sh/src/sh1/sh1_serial.c +++ b/nuttx/arch/sh/src/sh1/sh1_serial.c @@ -1,8 +1,8 @@ /**************************************************************************** * arch/sh/src/sh1/sh1_serial.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -67,9 +67,9 @@ /* Are there any SCIs? */ #if !defined(CONFIG_SH1_SCI0) && !defined(CONFIG_SH1_SCI1) -# ifdef CONFIG_USE_SERIALDRIVER +# ifdef USE_SERIALDRIVER # error "Serial driver selected, but SCIs not enabled" -# undef CONFIG_USE_SERIALDRIVER +# undef USE_SERIALDRIVER # endif #endif @@ -90,7 +90,7 @@ # undef CONFIG_SCI1_SERIAL_CONSOLE #endif -#ifdef CONFIG_USE_SERIALDRIVER +#ifdef USE_SERIALDRIVER /* Which SCI with be tty0/console and which tty1? */ @@ -927,7 +927,7 @@ int up_putc(int ch) return ch; } -#else /* CONFIG_USE_SERIALDRIVER */ +#else /* USE_SERIALDRIVER */ /**************************************************************************** * Name: up_putc @@ -954,4 +954,4 @@ int up_putc(int ch) return ch; } -#endif /* CONFIG_USE_SERIALDRIVER */ +#endif /* USE_SERIALDRIVER */ |