From 40e7780e656d626e56f58b7aecbabc0ce81bc372 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Thu, 28 May 2015 10:12:53 -0700 Subject: [PATCH] Renaming CONFIGURE_UART_PORT macro Renaming the CONFIGRUE_UART_PORT macro to UART_PORT_CONFIGURE. Done to better align with the current naming process, but also to remove some possible confusion over the macros source now that the tree has moved over to Kconfig/Kbuild options. Change-Id: I1a7691d09818c3d529de346e7fa347ce5ac19aed Signed-off-by: Dan Kalowsky --- arch/arm/fsl_frdm_k64f/board.h | 2 +- arch/arm/ti_lm3s6965/board.h | 2 +- arch/x86/generic_pc/board.h | 2 +- drivers/serial/k20UartDrv.c | 2 +- drivers/serial/ns16550.c | 10 +++++----- drivers/serial/stellarisUartDrv.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/fsl_frdm_k64f/board.h b/arch/arm/fsl_frdm_k64f/board.h index 9ed5a05ed2f..dacd73c32af 100644 --- a/arch/arm/fsl_frdm_k64f/board.h +++ b/arch/arm/fsl_frdm_k64f/board.h @@ -186,7 +186,7 @@ This header file is used to specify and describe board-level aspects for the #define CONFIG_UART_PORT_4_REGS PERIPH_ADDR_BASE_UART4 #define CONFIG_UART_PORT_4_IRQ IRQ_UART4_STATUS -#define CONFIGURE_UART_PORTS(__type, __name) \ +#define UART_PORTS_CONFIGURE(__type, __name) \ static __type __name[CONFIG_UART_NUM_PORTS] = { \ { \ .base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \ diff --git a/arch/arm/ti_lm3s6965/board.h b/arch/arm/ti_lm3s6965/board.h index 20f68959e7c..ed41fc78c6b 100644 --- a/arch/arm/ti_lm3s6965/board.h +++ b/arch/arm/ti_lm3s6965/board.h @@ -118,7 +118,7 @@ the 'ti_lm3s6965' BSP. #define CONFIG_UART_PORT_2_REGS PERIPH_ADDR_BASE_UART2 #define CONFIG_UART_PORT_2_IRQ IRQ_UART2 -#define CONFIGURE_UART_PORTS(__type, __name) \ +#define UART_PORTS_CONFIGURE(__type, __name) \ static __type __name[CONFIG_UART_NUM_PORTS] = { \ { \ .base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \ diff --git a/arch/x86/generic_pc/board.h b/arch/x86/generic_pc/board.h index da4676dccef..a98ac82cb62 100644 --- a/arch/x86/generic_pc/board.h +++ b/arch/x86/generic_pc/board.h @@ -129,7 +129,7 @@ the 'generic_pc' BSP. #define CONFIG_UART_PORT_1_REGS COM2_BASE_ADRS #define CONFIG_UART_PORT_1_IRQ COM2_INT_LVL -#define CONFIGURE_UART_PORTS(__type, __name) \ +#define UART_PORTS_CONFIGURE(__type, __name) \ static __type __name[CONFIG_UART_NUM_PORTS] = { \ { \ .port = CONFIG_UART_PORT_0_REGS, \ diff --git a/drivers/serial/k20UartDrv.c b/drivers/serial/k20UartDrv.c index 6cdbc1aaf6b..834508a0f03 100644 --- a/drivers/serial/k20UartDrv.c +++ b/drivers/serial/k20UartDrv.c @@ -63,7 +63,7 @@ typedef struct { /* locals */ -CONFIGURE_UART_PORTS(_k20Uart_t, uart); +UART_PORTS_CONFIGURE(_k20Uart_t, uart); /******************************************************************************* * diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index d0245acbd85..faa5e3f0c52 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -239,11 +239,11 @@ struct ns16550 { /* locals */ -#if !(defined(CONFIGURE_UART_PORTS)) && !(defined(CONFIG_PCI)) +#if !(defined(UART_PORTS_CONFIGURE)) && !(defined(CONFIG_PCI)) - #error "CONFIG_PCI or CONFIGURE_UART_PORTS is needed" + #error "CONFIG_PCI or UART_PORTS_CONFIGURE is needed" -#elif !(defined(CONFIGURE_UART_PORTS)) && defined(CONFIG_PCI) +#elif !(defined(UART_PORTS_CONFIGURE)) && defined(CONFIG_PCI) static struct ns16550 uart[CONFIG_UART_NUM_SYSTEM_PORTS] = {}; @@ -278,9 +278,9 @@ static inline void ns16550_uart_init() #define ns16550_uart_init() \ do {} while ((0)) -CONFIGURE_UART_PORTS(struct ns16550, uart); +UART_PORTS_CONFIGURE(struct ns16550, uart); -#endif /* CONFIGURE_UART_PORTS */ +#endif /* UART_PORTS_CONFIGURE */ /******************************************************************************* * diff --git a/drivers/serial/stellarisUartDrv.c b/drivers/serial/stellarisUartDrv.c index a80f884bc20..51bf877a953 100644 --- a/drivers/serial/stellarisUartDrv.c +++ b/drivers/serial/stellarisUartDrv.c @@ -151,7 +151,7 @@ struct _StellarisUartPort { uint8_t intPri; /* interrupt priority level */ }; -CONFIGURE_UART_PORTS(struct _StellarisUartPort, ports); +UART_PORTS_CONFIGURE(struct _StellarisUartPort, ports); /******************************************************************************* *