From fc2ff5ad75dc0afddf3be8a12ba639811763c94a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 10 Jan 2014 13:36:18 -0600 Subject: [PATCH] Fix types in conditional compilation --- arch/arm/src/a1x/a1x_serial.c | 2 +- arch/arm/src/lpc17xx/lpc17_serial.c | 2 +- arch/arm/src/lpc214x/lpc214x_serial.c | 2 +- arch/arm/src/lpc2378/lpc23xx_serial.c | 2 +- arch/arm/src/lpc31xx/lpc31_lowputc.c | 2 +- arch/arm/src/lpc31xx/lpc31_serial.c | 2 +- arch/arm/src/lpc43xx/lpc43_serial.c | 2 +- arch/arm/src/nuc1xx/nuc_serial.c | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index 60ed48290c..e23a39e6c9 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -950,7 +950,7 @@ static inline uint32_t a1x_uartdl(uint32_t baud) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_A1X_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s*)dev->priv; uint16_t dl; uint32_t lcr; diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c index ed1a378147..57a775a6ae 100644 --- a/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/arch/arm/src/lpc17xx/lpc17_serial.c @@ -874,7 +874,7 @@ static inline uint32_t lpc17_uartdl(uint32_t baud) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_LPC17_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s*)dev->priv; uint16_t dl; uint32_t lcr; diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c index f27eea9772..7b3192b314 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -293,7 +293,7 @@ static inline void up_enablebreaks(struct up_dev_s *priv, bool enable) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_LPC214X_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s*)dev->priv; uint16_t baud; uint8_t lcr; diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c index 6fcb503f3b..b7a27072d9 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -427,7 +427,7 @@ static inline void up_configbaud(struct up_dev_s *priv) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_LPC214X_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint8_t lcr; diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c index 72eb91748b..12e368db7e 100644 --- a/arch/arm/src/lpc31xx/lpc31_lowputc.c +++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c @@ -71,7 +71,7 @@ * initialization suppressed? */ -# if defined(USE_EARLYSERIALINIT) || defined(CONFIG_SUPPRESS_LPC31_UART_CONFIG) +# if defined(USE_EARLYSERIALINIT) || defined(CONFIG_SUPPRESS_UART_CONFIG) # undef NEED_LOWSETUP # else # define NEED_LOWSETUP 1 diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index c02095e053..b79295488b 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -343,7 +343,7 @@ static inline void up_configbaud(void) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_LPC31_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s*)dev->priv; uint32_t regval; diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c index 8736d5db21..a4d60dc158 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -560,7 +560,7 @@ static inline void up_enablebreaks(struct up_dev_s *priv, bool enable) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_LPC43_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct up_dev_s *priv = (struct up_dev_s*)dev->priv; uint32_t lcr; diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c index 6ecfb11598..10acca0b12 100644 --- a/arch/arm/src/nuc1xx/nuc_serial.c +++ b/arch/arm/src/nuc1xx/nuc_serial.c @@ -446,7 +446,7 @@ static void up_rxto_enable(struct nuc_dev_s *priv) static int up_setup(struct uart_dev_s *dev) { -#ifndef CONFIG_SUPPRESS_NUC_UART_CONFIG +#ifndef CONFIG_SUPPRESS_UART_CONFIG struct nuc_dev_s *priv = (struct nuc_dev_s*)dev->priv; uint32_t regval; @@ -526,7 +526,7 @@ static int up_setup(struct uart_dev_s *dev) /* Enable Flow Control in the Modem Control Register */ /* Not implemented */ -#endif /* CONFIG_SUPPRESS_NUC_UART_CONFIG */ +#endif /* CONFIG_SUPPRESS_UART_CONFIG */ return OK; }