This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 33cfd630ad arch/arm/src/s32k1xx: Fix LPUART inversion warnings &
config.
33cfd630ad is described below
commit 33cfd630ad4df72bb1925c0a62940bb4f40b8914
Author: Carlos Sanchez <[email protected]>
AuthorDate: Mon Oct 2 13:21:59 2023 +0200
arch/arm/src/s32k1xx: Fix LPUART inversion warnings & config.
---
arch/arm/src/s32k1xx/Kconfig | 12 ++++--------
arch/arm/src/s32k1xx/s32k1xx_serial.c | 5 +++--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm/src/s32k1xx/Kconfig b/arch/arm/src/s32k1xx/Kconfig
index 8147a91149..35f9c75a1a 100644
--- a/arch/arm/src/s32k1xx/Kconfig
+++ b/arch/arm/src/s32k1xx/Kconfig
@@ -628,14 +628,6 @@ config S32K1XX_EDMA_EDBG
endmenu # eDMA Global Configuration
-menu "LPUART Configuration"
- depends on S32K1XX_LPUART
-
-config S32K1XX_LPUART_INVERT
- bool "Signal Invert Support"
- default n
-endmenu
-
menu "LPSPI Configuration"
depends on S32K1XX_LPSPI
@@ -821,6 +813,10 @@ endmenu # LPI2C Configuration
menu "LPUART Configuration"
comment "LP Uart Driver Configuration"
+config S32K1XX_LPUART_INVERT
+ depends on S32K1XX_LPUART
+ bool "Signal Invert Support"
+ default n
config S32K1XX_LPUART_RXDMA_BUFFER_SIZE
int "Rx DMA buffer size"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c
b/arch/arm/src/s32k1xx/s32k1xx_serial.c
index df2b2ed83f..0298f1f056 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_serial.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c
@@ -1149,7 +1149,9 @@ static int s32k1xx_interrupt(int irq, void *context, void
*arg)
static int s32k1xx_ioctl(struct file *filep, int cmd, unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TIOCSERGSTRUCT) || defined(CONFIG_SERIAL_TERMIOS)
+#if defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
+ || defined(CONFIG_SERIAL_TERMIOS) \
+ || defined(CONFIG_S32K1XX_LPUART_INVERT)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
irqstate_t flags;
@@ -1347,7 +1349,6 @@ static int s32k1xx_ioctl(struct file *filep, int cmd,
unsigned long arg)
uint32_t ctrl;
uint32_t stat;
uint32_t regval;
- irqstate_t flags;
struct s32k1xx_uart_s *priv = (struct s32k1xx_uart_s *)dev->priv;
flags = spin_lock_irqsave(NULL);