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

STM32F0: Change HAVE_UART to HAVE_USART

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-17 17:53:04 -06:00
parent acdc26f972
commit 924f58fb2b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/stm32f0/stm32f0_lowputc.c
View File

@ -273,7 +273,7 @@ void up_lowputc(char ch)
void stm32f0_lowsetup(void) void stm32f0_lowsetup(void)
{ {
#if defined(HAVE_UART) #if defined(HAVE_USART)
#if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG) #if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
uint32_t cr; uint32_t cr;
#endif #endif
@ -402,5 +402,5 @@ void stm32f0_lowsetup(void)
putreg32(cr, STM32F0_CONSOLE_BASE + STM32F0_USART_CR1_OFFSET); putreg32(cr, STM32F0_CONSOLE_BASE + STM32F0_USART_CR1_OFFSET);
#endif /* HAVE_CONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */ #endif /* HAVE_CONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */
#endif /* HAVE_UART */ #endif /* HAVE_USART */
} }

8
arch/arm/src/stm32f0/stm32f0_serial.c
View File

@ -196,7 +196,7 @@
#endif #endif
#ifdef USE_SERIALDRIVER #ifdef USE_SERIALDRIVER
#ifdef HAVE_UART #ifdef HAVE_USART
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -2327,7 +2327,7 @@ static int stm32f0serial_pmprepare(FAR struct pm_callback_s *cb, int domain,
return OK; return OK;
} }
#endif #endif
#endif /* HAVE_UART */ #endif /* HAVE_USART */
#endif /* USE_SERIALDRIVER */ #endif /* USE_SERIALDRIVER */
/**************************************************************************** /****************************************************************************
@ -2349,7 +2349,7 @@ static int stm32f0serial_pmprepare(FAR struct pm_callback_s *cb, int domain,
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void) void up_earlyserialinit(void)
{ {
#ifdef HAVE_UART #ifdef HAVE_USART
unsigned i; unsigned i;
/* Disable all USART interrupts */ /* Disable all USART interrupts */
@ -2382,7 +2382,7 @@ void up_earlyserialinit(void)
void up_serialinit(void) void up_serialinit(void)
{ {
#ifdef HAVE_UART #ifdef HAVE_USART
char devname[16]; char devname[16];
unsigned i; unsigned i;
unsigned minor = 0; unsigned minor = 0;

4
arch/arm/src/stm32f0/stm32f0_serial.h
View File

@ -57,9 +57,9 @@
/* Are any UARTs enabled? */ /* Are any UARTs enabled? */
#undef HAVE_UART #undef HAVE_USART
#if defined(CONFIG_STM32F0_UART0) #if defined(CONFIG_STM32F0_UART0)
# define HAVE_UART 1 # define HAVE_USART 1
#endif #endif
/* Is there a serial console? There should be at most one defined. It could be on /* Is there a serial console? There should be at most one defined. It could be on

2
arch/arm/src/stm32f0/stm32f0_uart.h
View File

@ -84,7 +84,7 @@
#if defined(CONFIG_STM32F0_USART1) || defined(CONFIG_STM32F0_USART2) || \ #if defined(CONFIG_STM32F0_USART1) || defined(CONFIG_STM32F0_USART2) || \
defined(CONFIG_STM32F0_USART3) || defined(CONFIG_STM32F0_USART4) || \ defined(CONFIG_STM32F0_USART3) || defined(CONFIG_STM32F0_USART4) || \
defined(CONFIG_STM32F0_USART5) defined(CONFIG_STM32F0_USART5)
# define HAVE_UART 1 # define HAVE_USART 1
#endif #endif
/* Sanity checks */ /* Sanity checks */