n_tty: Factor ISTRIP and IUCLC receive_buf into separate fn

[linux-2.6-microblaze.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 8686124..59c73ee 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.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;
        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
         * character is not one of the characters that we'll have to
@@ -1585,7 +1575,34 @@ n_tty_receive_buf_closing(struct tty_struct *tty, const unsigned char *cp,
 
 static void
 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;
 
@@ -1612,7 +1629,10 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
        else if (tty->closing && !L_EXTPROC(tty))
                n_tty_receive_buf_closing(tty, cp, fp, count);
        else {
-               n_tty_receive_buf_standard(tty, cp, fp, count);
+               if (!preops)
+                       n_tty_receive_buf_fast(tty, cp, fp, count);
+               else
+                       n_tty_receive_buf_standard(tty, cp, fp, count);
 
                flush_echoes(tty);
                if (tty->ops->flush_chars)