Commit 6baad008 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

n_tty: Factor ISTRIP and IUCLC receive_buf into separate fn

Convert to modal receive_buf processing; factor char receive
processing for unusual termios settings out of normal per-char
i/o path.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b1f79c2
...@@ -1418,16 +1418,6 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c) ...@@ -1418,16 +1418,6 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
int parmrk; int parmrk;
if (I_ISTRIP(tty))
c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty))
c = tolower(c);
if (L_EXTPROC(tty)) {
put_tty_queue(c, ldata);
return;
}
/* /*
* If the previous character was LNEXT, or we know that this * If the previous character was LNEXT, or we know that this
* character is not one of the characters that we'll have to * character is not one of the characters that we'll have to
...@@ -1586,6 +1576,33 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp, ...@@ -1586,6 +1576,33 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
static void static void
n_tty_receive_buf_standard(struct tty_struct *tty, const unsigned char *cp, n_tty_receive_buf_standard(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) char *fp, int count)
{
struct n_tty_data *ldata = tty->disc_data;
char flag = TTY_NORMAL;
while (count--) {
if (fp)
flag = *fp++;
if (likely(flag == TTY_NORMAL)) {
unsigned char c = *cp++;
if (I_ISTRIP(tty))
c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty))
c = tolower(c);
if (L_EXTPROC(tty)) {
put_tty_queue(c, ldata);
continue;
}
n_tty_receive_char(tty, c);
} else
n_tty_receive_char_flagged(tty, *cp++, flag);
}
}
static void
n_tty_receive_buf_fast(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{ {
char flag = TTY_NORMAL; char flag = TTY_NORMAL;
...@@ -1612,6 +1629,9 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp, ...@@ -1612,6 +1629,9 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
else if (tty->closing && !L_EXTPROC(tty)) else if (tty->closing && !L_EXTPROC(tty))
n_tty_receive_buf_closing(tty, cp, fp, count); n_tty_receive_buf_closing(tty, cp, fp, count);
else { else {
if (!preops)
n_tty_receive_buf_fast(tty, cp, fp, count);
else
n_tty_receive_buf_standard(tty, cp, fp, count); n_tty_receive_buf_standard(tty, cp, fp, count);
flush_echoes(tty); flush_echoes(tty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment