Remove leftovers of line disciplines that are no more.

ok mikeb@

5 files changed, 9 insertions, 44 deletions

diff --git a/bin/stty/print.c b/bin/stty/print.c
index 929e7555e49..cd291016d14 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.14 2016/03/23 14:52:42 mmcc Exp $	*/
+/*	$OpenBSD: print.c,v 1.15 2016/11/26 11:18:43 mpi Exp $	*/
 /*	$NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $	*/
 
 /*-
@@ -58,18 +58,9 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt)
 	/* Line discipline. */
 	if (ldisc != TTYDISC) {
 		switch(ldisc) {
-		case TABLDISC:
-			cnt += printf("tablet disc; ");
-			break;
-		case SLIPDISC:
-			cnt += printf("slip disc; ");
-			break;
 		case PPPDISC:
 			cnt += printf("ppp disc; ");
 			break;
-		case STRIPDISC:
-			cnt += printf("strip disc; ");
-			break;
 		case NMEADISC:
 			cnt += printf("nmea disc; ");
 			break;
diff --git a/sbin/ldattach/ldattach.c b/sbin/ldattach/ldattach.c
index 43045550d22..c133d1d6bd6 100644
--- a/sbin/ldattach/ldattach.c
+++ b/sbin/ldattach/ldattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldattach.c,v 1.16 2015/01/15 00:48:10 deraadt Exp $	*/
+/*	$OpenBSD: ldattach.c,v 1.17 2016/11/26 11:18:43 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -197,10 +197,7 @@ main(int argc, char *argv[])
 		dev = devn;
 	}
 
-	if (!strcmp(disc, "slip")) {
-		bits = 8;		/* make sure we use 8 databits */
-		ldisc = SLIPDISC;
-	} else if (!strcmp(disc, "nmea")) {
+	if (!strcmp(disc, "nmea")) {
 		ldisc = NMEADISC;
 		if (speed == 0)
 			speed = B4800;	/* default is 4800 baud for nmea */
@@ -279,8 +276,6 @@ main(int argc, char *argv[])
 			goto bail_out;
 		}
 		tty.c_cflag |= CLOCAL;
-		/* FALLTHROUGH */
-	case SLIPDISC:
 		tty.c_iflag = 0;
 		tty.c_lflag = 0;
 		tty.c_oflag = 0;
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index e1a5d7d1d83..1a03c2a7812 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tty.4,v 1.46 2016/09/02 21:00:28 tedu Exp $
+.\"	$OpenBSD: tty.4,v 1.47 2016/11/26 11:18:43 mpi Exp $
 .\"	$NetBSD: tty.4,v 1.4 1996/03/19 04:26:01 paulus Exp $
 .\"
 .\" Copyright (c) 1991, 1992, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)tty.4	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: September 2 2016 $
+.Dd $Mdocdate: November 26 2016 $
 .Dt TTY 4
 .Os
 .Sh NAME
@@ -204,14 +204,8 @@ The available line disciplines currently available are:
 .Bl -tag -width TIOCGWINSZ -compact
 .It TTYDISC
 Termios interactive line discipline.
-.It TABLDISC
-Tablet line discipline.
-.It SLIPDISC
-Serial IP line discipline.
 .It PPPDISC
 Point-to-Point Protocol line discipline.
-.It STRIPDISC
-Starmode Radio IP line discipline.
 .It NMEADISC
 NMEA 0183 line discipline.
 .It MSTSDISC
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 627ff32a8b4..e4b94194169 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pstat.8,v 1.51 2016/09/25 15:23:37 deraadt Exp $
+.\"	$OpenBSD: pstat.8,v 1.52 2016/11/26 11:18:43 mpi Exp $
 .\"	$NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)pstat.8	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: September 25 2016 $
+.Dd $Mdocdate: November 26 2016 $
 .Dt PSTAT 8
 .Os
 .Sh NAME
@@ -212,15 +212,9 @@ Line discipline:
 for
 TTYDISC (see
 .Xr termios 4 ) ,
-.Ql slip
-for SLIPDISC ,
 .Ql ppp
 for PPPDISC (see
-.Xr ppp 4 ) ,
-.Ql strip
-for STRIPDISC,
-.\" (see
-.\" .Xr strip 4 ) .
+.Xr ppp 4 )
 and
 .Ql nmea
 for NMEADISC (see
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 864d04bd4ca..ff26403a14c 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.111 2016/10/23 18:14:01 kettenis Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.112 2016/11/26 11:18:43 mpi Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -989,18 +989,9 @@ ttyprt(struct itty *tp)
 	case TTYDISC:
 		(void)printf("term\n");
 		break;
-	case TABLDISC:
-		(void)printf("tab\n");
-		break;
-	case SLIPDISC:
-		(void)printf("slip\n");
-		break;
 	case PPPDISC:
 		(void)printf("ppp\n");
 		break;
-	case STRIPDISC:
-		(void)printf("strip\n");
-		break;
 	case NMEADISC:
 		(void)printf("nmea\n");
 		break;