lkml.org 
[lkml]   [2021]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/44] tty: jsm_tty, make char+error handling readable
    Date
    The code for char+error handling in jsm_input was complete mess of
    letters. Introduce 3 new local variables and use them with care.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/serial/jsm/jsm_tty.c | 24 ++++++++++++++----------
    1 file changed, 14 insertions(+), 10 deletions(-)

    diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
    index 512b77195e9f..8e42a7682c63 100644
    --- a/drivers/tty/serial/jsm/jsm_tty.c
    +++ b/drivers/tty/serial/jsm/jsm_tty.c
    @@ -603,18 +603,22 @@ void jsm_input(struct jsm_channel *ch)

    if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
    for (i = 0; i < s; i++) {
    + u8 chr = ch->ch_rqueue[tail + i];
    + u8 error = ch->ch_equeue[tail + i];
    + char flag = TTY_NORMAL;
    +
    /*
    - * Give the Linux ld the flags in the
    - * format it likes.
    + * Give the Linux ld the flags in the format it
    + * likes.
    */
    - if (*(ch->ch_equeue + tail + i) & UART_LSR_BI)
    - tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_BREAK);
    - else if (*(ch->ch_equeue +tail +i) & UART_LSR_PE)
    - tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_PARITY);
    - else if (*(ch->ch_equeue +tail +i) & UART_LSR_FE)
    - tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_FRAME);
    - else
    - tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
    + if (error & UART_LSR_BI)
    + flag = TTY_BREAK;
    + else if (error & UART_LSR_PE)
    + flag = TTY_PARITY;
    + else if (error & UART_LSR_FE)
    + flag = TTY_FRAME;
    +
    + tty_insert_flip_char(port, chr, flag);
    }
    } else {
    tty_insert_flip_string(port, ch->ch_rqueue + tail, s);
    --
    2.30.1
    \
     
     \ /
      Last update: 2021-03-02 16:10    [W:3.346 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site