summaryrefslogtreecommitdiff
path: root/nuttx/arch/avr/src
diff options
context:
space:
mode:
authorjeditekunum <jeditekunum@gmail.com>2015-01-26 13:55:26 -0600
committerjeditekunum <jeditekunum@gmail.com>2015-01-26 13:55:26 -0600
commit4ee49bd75aa7b5c569a082f6b8ae5b8c77db6fa3 (patch)
treed360fba79f4999b485ee3c3c25d1aa21bb4c4fc7 /nuttx/arch/avr/src
parent0ae43cf0dae5e57a91dc2ea61cd7a3d0e4dc7f3a (diff)
downloadnuttx-4ee49bd75aa7b5c569a082f6b8ae5b8c77db6fa3.tar.gz
nuttx-4ee49bd75aa7b5c569a082f6b8ae5b8c77db6fa3.tar.bz2
nuttx-4ee49bd75aa7b5c569a082f6b8ae5b8c77db6fa3.zip
Fix typos.
Diffstat (limited to 'nuttx/arch/avr/src')
-rw-r--r--nuttx/arch/avr/src/atmega/atmega_config.h2
-rw-r--r--nuttx/arch/avr/src/atmega/atmega_serial.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/nuttx/arch/avr/src/atmega/atmega_config.h b/nuttx/arch/avr/src/atmega/atmega_config.h
index 5d784ccf3..d9b82ac5e 100644
--- a/nuttx/arch/avr/src/atmega/atmega_config.h
+++ b/nuttx/arch/avr/src/atmega/atmega_config.h
@@ -48,7 +48,7 @@
/* USARTs ***************************************************************************/
#undef HAVE_USART_DEVICE
-#if defined(CONFIG_AVR_USART0) || defined(CONFIG_AVR_USART0)
+#if defined(CONFIG_AVR_USART0) || defined(CONFIG_AVR_USART1)
# define HAVE_USART_DEVICE 1
#endif
diff --git a/nuttx/arch/avr/src/atmega/atmega_serial.c b/nuttx/arch/avr/src/atmega/atmega_serial.c
index a6c43995d..986bbc4a1 100644
--- a/nuttx/arch/avr/src/atmega/atmega_serial.c
+++ b/nuttx/arch/avr/src/atmega/atmega_serial.c
@@ -897,7 +897,7 @@ void up_earlyserialinit(void)
{
/* Disable all USARTS */
-#ifdef CONFIG_AVR_USART1
+#ifdef CONFIG_AVR_USART0
usart0_disableusartint(NULL);
#endif
#ifdef CONFIG_AVR_USART1
@@ -949,9 +949,6 @@ void up_serialinit(void)
*
****************************************************************************/
-#ifdef HAVE_SERIAL_CONSOLE
-#endif
-
int up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
@@ -960,7 +957,7 @@ int up_putc(int ch)
#if defined(CONFIG_USART0_SERIAL_CONSOLE)
usart0_disableusartint(&imr);
#else
- usart1_cdisableusartint(&imr);
+ usart1_disableusartint(&imr);
#endif
/* Check for LF */