Fix types in conditional compilation

This commit is contained in:
Gregory Nutt 2014-01-10 13:36:18 -06:00
parent b4a577a49e
commit fc2ff5ad75
8 changed files with 9 additions and 9 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;
}