From: Johan Hovold <johan@kernel.org>
To: linux-usb@vger.kernel.org
Cc: Sheng Long Wang <china_shenglong@163.com>,
Wang Sheng Long <shenglong.wang.ext@siemens.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Johan Hovold <johan@kernel.org>
Subject: [PATCH 3/6] USB: serial: cp210x: update control-characters on every change
Date: Mon, 18 Jan 2021 12:13:28 +0100 [thread overview]
Message-ID: <20210118111331.5048-4-johan@kernel.org> (raw)
In-Reply-To: <20210118111331.5048-1-johan@kernel.org>
Update the XON/XOFF control characters also when no other flow-control
flag has changed and software flow control is enabled.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/cp210x.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index ee0139eb6636..4f90573c0d2b 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -1113,11 +1113,13 @@ static int cp210x_set_chars(struct usb_serial_port *port,
static bool cp210x_termios_change(const struct ktermios *a, const struct ktermios *b)
{
- bool iflag_change;
+ bool iflag_change, cc_change;
iflag_change = ((a->c_iflag ^ b->c_iflag) & (INPCK | IXON | IXOFF));
+ cc_change = a->c_cc[VSTART] != b->c_cc[VSTART] ||
+ a->c_cc[VSTOP] != b->c_cc[VSTOP];
- return tty_termios_hw_change(a, b) || iflag_change;
+ return tty_termios_hw_change(a, b) || iflag_change || cc_change;
}
static void cp210x_set_flow_control(struct tty_struct *tty,
@@ -1132,7 +1134,9 @@ static void cp210x_set_flow_control(struct tty_struct *tty,
if (old_termios &&
C_CRTSCTS(tty) == (old_termios->c_cflag & CRTSCTS) &&
I_IXON(tty) == (old_termios->c_iflag & IXON) &&
- I_IXOFF(tty) == (old_termios->c_iflag & IXOFF)) {
+ I_IXOFF(tty) == (old_termios->c_iflag & IXOFF) &&
+ START_CHAR(tty) == old_termios->c_cc[VSTART] &&
+ STOP_CHAR(tty) == old_termios->c_cc[VSTOP]) {
return;
}
--
2.26.2
next prev parent reply other threads:[~2021-01-18 20:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 11:13 [PATCH 0/6] USB: serial: cp210x: add software flow-control support Johan Hovold
2021-01-18 11:13 ` [PATCH 1/6] USB: serial: cp210x: add support for software flow control Johan Hovold
2021-01-18 12:42 ` Greg Kroah-Hartman
2021-01-18 13:33 ` Johan Hovold
2021-01-18 11:13 ` [PATCH 2/6] USB: serial: cp210x: set IXOFF thresholds Johan Hovold
2021-01-18 11:13 ` Johan Hovold [this message]
2021-01-18 11:13 ` [PATCH 4/6] USB: serial: cp210x: drop short control-transfer checks Johan Hovold
2021-01-18 11:13 ` [PATCH 5/6] USB: serial: cp210x: drop unused includes Johan Hovold
2021-01-18 11:13 ` [PATCH 6/6] USB: serial: cp210x: add copyright notice Johan Hovold
2021-01-18 12:44 ` [PATCH 0/6] USB: serial: cp210x: add software flow-control support Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118111331.5048-4-johan@kernel.org \
--to=johan@kernel.org \
--cc=china_shenglong@163.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=shenglong.wang.ext@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).