diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2013-05-17 12:49:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-20 15:12:40 -0400 |
commit | 582f55907d3f6cb762af20b56478bf25ef96430e (patch) | |
tree | 49f7abaab34dffe2e776f4f5e3f6d39aceda5454 /drivers/tty | |
parent | e424259e2e27290c457f65161ae62f7c89215b88 (diff) |
tty: Remove TTY_HW_COOK_IN/OUT
No in-tree tty driver supports cooked mode in hardware; remove.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/n_tty.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index d655416087b7..905a6fa5250e 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c | |||
@@ -647,8 +647,7 @@ static void process_echoes(struct tty_struct *tty) | |||
647 | if (no_space_left) | 647 | if (no_space_left) |
648 | break; | 648 | break; |
649 | } else { | 649 | } else { |
650 | if (O_OPOST(tty) && | 650 | if (O_OPOST(tty)) { |
651 | !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) { | ||
652 | int retval = do_output_char(c, tty, space); | 651 | int retval = do_output_char(c, tty, space); |
653 | if (retval < 0) | 652 | if (retval < 0) |
654 | break; | 653 | break; |
@@ -1516,12 +1515,7 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old) | |||
1516 | wake_up_interruptible(&tty->read_wait); | 1515 | wake_up_interruptible(&tty->read_wait); |
1517 | 1516 | ||
1518 | ldata->icanon = (L_ICANON(tty) != 0); | 1517 | ldata->icanon = (L_ICANON(tty) != 0); |
1519 | if (test_bit(TTY_HW_COOK_IN, &tty->flags)) { | 1518 | |
1520 | ldata->raw = 1; | ||
1521 | ldata->real_raw = 1; | ||
1522 | n_tty_set_room(tty); | ||
1523 | return; | ||
1524 | } | ||
1525 | if (I_ISTRIP(tty) || I_IUCLC(tty) || I_IGNCR(tty) || | 1519 | if (I_ISTRIP(tty) || I_IUCLC(tty) || I_IGNCR(tty) || |
1526 | I_ICRNL(tty) || I_INLCR(tty) || L_ICANON(tty) || | 1520 | I_ICRNL(tty) || I_INLCR(tty) || L_ICANON(tty) || |
1527 | I_IXON(tty) || L_ISIG(tty) || L_ECHO(tty) || | 1521 | I_IXON(tty) || L_ISIG(tty) || L_ECHO(tty) || |
@@ -2037,7 +2031,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, | |||
2037 | retval = -EIO; | 2031 | retval = -EIO; |
2038 | break; | 2032 | break; |
2039 | } | 2033 | } |
2040 | if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) { | 2034 | if (O_OPOST(tty)) { |
2041 | while (nr > 0) { | 2035 | while (nr > 0) { |
2042 | ssize_t num = process_output_block(tty, b, nr); | 2036 | ssize_t num = process_output_block(tty, b, nr); |
2043 | if (num < 0) { | 2037 | if (num < 0) { |