From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-serial@vger.kernel.org,
Greg KH <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
"Gilles Buloz" <gilles.buloz@kontron.com>,
"Johan Hovold" <johan@kernel.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 1/3] tty: Add functions for handling flow control chars
Date: Fri, 8 Apr 2022 14:39:52 +0300 [thread overview]
Message-ID: <20220408113954.9749-2-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20220408113954.9749-1-ilpo.jarvinen@linux.intel.com>
Move receive path flow control character handling to own function
and a helper.
This seems cleanest approach especially once skipping due to lookahead
is added. Its downside is the duplicated START_CHAR and STOP_CHAR
checks.
No functional changes.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/n_tty.c | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index efc72104c840..90b3e06cbeb1 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1220,21 +1220,33 @@ n_tty_receive_signal_char(struct tty_struct *tty, int signal, unsigned char c)
process_echoes(tty);
}
+static bool n_tty_is_char_flow_ctrl(struct tty_struct *tty, unsigned char c)
+{
+ return c == START_CHAR(tty) || c == STOP_CHAR(tty);
+}
+
+/* Returns true if c is consumed as flow-control character */
+static bool n_tty_receive_char_flow_ctrl(struct tty_struct *tty, unsigned char c)
+{
+ if (!n_tty_is_char_flow_ctrl(tty, c))
+ return false;
+
+ if (c == START_CHAR(tty)) {
+ start_tty(tty);
+ process_echoes(tty);
+ } else if (c == STOP_CHAR(tty)) {
+ stop_tty(tty);
+ }
+
+ return true;
+}
+
static void n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)
{
struct n_tty_data *ldata = tty->disc_data;
- if (I_IXON(tty)) {
- if (c == START_CHAR(tty)) {
- start_tty(tty);
- process_echoes(tty);
- return;
- }
- if (c == STOP_CHAR(tty)) {
- stop_tty(tty);
- return;
- }
- }
+ if (I_IXON(tty) && n_tty_receive_char_flow_ctrl(tty, c))
+ return;
if (L_ISIG(tty)) {
if (c == INTR_CHAR(tty)) {
--
2.30.2
next prev parent reply other threads:[~2022-04-08 11:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 11:39 [PATCH v2 0/3] tty/serial: Process XON/XOFF robustly Ilpo Järvinen
2022-04-08 11:39 ` Ilpo Järvinen [this message]
2022-04-08 12:01 ` [PATCH v2 1/3] tty: Add functions for handling flow control chars Andy Shevchenko
2022-04-08 12:20 ` Ilpo Järvinen
2022-04-08 12:45 ` Andy Shevchenko
2022-04-08 11:39 ` [PATCH v2 2/3] tty: Add lookahead param to receive_buf Ilpo Järvinen
2022-04-08 11:58 ` Andy Shevchenko
2022-04-08 12:34 ` Ilpo Järvinen
2022-04-08 12:48 ` Ilpo Järvinen
2022-04-08 12:49 ` Andy Shevchenko
2022-04-08 14:17 ` Ilpo Järvinen
2022-04-08 11:39 ` [PATCH v2 3/3] tty: Implement lookahead to process XON/XOFF timely Ilpo Järvinen
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=20220408113954.9749-2-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gilles.buloz@kontron.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/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