Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-20 21:06:58 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merged nuttx/nuttx into master

Browse Source
This commit is contained in:
ziggurat29
2016-05-25 14:41:20 -05:00
parent e68ba11fac 78e08bbeea
commit b7935f5705
401 changed files with 10088 additions and 9255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/Kconfig
+2 -2
View File
@@ -27,7 +27,7 @@ config ARCH_CHIP_C5471
bool "TMS320 C5471"
select ARCH_ARM7TDMI
select ARCH_HAVE_LOWVECTORS
select ARCH_HAVE_OTHER_UART
select OTHER_UART_SERIALDRIVER
---help---
TI TMS320 C5471, A180, or DA180 (ARM7TDMI)
@@ -36,7 +36,7 @@ config ARCH_CHIP_CALYPSO
select ARCH_ARM7TDMI
select ARCH_HAVE_HEAP2
select ARCH_HAVE_LOWVECTORS
select ARCH_HAVE_OTHER_UART
select OTHER_UART_SERIALDRIVER
select ARCH_HAVE_POWEROFF
---help---
TI Calypso-based cell phones (ARM7TDMI)
arch/arm/include/stm32/stm32f10xxx_irq.h
+1 -1
View File
@@ -120,7 +120,7 @@
# define STM32_IRQ_TIM5 (66) /* 50: TIM5 global interrupt */
# define STM32_IRQ_SPI3 (67) /* 51: SPI3 global interrupt */
# define STM32_IRQ_UART4 (68) /* 52: USART2 global interrupt */
# define STM32_IRQ_UART5 (69) /* 53: USART5 global interrupt */
# define STM32_IRQ_UART5 (69) /* 53: UART5 global interrupt */
# define STM32_IRQ_TIM6 (70) /* 54: TIM6 global interrupt */
# define STM32_IRQ_TIM7 (71) /* 55: TIM7 global interrupt */
# define STM32_IRQ_DMA2CH1 (72) /* 56: DMA2 Channel 1 global interrupt */
arch/arm/src/a1x/Kconfig
+8 -8
View File
@@ -21,49 +21,49 @@ menu "Allwinner A1X Peripheral Support"
config A1X_UART0
bool "UART 0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART1
bool "UART 1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART2
bool "UART 2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART3
bool "UART 3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART4
bool "UART 4"
default n
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART5
bool "UART 5"
default n
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART6
bool "UART 6"
default n
select ARCH_HAVE_UART6
select UART6_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_UART7
bool "UART 7"
default n
select ARCH_HAVE_UART7
select UART7_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config A1X_IR0
arch/arm/src/common/up_createstack.c
+2 -2
View File
@@ -220,7 +220,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
if (tcb->stack_alloc_ptr)
{
#if defined(CONFIG_TLS) && defined(CONFIG_STACK_COLORATION)
uinptr_t stack_base;
uintptr_t stack_base;
#endif
size_t top_of_stack;
size_t size_of_stack;
@@ -264,7 +264,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
* water marks.
*/
stackbase = (uintptr_t)tcb->stack_alloc_ptr + sizeof(struct tls_info_s);
stack_base = (uintptr_t)tcb->stack_alloc_ptr + sizeof(struct tls_info_s);
stack_size = tcb->adj_stack_size - sizeof(struct tls_info_s);
up_stack_color((FAR void *)stack_base, stack_size);
arch/arm/src/common/up_usestack.c
+7 -1
View File
@@ -174,7 +174,13 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
* value that we can use later to test for high water marks.
*/
# warning Missing logic
#ifdef CONFIG_TLS
up_stack_color(
(FAR void *)((uintptr_t)tcb->stack_alloc_ptr + sizeof(struct tls_info_s)),
tcb->adj_stack_size - sizeof(struct tls_info_s));
#else
up_stack_color(tcb->stack_alloc_ptr, tcb->adj_stack_size);
#endif
#endif
return OK;
arch/arm/src/dm320/Kconfig
+2 -2
View File
@@ -11,12 +11,12 @@ menu "DM320 Peripheral Selections"
config DM320_UART0
bool
default y
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
config DM320_UART1
bool
default y
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
endmenu # DM320 Peripheral Selections
endif # ARCH_CHIP_DM320
arch/arm/src/efm32/Kconfig
+7 -10
View File
@@ -157,45 +157,42 @@ config EFM32_BITBAND
config EFM32_USART0
bool "USART0"
default n
select ARCH_HAVE_USART0
select ARCH_HAVE_SERIAL_TERMIOS
config EFM32_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select ARCH_HAVE_SERIAL_TERMIOS
config EFM32_USART2
bool "USART2"
default n
depends on EFM32_HAVE_USART2
select ARCH_HAVE_USART2
select ARCH_HAVE_SERIAL_TERMIOS
config EFM32_UART0
bool "UART0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select EFM32_UART
config EFM32_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select EFM32_UART
config EFM32_LEUART0
bool "Low energy UART0"
default n
select ARCH_HAVE_OTHER_UART
select OTHER_UART_SERIALDRIVER
select EFM32_LEUART
config EFM32_LEUART1
bool "Low energy UART1"
default n
depends on EFM32_HAVE_LEUART1
select ARCH_HAVE_OTHER_UART
select OTHER_UART_SERIALDRIVER
select EFM32_LEUART
config EFM32_OTGFS
@@ -261,7 +258,7 @@ choice
config EFM32_USART0_ISUART
bool "USART0 is a UART"
select USART0_ISUART
select USART0_SERIALDRIVER
select EFM32_USART_ISUART
config EFM32_USART0_ISSPI
@@ -277,7 +274,7 @@ choice
config EFM32_USART1_ISUART
bool "USART1 is a UART"
select USART1_ISUART
select USART1_SERIALDRIVER
select EFM32_USART_ISUART
config EFM32_USART1_ISSPI
@@ -293,7 +290,7 @@ choice
config EFM32_USART2_ISUART
bool "USART2 is a UART"
select USART2_ISUART
select USART2_SERIALDRIVER
select EFM32_USART_ISUART
config EFM32_USART2_ISSPI
arch/arm/src/imx1/Kconfig
+3 -3
View File
@@ -12,17 +12,17 @@ menu "iMX.1 Peripheral Selection"
config IMX1_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
config IMX1_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
config IMX1_UART3
bool "UART3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
config IMX1_SPI1
bool "SPI1"
arch/arm/src/imx6/Kconfig
+5 -5
View File
@@ -59,27 +59,27 @@ menu "iMX.6 Peripheral Selection"
config IMX6_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
config IMX6_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
config IMX6_UART3
bool "UART3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
config IMX6_UART4
bool "UART4"
default n
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
config IMX6_UART5
bool "UART5"
default n
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
config IMX6_SPI1
bool "SPI1"
arch/arm/src/kinetis/Kconfig
+6 -6
View File
@@ -131,42 +131,42 @@ config KINETIS_FLEXBUS
config KINETIS_UART0
bool "UART0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
---help---
Support UART0
config KINETIS_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
---help---
Support UART1
config KINETIS_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
---help---
Support UART2
config KINETIS_UART3
bool "UART3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
---help---
Support UART3
config KINETIS_UART4
bool "UART4"
default n
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
---help---
Support UART4
config KINETIS_UART5
bool "UART5"
default n
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
---help---
Support UART5
arch/arm/src/kl/Kconfig
+3 -3
View File
@@ -47,21 +47,21 @@ config KL_FLEXBUS
config KL_UART0
bool "UART0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
---help---
Support UART0
config KL_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
---help---
Support UART1
config KL_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
---help---
Support UART2
arch/arm/src/lpc11xx/Kconfig
+1 -1
View File
@@ -55,7 +55,7 @@ config LPC11_PLL
config LPC11_UART0
bool "UART0"
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
default y
config LPC11_CAN0
arch/arm/src/lpc17xx/Kconfig
+6 -6
View File
@@ -172,36 +172,36 @@ config LPC17_SDCARD
config LPC17_UART0
bool "UART0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC17_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC17_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC17_UART3
bool "UART3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC17_UART4
bool "UART4"
default n
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC17_CAN1
bool "CAN1"
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
default n
config LPC17_CAN2
arch/arm/src/lpc214x/Kconfig
+2 -2
View File
@@ -92,12 +92,12 @@ menu "LPC214x Peripheral Support"
config LPC214X_UART0
bool
default y
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
config LPC214X_UART1
bool
default y
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
config LPC214X_USBDEV
bool "USB Device"
arch/arm/src/lpc2378/Kconfig
+4 -4
View File
@@ -118,22 +118,22 @@ menu "LPC2378 Peripheral Support"
config LPC2378_UART0
bool "UART0"
default n
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
config LPC2378_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
config LPC2378_UART2
bool "UART2"
default n
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
config LPC2378_UART3
bool "UART3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
config LPC2378_USBDEV
bool "USB Device"
arch/arm/src/lpc31xx/Kconfig
+1 -1
View File
@@ -51,7 +51,7 @@ menu "LPC31xx Peripheral Support"
config LPC31_UART
bool "UART"
default n
select ARCH_HAVE_UART
select UART_SERIALDRIVER
config LPC31_SPI
bool "SPI"
arch/arm/src/lpc43xx/Kconfig
+4 -4
View File
@@ -274,25 +274,25 @@ config LPC43_TMR3
config LPC43_USART0
bool "USART0"
default n
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC43_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC43_USART2
bool "USART2"
default n
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC43_USART3
bool "USART3"
default n
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config LPC43_USBOTG
arch/arm/src/nuc1xx/Kconfig
+3 -3
View File
@@ -314,20 +314,20 @@ config NUC_PWM7
config NUC_UART0
bool "UART0"
default y
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config NUC_UART1
bool "UART1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config NUC_UART2
bool "UART2"
default n
depends on NUC_HAVE_UART2
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config NUC_USBD
arch/arm/src/sam34/Kconfig
+7 -7
View File
@@ -453,7 +453,7 @@ config SAM34_PICOUART
bool "PicoUART"
default n
depends on ARCH_CHIP_SAM4L
select ARCH_HAVE_UART
select UART_SERIALDRIVER
config SAM34_PWM
bool "Pulse Width Modulation (PWM) Controller"
@@ -609,14 +609,14 @@ config SAM34_UART0
bool "UART 0"
default y
depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4CM || ARCH_CHIP_SAM4S || ARCH_CHIP_SAM4E
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAM34_UART1
bool "UART 1"
default n
depends on ARCH_CHIP_SAM4CM || ARCH_CHIP_SAM4S || ARCH_CHIP_SAM4E
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
if SAM34_UART1 && ARCH_CHIP_SAM4CM
@@ -651,27 +651,27 @@ config SAM34_USBC
config SAM34_USART0
bool "USART 0"
default n
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAM34_USART1
bool "USART 1"
default n
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAM34_USART2
bool "USART 2"
default n
depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4CM || ARCH_CHIP_SAM4L
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAM34_USART3
bool "USART 3"
default n
depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4CM || ARCH_CHIP_SAM4L
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAM34_WDT
arch/arm/src/sam34/sam_lowputc.c
+4 -4
View File
@@ -75,16 +75,16 @@
* for our purposes.
*/
#ifndef CONFIG_USART0_ISUART
#ifndef CONFIG_USART0_SERIALDRIVER
# undef CONFIG_SAM34_USART0
#endif
#ifndef CONFIG_USART1_ISUART
#ifndef CONFIG_USART1_SERIALDRIVER
# undef CONFIG_SAM34_USART1
#endif
#ifndef CONFIG_USART2_ISUART
#ifndef CONFIG_USART2_SERIALDRIVER
# undef CONFIG_SAM34_USART2
#endif
#ifndef CONFIG_USART3_ISUART
#ifndef CONFIG_USART3_SERIALDRIVER
# undef CONFIG_SAM34_USART3
#endif
arch/arm/src/sam34/sam_serial.c
+4 -4
View File
@@ -84,16 +84,16 @@
* for our purposes.
*/
#ifndef CONFIG_USART0_ISUART
#ifndef CONFIG_USART0_SERIALDRIVER
# undef CONFIG_SAM34_USART0
#endif
#ifndef CONFIG_USART1_ISUART
#ifndef CONFIG_USART1_SERIALDRIVER
# undef CONFIG_SAM34_USART1
#endif
#ifndef CONFIG_USART2_ISUART
#ifndef CONFIG_USART2_SERIALDRIVER
# undef CONFIG_SAM34_USART2
#endif
#ifndef CONFIG_USART3_ISUART
#ifndef CONFIG_USART3_SERIALDRIVER
# undef CONFIG_SAM34_USART3
#endif
arch/arm/src/sama5/Kconfig
+16 -16
View File
@@ -387,7 +387,7 @@ config SAMA5_AESB
config SAMA5_DBGU
bool "Debug Unit (DBGU)"
default n
select ARCH_HAVE_OTHER_UART
select OTHER_UART_SERIALDRIVER
config SAMA5_PIT
bool "Periodic Interval Timer (PIT)"
@@ -432,70 +432,70 @@ config SAMA5_UART0
bool "UART 0"
default y
depends on SAMA5_HAVE_UART0
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_UART1
bool "UART 1"
default n
depends on SAMA5_HAVE_UART1
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_UART2
bool "UART 2"
default n
depends on SAMA5_HAVE_UART2
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_UART3
bool "UART 3"
default n
depends on SAMA5_HAVE_UART3
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_UART4
bool "UART 4"
default n
depends on SAMA5_HAVE_UART4
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_USART0
bool "USART 0"
default n
depends on SAMA5_HAVE_USART0
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_USART1
bool "USART 1"
default n
depends on SAMA5_HAVE_USART1
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_USART2
bool "USART 2"
default n
depends on SAMA5_HAVE_USART2
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_USART3
bool "USART 3"
default n
depends on SAMA5_HAVE_USART3
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_USART4
bool "USART 4"
default n
depends on SAMA5_HAVE_USART4
select ARCH_HAVE_USART4
select USART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM0
@@ -786,7 +786,7 @@ choice
config SAMA5_FLEXCOM0_USART
bool "USART"
select SAMA5_FLEXCOM_USART
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM0_SPI
@@ -807,7 +807,7 @@ choice
config SAMA5_FLEXCOM1_USART
bool "USART"
select SAMA5_FLEXCOM_USART
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM1_SPI
@@ -828,7 +828,7 @@ choice
config SAMA5_FLEXCOM2_USART
bool "USART"
select SAMA5_FLEXCOM_USART
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM2_SPI
@@ -853,7 +853,7 @@ config SAMA5_FLEXCOM3_USART
config SAMA5_FLEXCOM3_SPI
bool "SPI"
select SAMA5_FLEXCOM_SPI
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM3_SPI
@@ -870,7 +870,7 @@ choice
config SAMA5_FLEXCOM4_USART
bool "USART"
select SAMA5_FLEXCOM_USART
select ARCH_HAVE_USART4
select USART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMA5_FLEXCOM4_SPI
arch/arm/src/sama5/sam_config.h
+10 -10
View File
@@ -52,27 +52,27 @@
* for our purposes.
*/
#ifndef CONFIG_USART0_ISUART
#ifndef CONFIG_USART0_SERIALDRIVER
# undef CONFIG_SAMA5_USART0
# undef CONFIG_SAMA5_FLEXCOM0_USART
# undef CONFIG_USART0_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART1_ISUART
#ifndef CONFIG_USART1_SERIALDRIVER
# undef CONFIG_SAMA5_USART1
# undef CONFIG_SAMA5_FLEXCOM1_USART
# undef CONFIG_USART1_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART2_ISUART
#ifndef CONFIG_USART2_SERIALDRIVER
# undef CONFIG_SAMA5_USART2
# undef CONFIG_SAMA5_FLEXCOM2_USART
# undef CONFIG_USART2_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART3_ISUART
#ifndef CONFIG_USART3_SERIALDRIVER
# undef CONFIG_SAMA5_USART3
# undef CONFIG_SAMA5_FLEXCOM3_USART
# undef CONFIG_USART3_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART4_ISUART
#ifndef CONFIG_USART4_SERIALDRIVER
# undef CONFIG_SAMA5_USART4
# undef CONFIG_SAMA5_FLEXCOM4_USART
# undef CONFIG_USART4_SERIAL_CONSOLE
@@ -212,7 +212,7 @@
# define SAMA5_HAVE_UART_CONSOLE 1
# undef SAMA5_HAVE_USART_CONSOLE
# undef SAMA5_HAVE_FLEXCOM_CONSOLE
#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_USART0_ISUART)
#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_USART0_SERIALDRIVER)
# undef CONFIG_SAMA5_DBGU_CONSOLE
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
@@ -227,7 +227,7 @@
# undef SAMA5_HAVE_UART_CONSOLE
# define SAMA5_HAVE_USART_CONSOLE 1
# undef SAMA5_HAVE_FLEXCOM_CONSOLE
#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_USART1_ISUART)
#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_USART1_SERIALDRIVER)
# undef CONFIG_SAMA5_DBGU_CONSOLE
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
@@ -242,7 +242,7 @@
# undef SAMA5_HAVE_UART_CONSOLE
# define SAMA5_HAVE_USART_CONSOLE 1
# undef SAMA5_HAVE_FLEXCOM_CONSOLE
#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_USART2_ISUART)
#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_USART2_SERIALDRIVER)
# undef CONFIG_SAMA5_DBGU_CONSOLE
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
@@ -257,7 +257,7 @@
# undef SAMA5_HAVE_UART_CONSOLE
# define SAMA5_HAVE_USART_CONSOLE 1
# undef SAMA5_HAVE_FLEXCOM_CONSOLE
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_USART3_ISUART)
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_USART3_SERIALDRIVER)
# undef CONFIG_SAMA5_DBGU_CONSOLE
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
@@ -272,7 +272,7 @@
# undef SAMA5_HAVE_UART_CONSOLE
# define SAMA5_HAVE_USART_CONSOLE 1
# undef SAMA5_HAVE_FLEXCOM_CONSOLE
#elif defined(CONFIG_USART4_SERIAL_CONSOLE) && defined(CONFIG_USART4_ISUART)
#elif defined(CONFIG_USART4_SERIAL_CONSOLE) && defined(CONFIG_USART4_SERIALDRIVER)
# undef CONFIG_SAMA5_DBGU_CONSOLE
# undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE
arch/arm/src/sama5/sam_flexcom_serial.c
+39 -39
View File
@@ -120,19 +120,19 @@
# define FLEXUS4_ASSIGNED 1
#else
# undef CONSOLE_DEV /* No console */
# if defined(CONFIG_USART0_ISUART)
# if defined(CONFIG_USART0_SERIALDRIVER)
# define TTYFC0_DEV g_flexus0port /* FLEXUS0 is ttyFC0 */
# define FLEXUS0_ASSIGNED 1
# elif defined(CONFIG_USART1_ISUART)
# elif defined(CONFIG_USART1_SERIALDRIVER)
# define TTYFC0_DEV g_flexus1port /* FLEXUS1 is ttyFC0 */
# define FLEXUS1_ASSIGNED 1
# elif defined(CONFIG_USART2_ISUART)
# elif defined(CONFIG_USART2_SERIALDRIVER)
# define TTYFC0_DEV g_flexus2port /* FLEXUS2 is ttyFC0 */
# define FLEXUS2_ASSIGNED 1
# elif defined(CONFIG_USART3_ISUART)
# elif defined(CONFIG_USART3_SERIALDRIVER)
# define TTYFC0_DEV g_flexus3port /* FLEXUS3 is ttyFC0 */
# define FLEXUS3_ASSIGNED 1
# elif defined(CONFIG_USART4_ISUART)
# elif defined(CONFIG_USART4_SERIALDRIVER)
# define TTYFC0_DEV g_flexus4port /* FLEXUS4 is ttyFC0 */
# define FLEXUS4_ASSIGNED 4
# endif
@@ -140,19 +140,19 @@
/* Pick ttyFC1. This could be any of USART0-4 excluding the console UART. */
#if defined(CONFIG_USART0_ISUART) && !defined(FLEXUS0_ASSIGNED)
#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(FLEXUS0_ASSIGNED)
# define TTYFC1_DEV g_flexus0port /* FLEXUS0 is ttyFC1 */
# define FLEXUS0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(FLEXUS1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED)
# define TTYFC1_DEV g_flexus1port /* FLEXUS1 is ttyFC1 */
# define FLEXUS1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
# define TTYFC1_DEV g_flexus2port /* FLEXUS2 is ttyFC1 */
# define FLEXUS2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
# define TTYFC1_DEV g_flexus3port /* FLEXUS3 is ttyFC1 */
# define FLEXUS3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(FLEXUS4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED)
# define TTYFC1_DEV g_flexus4port /* FLEXUS4 is ttyFC1 */
# define FLEXUS4_ASSIGNED 1
#endif
@@ -162,16 +162,16 @@
* could also be the console.
*/
#if defined(CONFIG_USART1_ISUART) && !defined(FLEXUS1_ASSIGNED)
#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(FLEXUS1_ASSIGNED)
# define TTYFC2_DEV g_flexus1port /* FLEXUS1 is ttyFC2 */
# define FLEXUS1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
# define TTYFC2_DEV g_flexus2port /* FLEXUS2 is ttyFC2 */
# define FLEXUS2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
# define TTYFC2_DEV g_flexus3port /* FLEXUS3 is ttyFC2 */
# define FLEXUS3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYFC2_DEV g_flexus4port /* FLEXUS4 is ttyFC2 */
# define FLEXUS4_ASSIGNED 1
#endif
@@ -181,13 +181,13 @@
* FLEXUS2-4 could also be the console.
*/
#if defined(CONFIG_USART2_ISUART) && !defined(FLEXUS2_ASSIGNED)
#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(FLEXUS2_ASSIGNED)
# define TTYFC3_DEV g_flexus2port /* FLEXUS2 is ttyFC3 */
# define FLEXUS2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(FLEXUS3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(FLEXUS3_ASSIGNED)
# define TTYFC3_DEV g_flexus3port /* FLEXUS3 is ttyFC3 */
# define FLEXUS3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(FLEXUS4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(FLEXUS4_ASSIGNED)
# define TTYFC3_DEV g_flexus4port /* FLEXUS4 is ttyFC3 */
# define FLEXUS4_ASSIGNED 1
#endif
@@ -197,10 +197,10 @@
* USART3-4 could also be the console.
*/
#if defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYFC4_DEV g_flexus3port /* USART3 is ttyFC4 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYFC4_DEV g_flexus4port /* USART4 is ttyFC4 */
# define USART4_ASSIGNED 1
#endif
@@ -234,19 +234,19 @@ struct flexus_dev_s
****************************************************************************/
static int flexus_interrupt(struct uart_dev_s *dev);
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static int flexus0_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static int flexus1_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static int flexus2_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static int flexus3_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static int flexus4_interrupt(int irq, void *context);
#endif
@@ -288,30 +288,30 @@ static const struct uart_ops_s g_flexus_ops =
/* I/O buffers */
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static char g_flexus0rxbuffer[CONFIG_USART0_RXBUFSIZE];
static char g_flexus0txbuffer[CONFIG_USART0_TXBUFSIZE];
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static char g_flexus1rxbuffer[CONFIG_USART1_RXBUFSIZE];
static char g_flexus1txbuffer[CONFIG_USART1_TXBUFSIZE];
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static char g_flexus2rxbuffer[CONFIG_USART2_RXBUFSIZE];
static char g_flexus2txbuffer[CONFIG_USART2_TXBUFSIZE];
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static char g_flexus3rxbuffer[CONFIG_USART3_RXBUFSIZE];
static char g_flexus3txbuffer[CONFIG_USART3_TXBUFSIZE];
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static char g_flexus4rxbuffer[CONFIG_USART4_RXBUFSIZE];
static char g_flexus4txbuffer[CONFIG_USART4_TXBUFSIZE];
#endif
/* This describes the state of the USART0 port. */
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static struct flexus_dev_s g_flexus0priv =
{
.handler = flexus0_interrupt,
@@ -345,7 +345,7 @@ static uart_dev_t g_flexus0port =
/* This describes the state of the USART1 port. */
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static struct flexus_dev_s g_flexus1priv =
{
.handler = flexus1_interrupt,
@@ -379,7 +379,7 @@ static uart_dev_t g_flexus1port =
/* This describes the state of the USART2 port. */
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static struct flexus_dev_s g_flexus2priv =
{
.handler = flexus2_interrupt,
@@ -413,7 +413,7 @@ static uart_dev_t g_flexus2port =
/* This describes the state of the USART3 port. */
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static struct flexus_dev_s g_flexus3priv =
{
.handler = flexus3_interrupt,
@@ -447,7 +447,7 @@ static uart_dev_t g_flexus3port =
/* This describes the state of the USART4 port. */
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static struct flexus_dev_s g_flexus4priv =
{
.handler = flexus4_interrupt,
@@ -613,31 +613,31 @@ static int flexus_interrupt(struct uart_dev_s *dev)
*
****************************************************************************/
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static int flexus0_interrupt(int irq, void *context)
{
return flexus_interrupt(&g_flexus0port);
}
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static int flexus1_interrupt(int irq, void *context)
{
return flexus_interrupt(&g_flexus1port);
}
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static int flexus2_interrupt(int irq, void *context)
{
return flexus_interrupt(&g_flexus2port);
}
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static int flexus3_interrupt(int irq, void *context)
{
return flexus_interrupt(&g_flexus3port);
}
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static int flexus4_interrupt(int irq, void *context)
{
return flexus_interrupt(&g_flexus4port);
arch/arm/src/sama5/sam_lowputc.c
+11 -11
View File
@@ -379,7 +379,7 @@ void sam_lowsetup(void)
#ifdef CONFIG_SAMA5_UART4
sam_uart4_enableclk();
#endif
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
sam_usart0_enableclk();
#endif
#ifdef CONFIG_SAMA5_USART1
@@ -436,7 +436,7 @@ void sam_lowsetup(void)
(void)sam_configpio(PIO_UART4_TXD);
#endif
#if defined(CONFIG_USART0_ISUART) && defined(CONFIG_SAMA5_USART0)
#if defined(CONFIG_USART0_SERIALDRIVER) && defined(CONFIG_SAMA5_USART0)
(void)sam_configpio(PIO_USART0_RXD);
(void)sam_configpio(PIO_USART0_TXD);
#ifdef CONFIG_USART0_OFLOWCONTROL
@@ -447,7 +447,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART1_ISUART) && defined(CONFIG_SAMA5_USART1)
#if defined(CONFIG_USART1_SERIALDRIVER) && defined(CONFIG_SAMA5_USART1)
(void)sam_configpio(PIO_USART1_RXD);
(void)sam_configpio(PIO_USART1_TXD);
#ifdef CONFIG_USART1_OFLOWCONTROL
@@ -458,7 +458,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART2_ISUART) && defined(CONFIG_SAMA5_USART2)
#if defined(CONFIG_USART2_SERIALDRIVER) && defined(CONFIG_SAMA5_USART2)
(void)sam_configpio(PIO_USART2_RXD);
(void)sam_configpio(PIO_USART2_TXD);
#ifdef CONFIG_USART2_OFLOWCONTROL
@@ -469,7 +469,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART3_ISUART) && defined(CONFIG_SAMA5_USART3)
#if defined(CONFIG_USART3_SERIALDRIVER) && defined(CONFIG_SAMA5_USART3)
(void)sam_configpio(PIO_USART3_RXD);
(void)sam_configpio(PIO_USART3_TXD);
#ifdef CONFIG_USART3_OFLOWCONTROL
@@ -480,7 +480,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART4_ISUART) && defined(CONFIG_SAMA5_USART4)
#if defined(CONFIG_USART4_SERIALDRIVER) && defined(CONFIG_SAMA5_USART4)
(void)sam_configpio(PIO_USART4_RXD);
(void)sam_configpio(PIO_USART4_TXD);
#ifdef CONFIG_USART4_OFLOWCONTROL
@@ -500,7 +500,7 @@ void sam_lowsetup(void)
* FLEXCOM_IO4 = RTS
*/
#if defined(CONFIG_USART0_ISUART) && defined(CONFIG_SAMA5_FLEXCOM0_USART)
#if defined(CONFIG_USART0_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM0_USART)
(void)sam_configpio(PIO_FLEXCOM0_IO0);
(void)sam_configpio(PIO_FLEXCOM0_IO1);
#ifdef CONFIG_USART0_OFLOWCONTROL
@@ -511,7 +511,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART1_ISUART) && defined(CONFIG_SAMA5_FLEXCOM1_USART)
#if defined(CONFIG_USART1_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM1_USART)
(void)sam_configpio(PIO_FLEXCOM1_IO0);
(void)sam_configpio(PIO_FLEXCOM1_IO1);
#ifdef CONFIG_USART1_OFLOWCONTROL
@@ -522,7 +522,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART2_ISUART) && defined(CONFIG_SAMA5_FLEXCOM2_USART)
#if defined(CONFIG_USART2_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM2_USART)
(void)sam_configpio(PIO_FLEXCOM2_IO0);
(void)sam_configpio(PIO_FLEXCOM2_IO1);
#ifdef CONFIG_USART2_OFLOWCONTROL
@@ -533,7 +533,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART3_ISUART) && defined(CONFIG_SAMA5_FLEXCOM3_USART)
#if defined(CONFIG_USART3_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM3_USART)
(void)sam_configpio(PIO_FLEXCOM3_IO0);
(void)sam_configpio(PIO_FLEXCOM3_IO1);
#ifdef CONFIG_USART3_OFLOWCONTROL
@@ -544,7 +544,7 @@ void sam_lowsetup(void)
#endif
#endif
#if defined(CONFIG_USART4_ISUART) && defined(CONFIG_SAMA5_FLEXCOM4_USART)
#if defined(CONFIG_USART4_SERIALDRIVER) && defined(CONFIG_SAMA5_FLEXCOM4_USART)
(void)sam_configpio(PIO_FLEXCOM4_IO0);
(void)sam_configpio(PIO_FLEXCOM4_IO1);
#ifdef CONFIG_USART4_OFLOWCONTROL
arch/arm/src/sama5/sam_serial.c
+64 -64
View File
@@ -167,19 +167,19 @@
# elif defined(CONFIG_SAMA5_UART4)
# define TTYS0_DEV g_uart1port /* UART4 is ttyS0 */
# define UART4_ASSIGNED 1
# elif defined(CONFIG_USART0_ISUART)
# elif defined(CONFIG_USART0_SERIALDRIVER)
# define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */
# define USART0_ASSIGNED 1
# elif defined(CONFIG_USART1_ISUART)
# elif defined(CONFIG_USART1_SERIALDRIVER)
# define TTYS0_DEV g_usart1port /* USART1 is ttyS0 */
# define USART1_ASSIGNED 1
# elif defined(CONFIG_USART2_ISUART)
# elif defined(CONFIG_USART2_SERIALDRIVER)
# define TTYS0_DEV g_usart2port /* USART2 is ttyS0 */
# define USART2_ASSIGNED 1
# elif defined(CONFIG_USART3_ISUART)
# elif defined(CONFIG_USART3_SERIALDRIVER)
# define TTYS0_DEV g_usart3port /* USART3 is ttyS0 */
# define USART3_ASSIGNED 1
# elif defined(CONFIG_USART4_ISUART)
# elif defined(CONFIG_USART4_SERIALDRIVER)
# define TTYS0_DEV g_usart4port /* USART4 is ttyS0 */
# define USART4_ASSIGNED 4
# endif
@@ -202,19 +202,19 @@
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS1_DEV g_uart1port /* UART4 is ttyS1 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS1_DEV g_usart3port /* USART3 is ttyS1 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS1_DEV g_usart4port /* USART4 is ttyS1 */
# define USART4_ASSIGNED 1
#endif
@@ -236,19 +236,19 @@
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS2_DEV g_uart1port /* UART4 is ttyS2 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS2_DEV g_usart0port /* USART0 is ttyS2 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS2_DEV g_usart1port /* USART1 is ttyS2 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS2_DEV g_usart3port /* USART3 is ttyS2 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS2_DEV g_usart4port /* USART4 is ttyS2 */
# define USART4_ASSIGNED 1
#endif
@@ -267,19 +267,19 @@
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS3_DEV g_uart1port /* UART4 is ttyS3 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS3_DEV g_usart0port /* USART0 is ttyS3 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS3_DEV g_usart1port /* USART1 is ttyS3 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS3_DEV g_usart2port /* USART2 is ttyS3 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS3_DEV g_usart3port /* USART3 is ttyS3 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS3_DEV g_usart4port /* USART4 is ttyS3 */
# define USART4_ASSIGNED 1
#endif
@@ -295,19 +295,19 @@
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS4_DEV g_uart1port /* UART4 is ttyS4 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS4_DEV g_usart0port /* USART0 is ttyS4 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS4_DEV g_usart1port /* USART1 is ttyS4 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS4_DEV g_usart2port /* USART2 is ttyS4 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS4_DEV g_usart3port /* USART3 is ttyS4 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS4_DEV g_usart4port /* USART4 is ttyS4 */
# define USART4_ASSIGNED 1
#endif
@@ -320,19 +320,19 @@
#if defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS5_DEV g_uart4port /* UART4 is ttyS5 */
# define UART1_ASSIGNED 1
#elif defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS5_DEV g_usart0port /* USART0 is ttyS5 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS5_DEV g_usart1port /* USART1 is ttyS5 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS5_DEV g_usart2port /* USART2 is ttyS5 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS5_DEV g_usart3port /* USART3 is ttyS5 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS5_DEV g_usart4port /* USART4 is ttyS5 */
# define USART4_ASSIGNED 1
#endif
@@ -342,19 +342,19 @@
* could also be the console.
*/
#if defined(CONFIG_USART0_ISUART) && !defined(USART0_ASSIGNED)
#if defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS6_DEV g_usart0port /* USART0 is ttyS6 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#elif defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS6_DEV g_usart1port /* USART1 is ttyS6 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS6_DEV g_usart2port /* USART2 is ttyS6 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS6_DEV g_usart3port /* USART3 is ttyS6 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS6_DEV g_usart4port /* USART4 is ttyS6 */
# define USART4_ASSIGNED 1
#endif
@@ -364,16 +364,16 @@
* USART1-4 could also be the console.
*/
#if defined(CONFIG_USART1_ISUART) && !defined(USART1_ASSIGNED)
#if defined(CONFIG_USART1_SERIALDRIVER) && !defined(USART1_ASSIGNED)
# define TTYS7_DEV g_usart1port /* USART1 is ttyS7 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#elif defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS7_DEV g_usart2port /* USART2 is ttyS7 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS7_DEV g_usart3port /* USART3 is ttyS7 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS7_DEV g_usart4port /* USART4 is ttyS7 */
# define USART4_ASSIGNED 1
#endif
@@ -383,13 +383,13 @@
* USART2-4 could also be the console.
*/
#if defined(CONFIG_USART2_ISUART) && !defined(USART2_ASSIGNED)
#if defined(CONFIG_USART2_SERIALDRIVER) && !defined(USART2_ASSIGNED)
# define TTYS8_DEV g_usart2port /* USART2 is ttyS8 */
# define USART2_ASSIGNED 1
#elif defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#elif defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS8_DEV g_usart3port /* USART3 is ttyS8 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS8_DEV g_usart4port /* USART4 is ttyS8 */
# define USART4_ASSIGNED 1
#endif
@@ -399,10 +399,10 @@
* USART3-4 could also be the console.
*/
#if defined(CONFIG_USART3_ISUART) && !defined(USART3_ASSIGNED)
#if defined(CONFIG_USART3_SERIALDRIVER) && !defined(USART3_ASSIGNED)
# define TTYS9_DEV g_usart3port /* USART3 is ttyS9 */
# define USART3_ASSIGNED 1
#elif defined(CONFIG_USART4_ISUART) && !defined(USART4_ASSIGNED)
#elif defined(CONFIG_USART4_SERIALDRIVER) && !defined(USART4_ASSIGNED)
# define TTYS9_DEV g_usart4port /* USART4 is ttyS9 */
# define USART4_ASSIGNED 1
#endif
@@ -451,19 +451,19 @@ static int up_uart3_interrupt(int irq, void *context);
#ifdef CONFIG_SAMA5_UART4
static int up_uart4_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static int up_usart0_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static int up_usart1_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static int up_usart2_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static int up_usart3_interrupt(int irq, void *context);
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static int up_usart4_interrupt(int irq, void *context);
#endif
@@ -525,23 +525,23 @@ static char g_uart3txbuffer[CONFIG_UART3_TXBUFSIZE];
static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
#endif
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static char g_usart3rxbuffer[CONFIG_USART3_RXBUFSIZE];
static char g_usart3txbuffer[CONFIG_USART3_TXBUFSIZE];
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static char g_usart4rxbuffer[CONFIG_USART4_RXBUFSIZE];
static char g_usart4txbuffer[CONFIG_USART4_TXBUFSIZE];
#endif
@@ -753,7 +753,7 @@ static uart_dev_t g_uart4port =
/* This describes the state of the USART0 port. */
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static struct up_dev_s g_usart0priv =
{
.handler = up_usart0_interrupt,
@@ -787,7 +787,7 @@ static uart_dev_t g_usart0port =
/* This describes the state of the USART1 port. */
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static struct up_dev_s g_usart1priv =
{
.handler = up_usart1_interrupt,
@@ -821,7 +821,7 @@ static uart_dev_t g_usart1port =
/* This describes the state of the USART2 port. */
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static struct up_dev_s g_usart2priv =
{
.handler = up_usart2_interrupt,
@@ -855,7 +855,7 @@ static uart_dev_t g_usart2port =
/* This describes the state of the USART3 port. */
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static struct up_dev_s g_usart3priv =
{
.handler = up_usart3_interrupt,
@@ -889,7 +889,7 @@ static uart_dev_t g_usart3port =
/* This describes the state of the USART4 port. */
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static struct up_dev_s g_usart4priv =
{
.handler = up_usart4_interrupt,
@@ -1073,31 +1073,31 @@ static int up_uart4_interrupt(int irq, void *context)
return up_interrupt(&g_uart4port);
}
#endif
#ifdef CONFIG_USART0_ISUART
#ifdef CONFIG_USART0_SERIALDRIVER
static int up_usart0_interrupt(int irq, void *context)
{
return up_interrupt(&g_usart0port);
}
#endif
#ifdef CONFIG_USART1_ISUART
#ifdef CONFIG_USART1_SERIALDRIVER
static int up_usart1_interrupt(int irq, void *context)
{
return up_interrupt(&g_usart1port);
}
#endif
#ifdef CONFIG_USART2_ISUART
#ifdef CONFIG_USART2_SERIALDRIVER
static int up_usart2_interrupt(int irq, void *context)
{
return up_interrupt(&g_usart2port);
}
#endif
#ifdef CONFIG_USART3_ISUART
#ifdef CONFIG_USART3_SERIALDRIVER
static int up_usart3_interrupt(int irq, void *context)
{
return up_interrupt(&g_usart3port);
}
#endif
#ifdef CONFIG_USART4_ISUART
#ifdef CONFIG_USART4_SERIALDRIVER
static int up_usart4_interrupt(int irq, void *context)
{
return up_interrupt(&g_usart4port);
arch/arm/src/sama5/sam_twi.c
+1 -1
View File
@@ -1200,7 +1200,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency)
/* Set the initial TWI data transfer frequency */
priv->frequency = 0
priv->frequency = 0;
twi_setfrequency(priv, frequency);
/* Enable Interrupts */
arch/arm/src/samdl/Kconfig
+6 -12
View File
@@ -589,8 +589,7 @@ config SAMDL_SERCOM0_ISSPI
config SAMDL_SERCOM0_ISUSART
bool "USART"
select ARCH_HAVE_USART0
select USART0_ISUART
select USART0_SERIALDRIVER
endchoice
@@ -623,8 +622,7 @@ config SAMDL_SERCOM1_ISSPI
config SAMDL_SERCOM1_ISUSART
bool "USART"
select ARCH_HAVE_USART1
select USART1_ISUART
select USART1_SERIALDRIVER
endchoice
@@ -643,8 +641,7 @@ config SAMDL_SERCOM2_ISSPI
config SAMDL_SERCOM2_ISUSART
bool "USART"
select ARCH_HAVE_USART2
select USART2_ISUART
select USART2_SERIALDRIVER
endchoice
@@ -663,8 +660,7 @@ config SAMDL_SERCOM3_ISSPI
config SAMDL_SERCOM3_ISUSART
bool "USART"
select ARCH_HAVE_USART3
select USART3_ISUART
select USART3_SERIALDRIVER
endchoice
@@ -683,8 +679,7 @@ config SAMDL_SERCOM4_ISSPI
config SAMDL_SERCOM4_ISUSART
bool "USART"
select ARCH_HAVE_USART4
select USART4_ISUART
select USART4_SERIALDRIVER
endchoice
@@ -703,8 +698,7 @@ config SAMDL_SERCOM5_ISSPI
config SAMDL_SERCOM5_ISUSART
bool "USART"
select ARCH_HAVE_USART5
select USART5_ISUART
select USART5_SERIALDRIVER
endchoice
arch/arm/src/samdl/sam_config.h
+6 -6
View File
@@ -56,7 +56,7 @@
#define SAMDL_HAVE_USART5 1
#if !defined(CONFIG_SAMDL_SERCOM0) || !defined(CONFIG_SAMDL_SERCOM0_ISUSART) || \
!defined(CONFIG_USART0_ISUART)
!defined(CONFIG_USART0_SERIALDRIVER)
# undef SAMDL_HAVE_USART0
# undef CONFIG_SAMDL_SERCOM0_ISUSART
# undef CONFIG_USART0_SERIAL_CONSOLE
@@ -66,7 +66,7 @@
#endif
#if !defined(CONFIG_SAMDL_SERCOM1) || !defined(CONFIG_SAMDL_SERCOM1_ISUSART) || \
!defined(CONFIG_USART1_ISUART)
!defined(CONFIG_USART1_SERIALDRIVER)
# undef SAMDL_HAVE_USART1
# undef CONFIG_SAMDL_SERCOM1_ISUSART
# undef CONFIG_USART1_SERIAL_CONSOLE
@@ -76,7 +76,7 @@
#endif
#if !defined(CONFIG_SAMDL_SERCOM2) || !defined(CONFIG_SAMDL_SERCOM2_ISUSART) || \
!defined(CONFIG_USART2_ISUART)
!defined(CONFIG_USART2_SERIALDRIVER)
# undef SAMDL_HAVE_USART2
# undef CONFIG_SAMDL_SERCOM2_ISUSART
# undef CONFIG_USART2_SERIAL_CONSOLE
@@ -86,7 +86,7 @@
#endif
#if !defined(CONFIG_SAMDL_SERCOM3) || !defined(CONFIG_SAMDL_SERCOM3_ISUSART) || \
!defined(CONFIG_USART3_ISUART)
!defined(CONFIG_USART3_SERIALDRIVER)
# undef SAMDL_HAVE_USART3
# undef CONFIG_SAMDL_SERCOM3_ISUSART
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -96,7 +96,7 @@
#endif
#if !defined(CONFIG_SAMDL_SERCOM4) || !defined(CONFIG_SAMDL_SERCOM4_ISUSART) || \
!defined(CONFIG_USART4_ISUART)
!defined(CONFIG_USART4_SERIALDRIVER)
# undef SAMDL_HAVE_USART4
# undef CONFIG_SAMDL_SERCOM4_ISUSART
# undef CONFIG_USART4_SERIAL_CONSOLE
@@ -106,7 +106,7 @@
#endif
#if !defined(CONFIG_SAMDL_SERCOM5) || !defined(CONFIG_SAMDL_SERCOM5_ISUSART) || \
!defined(CONFIG_USART5_ISUART)
!defined(CONFIG_USART5_SERIALDRIVER)
# undef SAMDL_HAVE_USART5
# undef CONFIG_SAMDL_SERCOM5_ISUSART
# undef CONFIG_USART5_SERIAL_CONSOLE
arch/arm/src/samv7/Kconfig
+8 -8
View File
@@ -465,31 +465,31 @@ config SAMV7_TWIHS2
config SAMV7_UART0
bool "UART 0"
default y
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_UART1
bool "UART 1"
default n
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_UART2
bool "UART 2"
default y
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_UART3
bool "UART 3"
default n
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_UART4
bool "UART 4"
default y
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_USBDEVFS
@@ -520,21 +520,21 @@ config SAMV7_USART0
bool "USART 0"
default n
depends on SAMV7_HAVE_USART0
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_USART1
bool "USART 1"
default n
depends on SAMV7_HAVE_USART1
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_USART2
bool "USART 2"
default n
depends on SAMV7_HAVE_USART2
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config SAMV7_WDT
arch/arm/src/samv7/sam_config.h
+3 -3
View File
@@ -113,19 +113,19 @@
* enabled for our purposes.
*/
#if !defined(CONFIG_USART0_ISUART) && !defined(CONFIG_USART0_ISSPI)
#if !defined(CONFIG_USART0_SERIALDRIVER) && !defined(CONFIG_USART0_ISSPI)
# undef CONFIG_SAMV7_USART0
# undef CONFIG_USART0_SERIAL_CONSOLE
# undef CONFIG_USART0_IFLOWCONTROL
#endif
#if !defined(CONFIG_USART1_ISUART) && !defined(CONFIG_USART1_ISSPI)
#if !defined(CONFIG_USART1_SERIALDRIVER) && !defined(CONFIG_USART1_ISSPI)
# undef CONFIG_SAMV7_USART1
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART1_IFLOWCONTROL
#endif
#if !defined(CONFIG_USART2_ISUART) && !defined(CONFIG_USART2_ISSPI)
#if !defined(CONFIG_USART2_SERIALDRIVER) && !defined(CONFIG_USART2_ISSPI)
# undef CONFIG_SAMV7_USART2
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART2_IFLOWCONTROL
arch/arm/src/samv7/sam_serial.c
+35 -35
View File
@@ -123,13 +123,13 @@
# elif defined(CONFIG_SAMV7_UART4)
# define TTYS0_DEV g_uart4port /* UART4 is ttyS0 */
# define UART4_ASSIGNED 1
# elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
# elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
# define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */
# define USART0_ASSIGNED 1
# elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
# elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
# define TTYS0_DEV g_usart1port /* USART1 is ttyS0 */
# define USART1_ASSIGNED 1
# elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
# elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
# define TTYS0_DEV g_usart2port /* USART2 is ttyS0 */
# define USART2_ASSIGNED 1
# endif
@@ -154,15 +154,15 @@
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS1_DEV g_uart4port /* UART4 is ttyS1 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */
# define USART2_ASSIGNED 1
@@ -185,15 +185,15 @@
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS2_DEV g_uart4port /* UART4 is ttyS2 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS2_DEV g_usart0port /* USART0 is ttyS2 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS2_DEV g_usart1port /* USART1 is ttyS2 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */
# define USART2_ASSIGNED 1
@@ -213,15 +213,15 @@
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS3_DEV g_uart4port /* UART4 is ttyS3 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS3_DEV g_usart0port /* USART0 is ttyS3 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS3_DEV g_usart1port /* USART1 is ttyS3 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS3_DEV g_usart2port /* USART2 is ttyS3 */
# define USART2_ASSIGNED 1
@@ -238,15 +238,15 @@
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS4_DEV g_uart4port /* UART4 is ttyS4 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS4_DEV g_usart0port /* USART0 is ttyS4 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS4_DEV g_usart1port /* USART1 is ttyS4 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS4_DEV g_usart2port /* USART2 is ttyS4 */
# define USART2_ASSIGNED 1
@@ -260,15 +260,15 @@
#if defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS5_DEV g_uart4port /* UART4 is ttyS5 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#elif defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS5_DEV g_usart0port /* USART0 is ttyS5 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS5_DEV g_usart1port /* USART1 is ttyS5 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS5_DEV g_usart2port /* USART2 is ttyS5 */
# define USART2_ASSIGNED 1
@@ -279,15 +279,15 @@
* One of USART0-2 could also be the console.
*/
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART) && \
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER) && \
!defined(USART0_ASSIGNED)
# define TTYS6_DEV g_usart0port /* USART0 is ttyS6 */
# define USART0_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#elif defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS6_DEV g_usart1port /* USART1 is ttyS6 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS6_DEV g_usart2port /* USART2 is ttyS6 */
# define USART2_ASSIGNED 1
@@ -298,11 +298,11 @@
* One of of USART1-2 could also be the console.
*/
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART) && \
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER) && \
!defined(USART1_ASSIGNED)
# define TTYS7_DEV g_usart1port /* USART1 is ttyS7 */
# define USART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART) && \
#elif defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER) && \
!defined(USART2_ASSIGNED)
# define TTYS7_DEV g_usart2port /* USART2 is ttyS7 */
# define USART2_ASSIGNED 1
@@ -369,13 +369,13 @@ static int sam_uart3_interrupt(int irq, void *context);
#ifdef CONFIG_SAMV7_UART4
static int sam_uart4_interrupt(int irq, void *context);
#endif
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
static int sam_usart0_interrupt(int irq, void *context);
#endif
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
static int sam_usart1_interrupt(int irq, void *context);
#endif
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
static int sam_usart2_interrupt(int irq, void *context);
#endif
static int sam_ioctl(struct file *filep, int cmd, unsigned long arg);
@@ -432,15 +432,15 @@ static char g_uart3txbuffer[CONFIG_UART3_TXBUFSIZE];
static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
#endif
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
#endif
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
#endif
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
#endif
@@ -602,7 +602,7 @@ static uart_dev_t g_uart4port =
/* This describes the state of the USART0 port. */
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
static struct sam_dev_s g_usart0priv =
{
.usartbase = SAM_USART0_BASE,
@@ -636,7 +636,7 @@ static uart_dev_t g_usart0port =
/* This describes the state of the USART1 port. */
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
static struct sam_dev_s g_usart1priv =
{
.usartbase = SAM_USART1_BASE,
@@ -670,7 +670,7 @@ static uart_dev_t g_usart1port =
/* This describes the state of the USART2 port. */
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
static struct sam_dev_s g_usart2priv =
{
.usartbase = SAM_USART2_BASE,
@@ -1115,19 +1115,19 @@ static int sam_uart4_interrupt(int irq, void *context)
*
****************************************************************************/
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_ISUART)
#if defined(CONFIG_SAMV7_USART0) && defined(CONFIG_USART0_SERIALDRIVER)
static int sam_usart0_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart0port);
}
#endif
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_ISUART)
#if defined(CONFIG_SAMV7_USART1) && defined(CONFIG_USART1_SERIALDRIVER)
static int sam_usart1_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart1port);
}
#endif
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_ISUART)
#if defined(CONFIG_SAMV7_USART2) && defined(CONFIG_USART2_SERIALDRIVER)
static int sam_usart2_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart2port);
arch/arm/src/stm32/Kconfig
+187 -34
View File
@@ -2160,63 +2160,47 @@ config STM32_TSC
config STM32_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_USART
config STM32_USART2
bool "USART2"
default n
select ARCH_HAVE_USART2
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_USART
config STM32_USART3
bool "USART3"
default n
depends on STM32_HAVE_USART3
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_USART3
select STM32_USART
config STM32_UART4
bool "UART4"
default n
depends on STM32_HAVE_UART4
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART4
select STM32_USART
config STM32_UART5
bool "UART5"
default n
depends on STM32_HAVE_UART5
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART5
select STM32_USART
config STM32_USART6
bool "USART6"
default n
depends on STM32_HAVE_USART6
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_USART6
select STM32_USART
config STM32_UART7
bool "UART7"
default n
depends on STM32_HAVE_UART7
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART7
select STM32_USART
config STM32_UART8
bool "UART8"
default n
depends on STM32_HAVE_UART8
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART8
select STM32_USART
config STM32_USB
@@ -5414,13 +5398,37 @@ endmenu
config STM32_USART
bool
config STM32_SERIALDRIVER
bool
config STM32_1WIREDRIVER
bool
menu "U[S]ART Configuration"
depends on STM32_USART
choice
prompt "USART1 Driver Configuration"
default STM32_USART1_SERIALDRIVER
depends on STM32_USART1
config STM32_USART1_SERIALDRIVER
bool "Standard serial driver"
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_USART1_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # USART1 Driver Configuration
if STM32_USART1_SERIALDRIVER
config USART1_RS485
bool "RS-485 on USART1"
default n
depends on STM32_USART1
---help---
Enable RS-485 interface on USART1. Your board config will have to
provide GPIO_USART1_RS485_DIR pin definition. Currently it cannot be
@@ -5438,14 +5446,34 @@ config USART1_RS485_DIR_POLARITY
config USART1_RXDMA
bool "USART1 Rx DMA"
default n
depends on STM32_USART1 && (((STM32_STM32F10XX || STM32_STM32L15XX) && STM32_DMA1) || (!STM32_STM32F10XX && STM32_DMA2))
depends on (((STM32_STM32F10XX || STM32_STM32L15XX) && STM32_DMA1) || (!STM32_STM32F10XX && STM32_DMA2))
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_USART1_SERIALDRIVER
choice
prompt "USART2 Driver Configuration"
default STM32_USART2_SERIALDRIVER
depends on STM32_USART2
config STM32_USART2_SERIALDRIVER
bool "Standard serial driver"
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_USART2_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # USART2 Driver Configuration
if STM32_USART2_SERIALDRIVER
config USART2_RS485
bool "RS-485 on USART2"
default n
depends on STM32_USART2
---help---
Enable RS-485 interface on USART2. Your board config will have to
provide GPIO_USART2_RS485_DIR pin definition. Currently it cannot be
@@ -5463,14 +5491,34 @@ config USART2_RS485_DIR_POLARITY
config USART2_RXDMA
bool "USART2 Rx DMA"
default n
depends on STM32_USART2 && STM32_DMA1
depends on STM32_DMA1
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_USART2_SERIALDRIVER
choice
prompt "USART3 Driver Configuration"
default STM32_USART3_SERIALDRIVER
depends on STM32_USART3
config STM32_USART3_SERIALDRIVER
bool "Standard serial driver"
select USART3_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_USART3_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # USART3 Driver Configuration
if STM32_USART3_SERIALDRIVER
config USART3_RS485
bool "RS-485 on USART3"
default n
depends on STM32_USART3
---help---
Enable RS-485 interface on USART3. Your board config will have to
provide GPIO_USART3_RS485_DIR pin definition. Currently it cannot be
@@ -5488,14 +5536,34 @@ config USART3_RS485_DIR_POLARITY
config USART3_RXDMA
bool "USART3 Rx DMA"
default n
depends on STM32_USART3 && STM32_DMA1
depends on STM32_DMA1
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_USART3_SERIALDRIVER
choice
prompt "UART4 Driver Configuration"
default STM32_UART4_SERIALDRIVER
depends on STM32_UART4
config STM32_UART4_SERIALDRIVER
bool "Standard serial driver"
select UART4_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_UART4_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # UART1 Driver Configuration
if STM32_UART4_SERIALDRIVER
config UART4_RS485
bool "RS-485 on UART4"
default n
depends on STM32_UART4
---help---
Enable RS-485 interface on UART4. Your board config will have to
provide GPIO_UART4_RS485_DIR pin definition. Currently it cannot be
@@ -5513,14 +5581,34 @@ config UART4_RS485_DIR_POLARITY
config UART4_RXDMA
bool "UART4 Rx DMA"
default n
depends on STM32_UART4 && STM32_DMA1
depends on STM32_DMA1
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_UART4_SERIALDRIVER
choice
prompt "UART5 Driver Configuration"
default STM32_UART5_SERIALDRIVER
depends on STM32_UART5
config STM32_UART5_SERIALDRIVER
bool "Standard serial driver"
select UART5_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_UART5_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # UART5 Driver Configuration
if STM32_UART5_SERIALDRIVER
config UART5_RS485
bool "RS-485 on UART5"
default n
depends on STM32_UART5
---help---
Enable RS-485 interface on UART5. Your board config will have to
provide GPIO_UART5_RS485_DIR pin definition. Currently it cannot be
@@ -5538,14 +5626,34 @@ config UART5_RS485_DIR_POLARITY
config UART5_RXDMA
bool "UART5 Rx DMA"
default n
depends on STM32_UART5 && STM32_DMA1
depends on STM32_DMA1
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_UART5_SERIALDRIVER
choice
prompt "USART6 Driver Configuration"
default STM32_USART6_SERIALDRIVER
depends on STM32_USART6
config STM32_USART6_SERIALDRIVER
bool "Standard serial driver"
select USART6_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_USART6_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # USART6 Driver Configuration
if STM32_USART6_SERIALDRIVER
config USART6_RS485
bool "RS-485 on USART6"
default n
depends on STM32_USART6
---help---
Enable RS-485 interface on USART6. Your board config will have to
provide GPIO_USART6_RS485_DIR pin definition. Currently it cannot be
@@ -5563,14 +5671,34 @@ config USART6_RS485_DIR_POLARITY
config USART6_RXDMA
bool "USART6 Rx DMA"
default n
depends on STM32_USART6 && STM32_DMA2
depends on STM32_DMA2
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_USART6_SERIALDRIVER
choice
prompt "UART7 Driver Configuration"
default STM32_UART7_SERIALDRIVER
depends on STM32_UART7
config STM32_UART7_SERIALDRIVER
bool "Standard serial driver"
select UART7_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_UART7_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # UART7 Driver Configuration
if STM32_UART7_SERIALDRIVER
config UART7_RS485
bool "RS-485 on UART7"
default n
depends on STM32_UART7
---help---
Enable RS-485 interface on UART7. Your board config will have to
provide GPIO_UART7_RS485_DIR pin definition. Currently it cannot be
@@ -5588,14 +5716,34 @@ config UART7_RS485_DIR_POLARITY
config UART7_RXDMA
bool "UART7 Rx DMA"
default n
depends on STM32_UART7 && STM32_DMA2
depends on STM32_DMA2
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_UART7_SERIALDRIVER
choice
prompt "UART8 Driver Configuration"
default STM32_UART8_SERIALDRIVER
depends on STM32_UART7
config STM32_UART8_SERIALDRIVER
bool "Standard serial driver"
select UART8_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32_SERIALDRIVER
config STM32_UART8_1WIREDRIVER
bool "1-Wire driver"
select STM32_1WIREDRIVER
endchoice # UART8 Driver Configuration
if STM32_UART8_SERIALDRIVER
config UART8_RS485
bool "RS-485 on UART8"
default n
depends on STM32_UART8
---help---
Enable RS-485 interface on UART8. Your board config will have to
provide GPIO_UART8_RS485_DIR pin definition. Currently it cannot be
@@ -5613,10 +5761,14 @@ config UART8_RS485_DIR_POLARITY
config UART8_RXDMA
bool "UART8 Rx DMA"
default n
depends on STM32_UART8 && STM32_DMA2
depends on STM32_DMA2
---help---
In high data rate usage, Rx DMA may eliminate Rx overrun errors
endif # STM32_UART8_SERIALDRIVER
if STM32_SERIALDRIVER
config SERIAL_DISABLE_REORDERING
bool "Disable reordering of ttySx devices."
depends on STM32_USART1 || STM32_USART2 || STM32_USART3 || STM32_UART4 || STM32_UART5 || STM32_USART6 || STM32_UART7 || STM32_UART8
@@ -5661,8 +5813,6 @@ config STM32_SERIALBRK_BSDCOMPAT
on because the SW starts the break and then the HW automatically clears
the break. This makes it is difficult to sent a long break.
endmenu # U[S]ART Configuration
config STM32_USART_SINGLEWIRE
bool "Single Wire Support"
default n
@@ -5671,6 +5821,9 @@ config STM32_USART_SINGLEWIRE
Enable single wire UART support. The option enables support for the
TIOCSSINGLEWIRE ioctl in the STM32 serial driver.
endif # STM32_SERIALDRIVER
endmenu # U[S]ART Configuration
menu "SPI Configuration"
depends on STM32_SPI
arch/arm/src/stm32/Make.defs
+4
View File
@@ -211,6 +211,10 @@ ifeq ($(CONFIG_DAC),y)
CHIP_CSRCS += stm32_dac.c
endif
ifeq ($(CONFIG_STM32_1WIREDRIVER),y)
CHIP_CSRCS += stm32_1wire.c
endif
ifeq ($(CONFIG_STM32_RNG),y)
CHIP_CSRCS += stm32_rng.c
endif
arch/arm/src/stm32/chip/stm32f10xxx_vectors.h
+1 -1
View File
@@ -110,7 +110,7 @@ UNUSED(STM32_IRQ_RESERVED6) /* Vector 16+49: Reserved 6 */
VECTOR(stm32_tim5, STM32_IRQ_TIM5) /* Vector 16+50: TIM5 global interrupt */
VECTOR(stm32_spi3, STM32_IRQ_SPI3) /* Vector 16+51: SPI3 global interrupt */
VECTOR(stm32_uart4, STM32_IRQ_UART4) /* Vector 16+52: USART2 global interrupt */
VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: USART5 global interrupt */
VECTOR(stm32_uart5, STM32_IRQ_UART5) /* Vector 16+53: UART5 global interrupt */
VECTOR(stm32_tim6, STM32_IRQ_TIM6) /* Vector 16+54: TIM6 global interrupt */
VECTOR(stm32_tim7, STM32_IRQ_TIM7) /* Vector 16+55: TIM7 global interrupt */
VECTOR(stm32_dma2ch1, STM32_IRQ_DMA2CH1) /* Vector 16+56: DMA2 Channel 1 global interrupt */
arch/arm/src/stm32/stm32_1wire.c
+1338 -1333
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/stm32/stm32_1wire.h
+63 -113
View File
@@ -1,113 +1,63 @@
/************************************************************************************
* arch/arm/src/stm32/stm32_1wire.h
*
* Copyright (C) 2016 Aleksandr Vyhovanec. All rights reserved.
* Author: Aleksandr Vyhovanec <www.desh@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_STM32_1WIRE_H
#define __ARCH_ARM_SRC_STM32_STM32_1WIRE_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip.h"
#if defined(CONFIG_STM32_STM32L15XX)
# include "chip/stm32l15xxx_uart.h"
#elif defined(CONFIG_STM32_STM32F10XX)
# include "chip/stm32f10xxx_uart.h"
#elif defined(CONFIG_STM32_STM32F20XX)
# include "chip/stm32f20xxx_uart.h"
#elif defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F37XX)
# include "chip/stm32f30xxx_uart.h"
#elif defined(CONFIG_STM32_STM32F40XX)
# include "chip/stm32f40xxx_uart.h"
#else
# error "Unsupported STM32 UART"
#endif
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* Check 1-Wire and U(S)ART conflicting */
#if defined(CONFIG_STM32_1WIRE1) && defined(CONFIG_STM32_USART1)
# undef CONFIG_STM32_1WIRE1
#endif
#if defined(CONFIG_STM32_1WIRE2) && defined(CONFIG_STM32_USART2)
# undef CONFIG_STM32_1WIRE2
#endif
#if defined(CONFIG_STM32_1WIRE3) && defined(CONFIG_STM32_USART3)
# undef CONFIG_STM32_1WIRE3
#endif
#if defined(CONFIG_STM32_1WIRE4) && defined(CONFIG_STM32_UART4)
# undef CONFIG_STM32_1WIRE4
#endif
#if defined(CONFIG_STM32_1WIRE5) && defined(CONFIG_STM32_UART5)
# undef CONFIG_STM32_1WIRE5
#endif
#if defined(CONFIG_STM32_1WIRE6) && defined(CONFIG_STM32_USART6)
# undef CONFIG_STM32_1WIRE6
#endif
#if defined(CONFIG_STM32_1WIRE7) && defined(CONFIG_STM32_UART7)
# undef CONFIG_STM32_1WIRE7
#endif
#if defined(CONFIG_STM32_1WIRE8) && defined(CONFIG_STM32_UART8)
# undef CONFIG_STM32_1WIRE8
#endif
/* Is there a 1-Wire enabled? */
#if defined(CONFIG_STM32_1WIRE1) || defined(CONFIG_STM32_1WIRE2) || \
defined(CONFIG_STM32_1WIRE3) || defined(CONFIG_STM32_1WIRE4) || \
defined(CONFIG_STM32_1WIRE5) || defined(CONFIG_STM32_1WIRE6) || \
defined(CONFIG_STM32_1WIRE7) || defined(CONFIG_STM32_1WIRE8)
# define HAVE_1WIRE 1
#endif
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_STM32_STM32_1WIRE_H */
/************************************************************************************
* arch/arm/src/stm32/stm32_1wire.h
*
* Copyright (C) 2016 Aleksandr Vyhovanec. All rights reserved.
* Author: Aleksandr Vyhovanec <www.desh@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_STM32_STM32_1WIRE_H
#define __ARCH_ARM_SRC_STM32_STM32_1WIRE_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "stm32_uart.h"
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_STM32_STM32_1WIRE_H */
arch/arm/src/stm32/stm32_lowputc.c
+4 -4
View File
@@ -436,7 +436,7 @@ void up_lowputc(char ch)
void stm32_lowsetup(void)
{
#if defined(HAVE_UART)
#if defined(HAVE_SERIALDRIVER)
uint32_t mapr;
#if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
uint32_t cr;
@@ -559,7 +559,7 @@ void stm32_lowsetup(void)
putreg32(cr, STM32_CONSOLE_BASE + STM32_USART_CR1_OFFSET);
#endif /* HAVE_CONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */
#endif /* HAVE_UART */
#endif /* HAVE_SERIALDRIVER */
}
#elif defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F20XX) || \
@@ -568,7 +568,7 @@ void stm32_lowsetup(void)
void stm32_lowsetup(void)
{
#if defined(HAVE_UART)
#if defined(HAVE_SERIALDRIVER)
#if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
uint32_t cr;
#endif
@@ -638,7 +638,7 @@ void stm32_lowsetup(void)
putreg32(cr, STM32_CONSOLE_BASE + STM32_USART_CR1_OFFSET);
#endif /* HAVE_CONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */
#endif /* HAVE_UART */
#endif /* HAVE_SERIALDRIVER */
}
#else
arch/arm/src/stm32/stm32_serial.c
+56 -56
View File
@@ -272,7 +272,7 @@
#endif
#ifdef USE_SERIALDRIVER
#ifdef HAVE_UART
#ifdef HAVE_SERIALDRIVER
/****************************************************************************
* Private Types
@@ -386,28 +386,28 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain,
enum pm_state_e pmstate);
#endif
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
static int up_interrupt_usart1(int irq, void *context);
#endif
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
static int up_interrupt_usart2(int irq, void *context);
#endif
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
static int up_interrupt_usart3(int irq, void *context);
#endif
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
static int up_interrupt_uart4(int irq, void *context);
#endif
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
static int up_interrupt_uart5(int irq, void *context);
#endif
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
static int up_interrupt_usart6(int irq, void *context);
#endif
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
static int up_interrupt_uart7(int irq, void *context);
#endif
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
static int up_interrupt_uart8(int irq, void *context);
#endif
@@ -459,7 +459,7 @@ static const struct uart_ops_s g_uart_dma_ops =
/* I/O buffers */
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
# ifdef CONFIG_USART1_RXDMA
@@ -467,7 +467,7 @@ static char g_usart1rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
# ifdef CONFIG_USART2_RXDMA
@@ -475,7 +475,7 @@ static char g_usart2rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
static char g_usart3rxbuffer[CONFIG_USART3_RXBUFSIZE];
static char g_usart3txbuffer[CONFIG_USART3_TXBUFSIZE];
# ifdef CONFIG_USART3_RXDMA
@@ -483,7 +483,7 @@ static char g_usart3rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
static char g_uart4rxbuffer[CONFIG_UART4_RXBUFSIZE];
static char g_uart4txbuffer[CONFIG_UART4_TXBUFSIZE];
# ifdef CONFIG_UART4_RXDMA
@@ -491,7 +491,7 @@ static char g_uart4rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
static char g_uart5rxbuffer[CONFIG_UART5_RXBUFSIZE];
static char g_uart5txbuffer[CONFIG_UART5_TXBUFSIZE];
# ifdef CONFIG_UART5_RXDMA
@@ -499,7 +499,7 @@ static char g_uart5rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
static char g_usart6rxbuffer[CONFIG_USART6_RXBUFSIZE];
static char g_usart6txbuffer[CONFIG_USART6_TXBUFSIZE];
# ifdef CONFIG_USART6_RXDMA
@@ -507,7 +507,7 @@ static char g_usart6rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
static char g_uart7rxbuffer[CONFIG_UART7_RXBUFSIZE];
static char g_uart7txbuffer[CONFIG_UART7_TXBUFSIZE];
# ifdef CONFIG_UART7_RXDMA
@@ -515,7 +515,7 @@ static char g_uart7rxfifo[RXDMA_BUFFER_SIZE];
# endif
#endif
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
static char g_uart8rxbuffer[CONFIG_UART8_RXBUFSIZE];
static char g_uart8txbuffer[CONFIG_UART8_TXBUFSIZE];
# ifdef CONFIG_UART8_RXDMA
@@ -525,7 +525,7 @@ static char g_uart8rxfifo[RXDMA_BUFFER_SIZE];
/* This describes the state of the STM32 USART1 ports. */
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
static struct up_dev_s g_usart1priv =
{
.dev =
@@ -587,7 +587,7 @@ static struct up_dev_s g_usart1priv =
/* This describes the state of the STM32 USART2 port. */
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
static struct up_dev_s g_usart2priv =
{
.dev =
@@ -649,7 +649,7 @@ static struct up_dev_s g_usart2priv =
/* This describes the state of the STM32 USART3 port. */
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
static struct up_dev_s g_usart3priv =
{
.dev =
@@ -711,7 +711,7 @@ static struct up_dev_s g_usart3priv =
/* This describes the state of the STM32 UART4 port. */
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
static struct up_dev_s g_uart4priv =
{
.dev =
@@ -777,7 +777,7 @@ static struct up_dev_s g_uart4priv =
/* This describes the state of the STM32 UART5 port. */
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
static struct up_dev_s g_uart5priv =
{
.dev =
@@ -843,7 +843,7 @@ static struct up_dev_s g_uart5priv =
/* This describes the state of the STM32 USART6 port. */
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
static struct up_dev_s g_usart6priv =
{
.dev =
@@ -905,7 +905,7 @@ static struct up_dev_s g_usart6priv =
/* This describes the state of the STM32 UART7 port. */
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
static struct up_dev_s g_uart7priv =
{
.dev =
@@ -940,11 +940,11 @@ static struct up_dev_s g_uart7priv =
.usartbase = STM32_UART7_BASE,
.tx_gpio = GPIO_UART7_TX,
.rx_gpio = GPIO_UART7_RX,
#if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_USART7_OFLOWCONTROL)
#if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_UART7_OFLOWCONTROL)
.oflow = true,
.cts_gpio = GPIO_UART7_CTS,
#endif
#if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_USART7_IFLOWCONTROL)
#if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_UART7_IFLOWCONTROL)
.iflow = true,
.rts_gpio = GPIO_UART7_RTS,
#endif
@@ -967,7 +967,7 @@ static struct up_dev_s g_uart7priv =
/* This describes the state of the STM32 UART8 port. */
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
static struct up_dev_s g_uart8priv =
{
.dev =
@@ -1002,11 +1002,11 @@ static struct up_dev_s g_uart8priv =
.usartbase = STM32_UART8_BASE,
.tx_gpio = GPIO_UART8_TX,
.rx_gpio = GPIO_UART8_RX,
#if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_USART8_OFLOWCONTROL)
#if defined(CONFIG_SERIAL_OFLOWCONTROL) && defined(CONFIG_UART8_OFLOWCONTROL)
.oflow = true,
.cts_gpio = GPIO_UART8_CTS,
#endif
#if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_USART8_IFLOWCONTROL)
#if defined(CONFIG_SERIAL_IFLOWCONTROL) && defined(CONFIG_UART8_IFLOWCONTROL)
.iflow = true,
.rts_gpio = GPIO_UART8_RTS,
#endif
@@ -1031,28 +1031,28 @@ static struct up_dev_s g_uart8priv =
static struct up_dev_s * const uart_devs[STM32_NUSART] =
{
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
[0] = &g_usart1priv,
#endif
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
[1] = &g_usart2priv,
#endif
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
[2] = &g_usart3priv,
#endif
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
[3] = &g_uart4priv,
#endif
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
[4] = &g_uart5priv,
#endif
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
[5] = &g_usart6priv,
#endif
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
[6] = &g_uart7priv,
#endif
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
[7] = &g_uart8priv,
#endif
};
@@ -1376,49 +1376,49 @@ static void up_set_apb_clock(struct uart_dev_s *dev, bool on)
{
default:
return;
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
case STM32_USART1_BASE:
rcc_en = RCC_APB2ENR_USART1EN;
regaddr = STM32_RCC_APB2ENR;
break;
#endif
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
case STM32_USART2_BASE:
rcc_en = RCC_APB1ENR_USART2EN;
regaddr = STM32_RCC_APB1ENR;
break;
#endif
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
case STM32_USART3_BASE:
rcc_en = RCC_APB1ENR_USART3EN;
regaddr = STM32_RCC_APB1ENR;
break;
#endif
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
case STM32_UART4_BASE:
rcc_en = RCC_APB1ENR_UART4EN;
regaddr = STM32_RCC_APB1ENR;
break;
#endif
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
case STM32_UART5_BASE:
rcc_en = RCC_APB1ENR_UART5EN;
regaddr = STM32_RCC_APB1ENR;
break;
#endif
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
case STM32_USART6_BASE:
rcc_en = RCC_APB2ENR_USART6EN;
regaddr = STM32_RCC_APB2ENR;
break;
#endif
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
case STM32_UART7_BASE:
rcc_en = RCC_APB1ENR_UART7EN;
regaddr = STM32_RCC_APB1ENR;
break;
#endif
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
case STM32_UART8_BASE:
rcc_en = RCC_APB1ENR_UART8EN;
regaddr = STM32_RCC_APB1ENR;
@@ -2579,56 +2579,56 @@ static bool up_txready(struct uart_dev_s *dev)
*
****************************************************************************/
#ifdef CONFIG_STM32_USART1
#ifdef CONFIG_STM32_USART1_SERIALDRIVER
static int up_interrupt_usart1(int irq, void *context)
{
return up_interrupt_common(&g_usart1priv);
}
#endif
#ifdef CONFIG_STM32_USART2
#ifdef CONFIG_STM32_USART2_SERIALDRIVER
static int up_interrupt_usart2(int irq, void *context)
{
return up_interrupt_common(&g_usart2priv);
}
#endif
#ifdef CONFIG_STM32_USART3
#ifdef CONFIG_STM32_USART3_SERIALDRIVER
static int up_interrupt_usart3(int irq, void *context)
{
return up_interrupt_common(&g_usart3priv);
}
#endif
#ifdef CONFIG_STM32_UART4
#ifdef CONFIG_STM32_UART4_SERIALDRIVER
static int up_interrupt_uart4(int irq, void *context)
{
return up_interrupt_common(&g_uart4priv);
}
#endif
#ifdef CONFIG_STM32_UART5
#ifdef CONFIG_STM32_UART5_SERIALDRIVER
static int up_interrupt_uart5(int irq, void *context)
{
return up_interrupt_common(&g_uart5priv);
}
#endif
#ifdef CONFIG_STM32_USART6
#ifdef CONFIG_STM32_USART6_SERIALDRIVER
static int up_interrupt_usart6(int irq, void *context)
{
return up_interrupt_common(&g_usart6priv);
}
#endif
#ifdef CONFIG_STM32_UART7
#ifdef CONFIG_STM32_UART7_SERIALDRIVER
static int up_interrupt_uart7(int irq, void *context)
{
return up_interrupt_common(&g_uart7priv);
}
#endif
#ifdef CONFIG_STM32_UART8
#ifdef CONFIG_STM32_UART8_SERIALDRIVER
static int up_interrupt_uart8(int irq, void *context)
{
return up_interrupt_common(&g_uart8priv);
@@ -2771,7 +2771,7 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain,
return OK;
}
#endif
#endif /* HAVE_UART */
#endif /* HAVE_SERIALDRIVER */
#endif /* USE_SERIALDRIVER */
/****************************************************************************
@@ -2793,7 +2793,7 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain,
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void)
{
#ifdef HAVE_UART
#ifdef HAVE_SERIALDRIVER
unsigned i;
/* Disable all USART interrupts */
@@ -2826,7 +2826,7 @@ void up_earlyserialinit(void)
void up_serialinit(void)
{
#ifdef HAVE_UART
#ifdef HAVE_SERIALDRIVER
char devname[16];
unsigned i;
unsigned minor = 0;
arch/arm/src/stm32/stm32_uart.h
+110 -31
View File
@@ -90,18 +90,97 @@
# undef CONFIG_STM32_USART1
#endif
/* Is there a USART enabled? */
/* Sanity checks */
#if defined(CONFIG_STM32_USART1) || defined(CONFIG_STM32_USART2) || \
defined(CONFIG_STM32_USART3) || defined(CONFIG_STM32_UART4) || \
defined(CONFIG_STM32_UART5) || defined(CONFIG_STM32_USART6) || \
defined(CONFIG_STM32_UART7) || defined(CONFIG_STM32_UART8)
# define HAVE_UART 1
#if !defined(CONFIG_STM32_USART1)
# undef CONFIG_STM32_USART1_SERIALDRIVER
# undef CONFIG_STM32_USART1_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_USART2)
# undef CONFIG_STM32_USART2_SERIALDRIVER
# undef CONFIG_STM32_USART2_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_USART3)
# undef CONFIG_STM32_USART3_SERIALDRIVER
# undef CONFIG_STM32_USART3_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_UART4)
# undef CONFIG_STM32_UART4_SERIALDRIVER
# undef CONFIG_STM32_UART4_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_UART5)
# undef CONFIG_STM32_UART5_SERIALDRIVER
# undef CONFIG_STM32_UART5_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_USART6)
# undef CONFIG_STM32_USART6_SERIALDRIVER
# undef CONFIG_STM32_USART6_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_UART7)
# undef CONFIG_STM32_UART7_SERIALDRIVER
# undef CONFIG_STM32_UART7_1WIREDRIVER
#endif
#if !defined(CONFIG_STM32_UART8)
# undef CONFIG_STM32_UART8_SERIALDRIVER
# undef CONFIG_STM32_UART8_1WIREDRIVER
#endif
/* Check 1-Wire and U(S)ART conflicts */
#if defined(CONFIG_STM32_USART1_1WIREDRIVER) && defined(CONFIG_STM32_USART1_SERIALDRIVER)
# error Both CONFIG_STM32_USART1_1WIREDRIVER and CONFIG_STM32_USART1_SERIALDRIVER defined
# undef CONFIG_STM32_USART1_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_USART2_1WIREDRIVER) && defined(CONFIG_STM32_USART2_SERIALDRIVER)
# error Both CONFIG_STM32_USART2_1WIREDRIVER and CONFIG_STM32_USART2_SERIALDRIVER defined
# undef CONFIG_STM32_USART2_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_USART3_1WIREDRIVER) && defined(CONFIG_STM32_USART3_SERIALDRIVER)
# error Both CONFIG_STM32_USART3_1WIREDRIVER and CONFIG_STM32_USART3_SERIALDRIVER defined
# undef CONFIG_STM32_USART3_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_UART4_1WIREDRIVER) && defined(CONFIG_STM32_UART4_SERIALDRIVER)
# error Both CONFIG_STM32_UART4_1WIREDRIVER and CONFIG_STM32_UART4_SERIALDRIVER defined
# undef CONFIG_STM32_UART4_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_UART5_1WIREDRIVER) && defined(CONFIG_STM32_UART5_SERIALDRIVER)
# error Both CONFIG_STM32_UART5_1WIREDRIVER and CONFIG_STM32_UART5_SERIALDRIVER defined
# undef CONFIG_STM32_UART5_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_USART6_1WIREDRIVER) && defined(CONFIG_STM32_USART6_SERIALDRIVER)
# error Both CONFIG_STM32_USART6_1WIREDRIVER and CONFIG_STM32_USART6_SERIALDRIVER defined
# undef CONFIG_STM32_USART6_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_UART7_1WIREDRIVER) && defined(CONFIG_STM32_UART7_SERIALDRIVER)
# error Both CONFIG_STM32_UART7_1WIREDRIVER and CONFIG_STM32_UART7_SERIALDRIVER defined
# undef CONFIG_STM32_UART7_1WIREDRIVER
#endif
#if defined(CONFIG_STM32_UART8_1WIREDRIVER) && defined(CONFIG_STM32_UART8_SERIALDRIVER)
# error Both CONFIG_STM32_UART8_1WIREDRIVER and CONFIG_STM32_UART8_SERIALDRIVER defined
# undef CONFIG_STM32_UART8_1WIREDRIVER
#endif
/* Is the serial driver enabled? */
#if defined(CONFIG_STM32_USART1_SERIALDRIVER) || defined(CONFIG_STM32_USART2_SERIALDRIVER) || \
defined(CONFIG_STM32_USART3_SERIALDRIVER) || defined(CONFIG_STM32_UART4_SERIALDRIVER) || \
defined(CONFIG_STM32_UART5_SERIALDRIVER) || defined(CONFIG_STM32_USART6_SERIALDRIVER) || \
defined(CONFIG_STM32_UART7_SERIALDRIVER) || defined(CONFIG_STM32_UART8_SERIALDRIVER)
# define HAVE_SERIALDRIVER 1
#endif
/* Is the 1-Wire driver? */
#if defined(CONFIG_STM32_USART1_1WIREDRIVER) || defined(CONFIG_STM32_USART2_1WIREDRIVER) || \
defined(CONFIG_STM32_USART3_1WIREDRIVER) || defined(CONFIG_STM32_UART4_1WIREDRIVER) || \
defined(CONFIG_STM32_UART5_1WIREDRIVER) || defined(CONFIG_STM32_USART6_1WIREDRIVER) || \
defined(CONFIG_STM32_UART7_1WIREDRIVER) || defined(CONFIG_STM32_UART8_1WIREDRIVER)
# define HAVE_1WIREDRIVER 1
#endif
/* Is there a serial console? */
#if defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART1)
#if defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART1_SERIALDRIVER)
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
# undef CONFIG_UART4_SERIAL_CONSOLE
@@ -111,7 +190,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 1
# define HAVE_CONSOLE 1
#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART2)
#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART2_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
# undef CONFIG_UART4_SERIAL_CONSOLE
@@ -121,7 +200,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 2
# define HAVE_CONSOLE 1
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART3)
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART3_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_UART4_SERIAL_CONSOLE
@@ -131,7 +210,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 3
# define HAVE_CONSOLE 1
#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART4)
#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART4_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -141,7 +220,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 4
# define HAVE_CONSOLE 1
#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART5)
#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART5_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -151,7 +230,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 5
# define HAVE_CONSOLE 1
#elif defined(CONFIG_USART6_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART6)
#elif defined(CONFIG_USART6_SERIAL_CONSOLE) && defined(CONFIG_STM32_USART6_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -161,7 +240,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 6
# define HAVE_CONSOLE 1
#elif defined(CONFIG_UART7_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART7)
#elif defined(CONFIG_UART7_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART7_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -172,7 +251,7 @@
# undef CONFIG_UART8_SERIAL_CONSOLE
# define CONSOLE_UART 7
# define HAVE_CONSOLE 1
#elif defined(CONFIG_UART8_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART8)
#elif defined(CONFIG_UART8_SERIAL_CONSOLE) && defined(CONFIG_STM32_UART8_SERIALDRIVER)
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART3_SERIAL_CONSOLE
@@ -197,7 +276,7 @@
/* DMA support is only provided if CONFIG_ARCH_DMA is in the NuttX configuration */
#if !defined(HAVE_UART) || !defined(CONFIG_ARCH_DMA)
#if !defined(HAVE_SERIALDRIVER) || !defined(CONFIG_ARCH_DMA)
# undef CONFIG_USART1_RXDMA
# undef CONFIG_USART2_RXDMA
# undef CONFIG_USART3_RXDMA
@@ -210,35 +289,35 @@
/* Disable the DMA configuration on all unused USARTs */
#ifndef CONFIG_STM32_USART1
#ifndef CONFIG_STM32_USART1_SERIALDRIVER
# undef CONFIG_USART1_RXDMA
#endif
#ifndef CONFIG_STM32_USART2
#ifndef CONFIG_STM32_USART2_SERIALDRIVER
# undef CONFIG_USART2_RXDMA
#endif
#ifndef CONFIG_STM32_USART3
#ifndef CONFIG_STM32_USART3_SERIALDRIVER
# undef CONFIG_USART3_RXDMA
#endif
#ifndef CONFIG_STM32_UART4
#ifndef CONFIG_STM32_UART4_SERIALDRIVER
# undef CONFIG_UART4_RXDMA
#endif
#ifndef CONFIG_STM32_UART5
#ifndef CONFIG_STM32_UART5_SERIALDRIVER
# undef CONFIG_UART5_RXDMA
#endif
#ifndef CONFIG_STM32_USART6
#ifndef CONFIG_STM32_USART6_SERIALDRIVER
# undef CONFIG_USART6_RXDMA
#endif
#ifndef CONFIG_STM32_UART7
#ifndef CONFIG_STM32_UART7_SERIALDRIVER
# undef CONFIG_UART7_RXDMA
#endif
#ifndef CONFIG_STM32_UART8
#ifndef CONFIG_STM32_UART8_SERIALDRIVER
# undef CONFIG_UART8_RXDMA
#endif
@@ -276,21 +355,21 @@
/* Is DMA used on all (enabled) USARTs */
#define SERIAL_HAVE_ONLY_DMA 1
#if defined(CONFIG_STM32_USART1) && !defined(CONFIG_USART1_RXDMA)
#if defined(CONFIG_STM32_USART1_SERIALDRIVER) && !defined(CONFIG_USART1_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_USART2) && !defined(CONFIG_USART2_RXDMA)
#elif defined(CONFIG_STM32_USART2_SERIALDRIVER) && !defined(CONFIG_USART2_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_USART3) && !defined(CONFIG_USART3_RXDMA)
#elif defined(CONFIG_STM32_USART3_SERIALDRIVER) && !defined(CONFIG_USART3_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_UART4) && !defined(CONFIG_UART4_RXDMA)
#elif defined(CONFIG_STM32_UART4_SERIALDRIVER) && !defined(CONFIG_UART4_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_UART5) && !defined(CONFIG_UART5_RXDMA)
#elif defined(CONFIG_STM32_UART5_SERIALDRIVER) && !defined(CONFIG_UART5_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_USART6) && !defined(CONFIG_USART6_RXDMA)
#elif defined(CONFIG_STM32_USART6_SERIALDRIVER) && !defined(CONFIG_USART6_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_UART7) && !defined(CONFIG_UART7_RXDMA)
#elif defined(CONFIG_STM32_UART7_SERIALDRIVER) && !defined(CONFIG_UART7_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#elif defined(CONFIG_STM32_UART8) && !defined(CONFIG_UART8_RXDMA)
#elif defined(CONFIG_STM32_UART8_SERIALDRIVER) && !defined(CONFIG_UART8_RXDMA)
# undef SERIAL_HAVE_ONLY_DMA
#endif
arch/arm/src/stm32f7/Kconfig
+8 -8
View File
@@ -370,14 +370,14 @@ config STM32F7_TIM15
config STM32F7_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32F7_USART
config STM32F7_USART2
bool "USART2"
default n
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32F7_USART
@@ -385,42 +385,42 @@ config STM32F7_USART3
bool "USART3"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select STM32F7_USART
config STM32F7_UART4
bool "UART4"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
select STM32F7_USART
config STM32F7_UART5
bool "UART5"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
select STM32F7_USART
config STM32F7_USART6
bool "USART6"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_USART6
select USART6_SERIALDRIVER
select STM32F7_USART
config STM32F7_UART7
bool "UART7"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART7
select UART7_SERIALDRIVER
select STM32F7_USART
config STM32F7_UART8
bool "UART8"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART8
select UART8_SERIALDRIVER
select STM32F7_USART
config STM32F7_IWDG
arch/arm/src/stm32f7/stm32_config.h
+3 -3
View File
@@ -113,13 +113,13 @@
* for our purposes.
*/
#ifndef CONFIG_USART0_ISUART
#ifndef CONFIG_USART0_SERIALDRIVER
# undef CONFIG_STM32F7_USART0
#endif
#ifndef CONFIG_USART1_ISUART
#ifndef CONFIG_USART1_SERIALDRIVER
# undef CONFIG_STM32F7_USART1
#endif
#ifndef CONFIG_USART2_ISUART
#ifndef CONFIG_USART2_SERIALDRIVER
# undef CONFIG_STM32F7_USART2
#endif
arch/arm/src/stm32l4/Kconfig
+6 -6
View File
@@ -400,14 +400,14 @@ config STM32L4_SPI3
config STM32L4_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32L4_USART
config STM32L4_USART2
bool "USART2"
default n
select ARCH_HAVE_USART2
select USART2_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32L4_USART
@@ -415,21 +415,21 @@ config STM32L4_USART3
bool "USART3"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_USART3
select USART3_SERIALDRIVER
select STM32L4_USART
config STM32L4_UART4
bool "UART4"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
select STM32L4_USART
config STM32L4_UART5
bool "UART5"
default n
select ARCH_HAVE_SERIAL_TERMIOS
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
select STM32L4_USART
config STM32L4_I2C1
@@ -520,7 +520,7 @@ config STM32L4_TIM8
config STM32L4_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
select STM32L4_USART
arch/arm/src/str71x/Kconfig
+4 -4
View File
@@ -80,25 +80,25 @@ config STR71X_UART0
bool "UART0"
default n
select STR71X_GPIO0
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
config STR71X_UART1
bool "UART1"
default n
select STR71X_GPIO0
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
config STR71X_UART2
bool "UART2"
default n
select STR71X_GPIO0
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
config STR71X_UART3
bool "UART3"
default n
select STR71X_GPIO0
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
config STR71X_USB
bool "USB"
arch/arm/src/tiva/Kconfig
+8 -8
View File
@@ -414,48 +414,48 @@ config TIVA_I2C9
config TIVA_UART0
bool "UART0"
select ARCH_HAVE_UART0
select UART0_SERIALDRIVER
default n
config TIVA_UART1
bool "UART1"
select ARCH_HAVE_UART1
select UART1_SERIALDRIVER
default n
config TIVA_UART2
bool "UART2"
select ARCH_HAVE_UART2
select UART2_SERIALDRIVER
default n
config TIVA_UART3
bool "UART3"
default n
depends on TIVA_HAVE_UART3
select ARCH_HAVE_UART3
select UART3_SERIALDRIVER
config TIVA_UART4
bool "UART4"
default n
depends on TIVA_HAVE_UART4
select ARCH_HAVE_UART4
select UART4_SERIALDRIVER
config TIVA_UART5
bool "UART5"
default n
depends on TIVA_HAVE_UART5
select ARCH_HAVE_UART5
select UART5_SERIALDRIVER
config TIVA_UART6
bool "UART6"
default n
depends on TIVA_HAVE_UART6
select ARCH_HAVE_UART6
select UART6_SERIALDRIVER
config TIVA_UART7
bool "UART7"
default n
depends on TIVA_HAVE_UART7
select ARCH_HAVE_UART7
select UART7_SERIALDRIVER
config TIVA_SSI0
bool "SSI0"
arch/arm/src/tms570/Kconfig
+2 -2
View File
@@ -88,14 +88,14 @@ config TMS570_MIBASPI1
config TMS570_SCI1
bool "Serial Communication Interface 1 (SCI1)"
default n
select ARCH_HAVE_SCI1
select SCI1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
config TMS570_SCI2
bool "Serial Communication Interface 2 (SCI2)"
default n
depends on TMS570_HAVE_SCI2
select ARCH_HAVE_SCI1
select SCI1_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS
endmenu # TMS570 Peripheral Support
arch/avr/src/at32uc3/Kconfig
+3 -6
View File
@@ -73,18 +73,15 @@ menu "AT32U3 Peripheral Selections"
config AVR32_USART0
bool "USART0"
default n
select ARCH_HAVE_USART0
config AVR32_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
config AVR32_USART2
bool "USART2"
default n
depends on ARCH_CHIP_AT32UC3B0
select ARCH_HAVE_USART2
endmenu # AT32U3 Peripheral Selections
@@ -108,7 +105,7 @@ config AVR32_USART0_MODEM
config AVR32_USART0_RS232
bool "USART0 is RS-232"
select USART0_ISUART
select USART0_SERIALDRIVER
config AVR32_USART0_RS485
bool "USART0 is RS-485"
@@ -140,7 +137,7 @@ config AVR32_USART1_MODEM
config AVR32_USART1_RS232
bool "USART1 is RS-232"
select USART1_ISUART
select USART1_SERIALDRIVER
config AVR32_USART1_RS485
bool "USART1 is RS-485"
@@ -172,7 +169,7 @@ config AVR32_USART2_MODEM
config AVR32_USART2_RS232
bool "USART2 is RS-232"
select USART2_ISUART
select USART2_SERIALDRIVER
config AVR32_USART2_RS485
bool "USART2 is RS-485"
arch/avr/src/at90usb/Kconfig
+1 -1
View File
@@ -41,7 +41,7 @@ config AVR_SPI
config AVR_USART1
bool "USART1"
default n
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
config AVR_USBDEV
bool "USB device"
arch/avr/src/atmega/Kconfig
+2 -2
View File
@@ -31,11 +31,11 @@ menu "ATMega Peripheral Selections"
config AVR_USART0
bool "USART0"
select ARCH_HAVE_USART0
select USART0_SERIALDRIVER
config AVR_USART1
bool "USART1"
select ARCH_HAVE_USART1
select USART1_SERIALDRIVER
endmenu # ATMega Peripheral Selections
arch/hc/src/m9s12/Kconfig
+2 -2
View File
@@ -11,12 +11,12 @@ menu "M9S12 Peripheral Selection"
config HCS12_SCI0
bool "SCI0"
default n
select ARCH_HAVE_SCI0
select SCI0_SERIALDRIVER
config HCS12_SCI1
bool "SCI1"
default n
select ARCH_HAVE_SCI1
select SCI1_SERIALDRIVER
endmenu # M9S12 Peripheral Selection

Some files were not shown because too many files have changed in this diff Show More