sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some bad macro names in include/nuttx/serial/16550.h

Browse Source
This commit is contained in:
Gregory Nutt 2013-04-05 16:53:01 -06:00
parent 1925e60dd1
commit 52a0d9a0e5
1 changed files with 22 additions and 22 deletions

44
include/nuttx/serial/uart_16550.h

@ -2,7 +2,7 @@
* include/nuttx/serial/uart_16550.h * include/nuttx/serial/uart_16550.h
* Serial driver for 16550 UART * Serial driver for 16550 UART
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -153,31 +153,31 @@
* any UARTn, n=0,1,2,3 * any UARTn, n=0,1,2,3
*/ */
#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_16550_UART0) #if defined(CONFIG_16550_UART0_SERIAL_CONSOLE) && defined(CONFIG_16550_UART0)
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_16550_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_16550_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_16550_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_16550_UART1) #elif defined(CONFIG_16550_UART1_SERIAL_CONSOLE) && defined(CONFIG_16550_UART1)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_16550_UART0_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_16550_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_16550_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_16550_UART2) #elif defined(CONFIG_16550_UART2_SERIAL_CONSOLE) && defined(CONFIG_16550_UART2)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_16550_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_16550_UART1_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_16550_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_16550_UART3) #elif defined(CONFIG_16550_UART3_SERIAL_CONSOLE) && defined(CONFIG_16550_UART3)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_16550_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_16550_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_16550_UART2_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#else #else
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_16550_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_16550_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_16550_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_16550_UART3_SERIAL_CONSOLE
# undef HAVE_16550_CONSOLE # undef HAVE_16550_CONSOLE
#endif #endif
@ -347,5 +347,5 @@ typedef uint32_t uart_addrwidth_t;
extern uart_datawidth_t uart_getreg(uart_addrwidth_t base, unsigned int offset); extern uart_datawidth_t uart_getreg(uart_addrwidth_t base, unsigned int offset);
extern void uart_putreg(uart_addrwidth_t base, unsigned int offset, uart_datawidth_t value); extern void uart_putreg(uart_addrwidth_t base, unsigned int offset, uart_datawidth_t value);
#endif /* CONFIG_UART_16550 */ #endif /* CONFIG_16550_UART */
#endif /* __INCLUDE_NUTTX_SERIAL_UART_16550_H */ #endif /* __INCLUDE_NUTTX_SERIAL_UART_16550_H */