From 262ae0eb769052f90fa295f01633d1efa34d5647 Mon Sep 17 00:00:00 2001 From: jeditekunum Date: Mon, 26 Jan 2015 13:55:26 -0600 Subject: [PATCH] Fix typos. --- arch/avr/src/atmega/atmega_config.h | 2 +- arch/avr/src/atmega/atmega_serial.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/avr/src/atmega/atmega_config.h b/arch/avr/src/atmega/atmega_config.h index 5d784ccf3c..d9b82ac5e0 100644 --- a/arch/avr/src/atmega/atmega_config.h +++ b/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/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c index a6c43995d1..986bbc4a10 100644 --- a/arch/avr/src/atmega/atmega_serial.c +++ b/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 */