patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Renaming CONFIGURE_UART_PORT macro

Browse source 
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 <daniel.kalowsky@intel.com>
This commit is contained in:
Dan Kalowsky 2015-05-28 10:12:53 -07:00 committed by Anas Nashif
parent b08727ed2d
commit 40e7780e65
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/fsl_frdm_k64f/board.h
View file

@ -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_REGS PERIPH_ADDR_BASE_UART4
#define CONFIG_UART_PORT_4_IRQ IRQ_UART4_STATUS #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] = { \ static __type __name[CONFIG_UART_NUM_PORTS] = { \
{ \ { \
.base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \ .base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \

2
arch/arm/ti_lm3s6965/board.h
View file

@ -118,7 +118,7 @@ the 'ti_lm3s6965' BSP.
#define CONFIG_UART_PORT_2_REGS PERIPH_ADDR_BASE_UART2 #define CONFIG_UART_PORT_2_REGS PERIPH_ADDR_BASE_UART2
#define CONFIG_UART_PORT_2_IRQ IRQ_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] = { \ static __type __name[CONFIG_UART_NUM_PORTS] = { \
{ \ { \
.base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \ .base = (uint8_t *)CONFIG_UART_PORT_0_REGS, \

2
arch/x86/generic_pc/board.h
View file

@ -129,7 +129,7 @@ the 'generic_pc' BSP.
#define CONFIG_UART_PORT_1_REGS COM2_BASE_ADRS #define CONFIG_UART_PORT_1_REGS COM2_BASE_ADRS
#define CONFIG_UART_PORT_1_IRQ COM2_INT_LVL #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] = { \ static __type __name[CONFIG_UART_NUM_PORTS] = { \
{ \ { \
.port = CONFIG_UART_PORT_0_REGS, \ .port = CONFIG_UART_PORT_0_REGS, \

2
drivers/serial/k20UartDrv.c
View file

@ -63,7 +63,7 @@ typedef struct {
/* locals */ /* locals */
CONFIGURE_UART_PORTS(_k20Uart_t, uart); UART_PORTS_CONFIGURE(_k20Uart_t, uart);
/******************************************************************************* /*******************************************************************************
* *

10
drivers/serial/ns16550.c
View file

@ -239,11 +239,11 @@ struct ns16550 {
/* locals */ /* 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] = {}; static struct ns16550 uart[CONFIG_UART_NUM_SYSTEM_PORTS] = {};
@ -278,9 +278,9 @@ static inline void ns16550_uart_init()
#define ns16550_uart_init() \ #define ns16550_uart_init() \
do {} while ((0)) do {} while ((0))
CONFIGURE_UART_PORTS(struct ns16550, uart); UART_PORTS_CONFIGURE(struct ns16550, uart);
#endif /* CONFIGURE_UART_PORTS */ #endif /* UART_PORTS_CONFIGURE */
/******************************************************************************* /*******************************************************************************
* *

2
drivers/serial/stellarisUartDrv.c
View file

@ -151,7 +151,7 @@ struct _StellarisUartPort {
uint8_t intPri; /* interrupt priority level */ uint8_t intPri; /* interrupt priority level */
}; };
CONFIGURE_UART_PORTS(struct _StellarisUartPort, ports); UART_PORTS_CONFIGURE(struct _StellarisUartPort, ports);
/******************************************************************************* /*******************************************************************************
* *