lkml.org 
[lkml]   [2013]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/20] n_tty: Factor raw mode receive_buf() into separate fn
    Date
    Convert to modal receive_buf() processing; factor raw mode
    per-char i/o into n_tty_receive_buf_raw().

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/n_tty.c | 24 +++++++++++++++++++-----
    1 file changed, 19 insertions(+), 5 deletions(-)

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index b7c5ab3..40cc0a5 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -1258,11 +1258,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 (ldata->raw) {
    - put_tty_queue(c, ldata);
    - return;
    - }
    -
    if (I_ISTRIP(tty))
    c &= 0x7f;
    if (I_IUCLC(tty) && L_IEXTEN(tty))
    @@ -1529,6 +1524,23 @@ n_tty_receive_buf_real_raw(struct tty_struct *tty, const unsigned char *cp,
    ldata->read_head += n;
    }

    +static void
    +n_tty_receive_buf_raw(struct tty_struct *tty, const unsigned char *cp,
    + 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))
    + put_tty_queue(*cp++, ldata);
    + else
    + n_tty_receive_char_flagged(tty, *cp++, flag);
    + }
    +}
    +
    static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
    char *fp, int count)
    {
    @@ -1536,6 +1548,8 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,

    if (ldata->real_raw)
    n_tty_receive_buf_real_raw(tty, cp, fp, count);
    + else if (ldata->raw)
    + n_tty_receive_buf_raw(tty, cp, fp, count);
    else {
    char flag = TTY_NORMAL;

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-15 16:41    [W:2.107 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site