diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/tty.c | 19 | ||||
| -rw-r--r-- | sys/kern/tty_conf.c | 7 | ||||
| -rw-r--r-- | sys/kern/tty_pty.c | 15 |
3 files changed, 6 insertions, 35 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 8248643322b..d46d29a1a7b 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.102 2013/10/11 12:44:12 millert Exp $ */ +/* $OpenBSD: tty.c,v 1.103 2013/12/13 19:55:12 naddy Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -183,9 +183,6 @@ ttyopen(dev_t device, struct tty *tp, struct proc *p) SET(tp->t_state, TS_ISOPEN); bzero(&tp->t_winsize, sizeof(tp->t_winsize)); tp->t_column = 0; -#ifdef COMPAT_OLDTTY - tp->t_flags = 0; -#endif } CLR(tp->t_state, TS_WOPEN); splx(s); @@ -740,16 +737,6 @@ ttioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p) case TIOCSTAT: case TIOCSTI: case TIOCSWINSZ: -#ifdef COMPAT_OLDTTY - case TIOCLBIC: - case TIOCLBIS: - case TIOCLSET: - case TIOCSETC: - case OTIOCSETD: - case TIOCSETN: - case TIOCSETP: - case TIOCSLTC: -#endif while (isbackground(pr, tp) && (pr->ps_flags & PS_PPWAIT) == 0 && (p->p_sigacts->ps_sigignore & sigmask(SIGTTOU)) == 0 && @@ -1041,11 +1028,7 @@ ttioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p) break; } default: -#ifdef COMPAT_OLDTTY - return (ttcompat(tp, cmd, data, flag, p)); -#else return (-1); -#endif } return (0); } diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 2b88bb4521c..f63ef7e6d2d 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_conf.c,v 1.16 2010/06/29 19:09:12 tedu Exp $ */ +/* $OpenBSD: tty_conf.c,v 1.17 2013/12/13 19:55:12 naddy Exp $ */ /* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */ /*- @@ -103,8 +103,9 @@ struct linesw linesw[] = { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, ttyerrinput, ttyerrstart, nullmodem }, /* 1- defunct */ - { ttyopen, ttylclose, ttread, ttwrite, nullioctl, - ttyinput, ttstart, ttymodem }, /* 2- old NTTYDISC */ + /* 2- old NTTYDISC (defunct) */ + { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, + ttyerrinput, ttyerrstart, nullmodem }, /* 3- TABLDISC (defunct) */ { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 1346ef36971..2b4ba3c9155 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_pty.c,v 1.62 2013/10/11 12:44:13 millert Exp $ */ +/* $OpenBSD: tty_pty.c,v 1.63 2013/12/13 19:55:12 naddy Exp $ */ /* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */ /* @@ -833,10 +833,6 @@ ptyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) ttyflush(tp, FREAD|FWRITE); return (0); -#ifdef COMPAT_OLDTTY - case TIOCSETP: - case TIOCSETN: -#endif case TIOCSETD: case TIOCSETA: case TIOCSETAW: @@ -886,15 +882,6 @@ ptyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) case TIOCSETA: case TIOCSETAW: case TIOCSETAF: -#ifdef COMPAT_OLDTTY - case TIOCSETP: - case TIOCSETN: - case TIOCSETC: - case TIOCSLTC: - case TIOCLBIS: - case TIOCLBIC: - case TIOCLSET: -#endif pti->pt_send |= TIOCPKT_IOCTL; ptcwakeup(tp, FREAD); default: |