Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace HAVE_USART with HAVE_UART

Browse Source
This commit is contained in:
Alan Carvalho de Assis
2017-04-14 11:44:51 -06:00
committed by Gregory Nutt
parent 4602212612
commit 03cbf21cd8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32f0/stm32f0_serial.c
+4 -4
View File
@@ -196,7 +196,7 @@
#endif #endif
#ifdef USE_SERIALDRIVER #ifdef USE_SERIALDRIVER
#ifdef HAVE_USART #ifdef HAVE_UART
/**************************************************************************** /****************************************************************************
* 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_USART */ #endif /* HAVE_UART */
#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_USART #ifdef HAVE_UART
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_USART #ifdef HAVE_UART
char devname[16]; char devname[16];
unsigned i; unsigned i;
unsigned minor = 0; unsigned minor = 0;
arch/arm/src/stm32f0/stm32f0_uart.h
+7 -7
View File
@@ -54,22 +54,22 @@
* device. * device.
*/ */
#if STM32F0_NUSART < 8 || !defined(CONFIG_STM32F0_HAVE_USART8) #if STM32F0_NUSART < 8 || !defined(CONFIG_STM32F0_HAVE_UART8)
# undef CONFIG_STM32F0_USART8 # undef CONFIG_STM32F0_USART8
#endif #endif
#if STM32F0_NUSART < 7 || !defined(CONFIG_STM32F0_HAVE_USART7) #if STM32F0_NUSART < 7 || !defined(CONFIG_STM32F0_HAVE_UART7)
# undef CONFIG_STM32F0_USART7 # undef CONFIG_STM32F0_USART7
#endif #endif
#if STM32F0_NUSART < 6 || !defined(CONFIG_STM32F0_HAVE_USART6) #if STM32F0_NUSART < 6 || !defined(CONFIG_STM32F0_HAVE_UART6)
# undef CONFIG_STM32F0_USART6 # undef CONFIG_STM32F0_USART6
#endif #endif
#if STM32F0_NUSART < 5 || !defined(CONFIG_STM32F0_HAVE_USART5) #if STM32F0_NUSART < 5 || !defined(CONFIG_STM32F0_HAVE_UART5)
# undef CONFIG_STM32F0_USART5 # undef CONFIG_STM32F0_USART5
#endif #endif
#if STM32F0_NUSART < 4 || !defined(CONFIG_STM32F0_HAVE_USART4) #if STM32F0_NUSART < 4 || !defined(CONFIG_STM32F0_HAVE_UART4)
# undef CONFIG_STM32F0_USART4 # undef CONFIG_STM32F0_USART4
#endif #endif
#if STM32F0_NUSART < 3 || !defined(CONFIG_STM32F0_HAVE_USART3) #if STM32F0_NUSART < 3 || !defined(CONFIG_STM32F0_HAVE_UART3)
# undef CONFIG_STM32F0_USART3 # undef CONFIG_STM32F0_USART3
#endif #endif
#if STM32F0_NUSART < 2 #if STM32F0_NUSART < 2
@@ -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_USART 1 # define HAVE_UART 1
#endif #endif
/* Sanity checks */ /* Sanity checks */