lkml.org 
[lkml]   [2013]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/9] n_tty: Factor ISTRIP and IUCLC receive_buf into separate fn
    Date
    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: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/n_tty.c | 44 ++++++++++++++++++++++++++++++++------------
    1 file changed, 32 insertions(+), 12 deletions(-)

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index 140b555..99bbee4 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -1417,16 +1417,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
    @@ -1584,7 +1574,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;

    @@ -1611,7 +1628,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)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-24 15:21    [W:3.234 / U:1.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site