From fe12b843d09c7c4d9f0e721504ea75c46bd2370d Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 3 Dec 2019 07:14:30 -0600 Subject: [PATCH] arch/arm/src/stm32/stm32_hciuart.c: CONFIG_STM32_HCIUART_DMAPRIO->CONFIG_STM32_HCIUART_RXDMAPRIO. --- arch/arm/src/stm32/Kconfig | 2 +- arch/arm/src/stm32/stm32_hciuart.c | 18 ++++++++--------- arch/arm/src/stm32/stm32_serial.c | 32 +++++++++++++++--------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index 32f0c306887..b02203c7bd7 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -8668,7 +8668,7 @@ config STM32_HCIUART_RXDMA_BUFSIZE Value given here will be rounded up to next multiple of 4 bytes. -config STM32_HCIUART_DMAPRIO +config STM32_HCIUART_RXDMAPRIO hex "HCI UART DMA priority" default 0x00001000 if STM32_STM32F10XX default 0x00010000 if !STM32_STM32F10XX diff --git a/arch/arm/src/stm32/stm32_hciuart.c b/arch/arm/src/stm32/stm32_hciuart.c index 612c788d3fa..840a57eaadc 100644 --- a/arch/arm/src/stm32/stm32_hciuart.c +++ b/arch/arm/src/stm32/stm32_hciuart.c @@ -158,13 +158,13 @@ /* DMA priority */ -# ifndef CONFIG_STM32_HCIUART_DMAPRIO +# ifndef CONFIG_STM32_HCIUART_RXDMAPRIO # if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F10XX) || \ defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX) || \ defined(CONFIG_STM32_STM32F37XX) -# define CONFIG_STM32_HCIUART_DMAPRIO DMA_CCR_PRIMED +# define CONFIG_STM32_HCIUART_RXDMAPRIO DMA_CCR_PRIMED # elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) -# define CONFIG_STM32_HCIUART_DMAPRIO DMA_SCR_PRIMED +# define CONFIG_STM32_HCIUART_RXDMAPRIO DMA_SCR_PRIMED # else # error "Unknown STM32 DMA" # endif @@ -172,12 +172,12 @@ # if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F10XX) || \ defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX) || \ defined(CONFIG_STM32_STM32F37XX) -# if (CONFIG_STM32_HCIUART_DMAPRIO & ~DMA_CCR_PL_MASK) != 0 -# error "Illegal value for CONFIG_STM32_HCIUART_DMAPRIO" +# if (CONFIG_STM32_HCIUART_RXDMAPRIO & ~DMA_CCR_PL_MASK) != 0 +# error "Illegal value for CONFIG_STM32_HCIUART_RXDMAPRIO" # endif # elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) -# if (CONFIG_STM32_HCIUART_DMAPRIO & ~DMA_SCR_PL_MASK) != 0 -# error "Illegal value for CONFIG_STM32_HCIUART_DMAPRIO" +# if (CONFIG_STM32_HCIUART_RXDMAPRIO & ~DMA_SCR_PL_MASK) != 0 +# error "Illegal value for CONFIG_STM32_HCIUART_RXDMAPRIO" # endif # else # error "Unknown STM32 DMA" @@ -192,7 +192,7 @@ DMA_SCR_MINC | \ DMA_SCR_PSIZE_8BITS | \ DMA_SCR_MSIZE_8BITS | \ - CONFIG_STM32_HCIUART_DMAPRIO | \ + CONFIG_STM32_HCIUART_RXDMAPRIO | \ DMA_SCR_PBURST_SINGLE | \ DMA_SCR_MBURST_SINGLE) # else @@ -201,7 +201,7 @@ DMA_CCR_MINC | \ DMA_CCR_PSIZE_8BITS | \ DMA_CCR_MSIZE_8BITS | \ - CONFIG_STM32_HCIUART_DMAPRIO) + CONFIG_STM32_HCIUART_RXDMAPRIO) # endif #endif diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index 286ca54b856..038598ca64a 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -194,13 +194,13 @@ /* DMA priority */ -# ifndef CONFIG_USART_DMAPRIO +# ifndef CONFIG_USART_RXDMAPRIO # if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F10XX) || \ defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX) || \ defined(CONFIG_STM32_STM32F37XX) -# define CONFIG_USART_DMAPRIO DMA_CCR_PRIMED +# define CONFIG_USART_RXDMAPRIO DMA_CCR_PRIMED # elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) -# define CONFIG_USART_DMAPRIO DMA_SCR_PRIMED +# define CONFIG_USART_RXDMAPRIO DMA_SCR_PRIMED # else # error "Unknown STM32 DMA" # endif @@ -208,12 +208,12 @@ # if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F10XX) || \ defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX) || \ defined(CONFIG_STM32_STM32F37XX) -# if (CONFIG_USART_DMAPRIO & ~DMA_CCR_PL_MASK) != 0 -# error "Illegal value for CONFIG_USART_DMAPRIO" +# if (CONFIG_USART_RXDMAPRIO & ~DMA_CCR_PL_MASK) != 0 +# error "Illegal value for CONFIG_USART_RXDMAPRIO" # endif # elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) -# if (CONFIG_USART_DMAPRIO & ~DMA_SCR_PL_MASK) != 0 -# error "Illegal value for CONFIG_USART_DMAPRIO" +# if (CONFIG_USART_RXDMAPRIO & ~DMA_SCR_PL_MASK) != 0 +# error "Illegal value for CONFIG_USART_RXDMAPRIO" # endif # else # error "Unknown STM32 DMA" @@ -222,14 +222,14 @@ /* DMA control word */ # if defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) -# define SERIAL_DMA_CONTROL_WORD \ - (DMA_SCR_DIR_P2M | \ - DMA_SCR_CIRC | \ - DMA_SCR_MINC | \ - DMA_SCR_PSIZE_8BITS | \ - DMA_SCR_MSIZE_8BITS | \ - CONFIG_USART_DMAPRIO | \ - DMA_SCR_PBURST_SINGLE | \ +# define SERIAL_DMA_CONTROL_WORD \ + (DMA_SCR_DIR_P2M | \ + DMA_SCR_CIRC | \ + DMA_SCR_MINC | \ + DMA_SCR_PSIZE_8BITS | \ + DMA_SCR_MSIZE_8BITS | \ + CONFIG_USART_RXDMAPRIO | \ + DMA_SCR_PBURST_SINGLE | \ DMA_SCR_MBURST_SINGLE) # else # define SERIAL_DMA_CONTROL_WORD \ @@ -237,7 +237,7 @@ DMA_CCR_MINC | \ DMA_CCR_PSIZE_8BITS | \ DMA_CCR_MSIZE_8BITS | \ - CONFIG_USART_DMAPRIO) + CONFIG_USART_RXDMAPRIO) # endif #endif