From c6c9064464f55e2d8a99f5bb35b172ca00214105 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 10 Oct 2018 06:45:03 -0600 Subject: [PATCH] EFM32, Kinetis, BCM2708: Juha Niskanen's fix of commit 4a32325e3c01598d436db76bb30cb82f8365a093 also applies to BCM2708, EFM32, and Kinetis. --- arch/arm/src/bcm2708/bcm_miniuart.c | 2 +- arch/arm/src/efm32/efm32_serial.c | 2 +- arch/arm/src/kinetis/kinetis_lpserial.c | 2 +- arch/arm/src/kinetis/kinetis_serial.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/bcm2708/bcm_miniuart.c b/arch/arm/src/bcm2708/bcm_miniuart.c index a035bd1213..0f5075b334 100644 --- a/arch/arm/src/bcm2708/bcm_miniuart.c +++ b/arch/arm/src/bcm2708/bcm_miniuart.c @@ -450,7 +450,7 @@ static int bcm_ioctl(struct file *filep, int cmd, unsigned long arg) /* Perform some sanity checks before accepting any changes */ if (((termiosp->c_cflag & CSIZE) != CS8) -# ifdef CONFIG_SERIAL_IFLOWCONTROL +# ifdef CONFIG_SERIAL_OFLOWCONTROL || ((termiosp->c_cflag & CCTS_OFLOW) && (priv->cts_gpio == 0)) # endif # ifdef CONFIG_SERIAL_IFLOWCONTROL diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c index 46df453799..9034d65de7 100644 --- a/arch/arm/src/efm32/efm32_serial.c +++ b/arch/arm/src/efm32/efm32_serial.c @@ -866,7 +866,7 @@ static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg) /* Perform some sanity checks before accepting any changes */ if (((termiosp->c_cflag & CSIZE) != CS8) -#ifdef CONFIG_SERIAL_IFLOWCONTROL +#ifdef CONFIG_SERIAL_OFLOWCONTROL || ((termiosp->c_cflag & CCTS_OFLOW) && (priv->cts_gpio == 0)) #endif #ifdef CONFIG_SERIAL_IFLOWCONTROL diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c index 64091d6e73..037651217f 100644 --- a/arch/arm/src/kinetis/kinetis_lpserial.c +++ b/arch/arm/src/kinetis/kinetis_lpserial.c @@ -915,7 +915,7 @@ static int kinetis_ioctl(struct file *filep, int cmd, unsigned long arg) /* Perform some sanity checks before accepting any changes */ if (((termiosp->c_cflag & CSIZE) != CS8) -# ifdef CONFIG_SERIAL_IFLOWCONTROL +# ifdef CONFIG_SERIAL_OFLOWCONTROL || ((termiosp->c_cflag & CCTS_OFLOW) && (priv->cts_gpio == 0)) # endif # ifdef CONFIG_SERIAL_IFLOWCONTROL diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 42bf6d4f08..07998f60c5 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -1382,7 +1382,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) /* Perform some sanity checks before accepting any changes */ if (((termiosp->c_cflag & CSIZE) != CS8) -# ifdef CONFIG_SERIAL_IFLOWCONTROL +# ifdef CONFIG_SERIAL_OFLOWCONTROL || ((termiosp->c_cflag & CCTS_OFLOW) && (priv->cts_gpio == 0)) # endif # ifdef CONFIG_SERIAL_IFLOWCONTROL