lkml.org 
[lkml]   [2013]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] tty: Remove TTY_HW_COOK_IN/OUT
    Date
    No in-tree tty driver supports cooked mode in hardware; remove.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/n_tty.c | 12 +++---------
    include/linux/tty.h | 2 --
    2 files changed, 3 insertions(+), 11 deletions(-)

    diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
    index 5d95873..f5b9211 100644
    --- a/drivers/tty/n_tty.c
    +++ b/drivers/tty/n_tty.c
    @@ -746,8 +746,7 @@ static size_t __process_echoes(struct tty_struct *tty)
    if (no_space_left)
    break;
    } else {
    - if (O_OPOST(tty) &&
    - !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
    + if (O_OPOST(tty)) {
    int retval = do_output_char(c, tty, space);
    if (retval < 0)
    break;
    @@ -1767,12 +1766,7 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
    wake_up_interruptible(&tty->read_wait);

    ldata->icanon = (L_ICANON(tty) != 0);
    - if (test_bit(TTY_HW_COOK_IN, &tty->flags)) {
    - ldata->raw = 1;
    - ldata->real_raw = 1;
    - n_tty_set_room(tty);
    - return;
    - }
    +
    if (I_ISTRIP(tty) || I_IUCLC(tty) || I_IGNCR(tty) ||
    I_ICRNL(tty) || I_INLCR(tty) || L_ICANON(tty) ||
    I_IXON(tty) || L_ISIG(tty) || L_ECHO(tty) ||
    @@ -2312,7 +2306,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
    retval = -EIO;
    break;
    }
    - if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
    + if (O_OPOST(tty)) {
    while (nr > 0) {
    ssize_t num = process_output_block(tty, b, nr);
    if (num < 0) {
    diff --git a/include/linux/tty.h b/include/linux/tty.h
    index e10846a..3efeb1b 100644
    --- a/include/linux/tty.h
    +++ b/include/linux/tty.h
    @@ -307,8 +307,6 @@ struct tty_file_private {
    #define TTY_DO_WRITE_WAKEUP 5 /* Call write_wakeup after queuing new */
    #define TTY_CLOSING 7 /* ->close() in progress */
    #define TTY_LDISC_OPEN 11 /* Line discipline is open */
    -#define TTY_HW_COOK_OUT 14 /* Hardware can do output cooking */
    -#define TTY_HW_COOK_IN 15 /* Hardware can do input cooking */
    #define TTY_PTY_LOCK 16 /* pty private */
    #define TTY_NO_WRITE_SPLIT 17 /* Preserve write boundaries to driver */
    #define TTY_HUPPED 18 /* Post driver->hangup() */
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-17 19:21    [W:3.223 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site