Remove some leftovers of line disciplines that are no more, ok?
Index: bin/stty/print.c
===================================================================
RCS file: /cvs/src/bin/stty/print.c,v
retrieving revision 1.14
diff -u -p -r1.14 print.c
--- bin/stty/print.c 23 Mar 2016 14:52:42 -0000 1.14
+++ bin/stty/print.c 25 Nov 2016 12:08:30 -0000
@@ -58,17 +58,8 @@ print(struct termios *tp, struct winsize
/* 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; ");
Index: sbin/ldattach/ldattach.c
===================================================================
RCS file: /cvs/src/sbin/ldattach/ldattach.c,v
retrieving revision 1.16
diff -u -p -r1.16 ldattach.c
--- sbin/ldattach/ldattach.c 15 Jan 2015 00:48:10 -0000 1.16
+++ sbin/ldattach/ldattach.c 25 Nov 2016 12:12:28 -0000
@@ -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;
Index: usr.sbin/pstat/pstat.8
===================================================================
RCS file: /cvs/src/usr.sbin/pstat/pstat.8,v
retrieving revision 1.51
diff -u -p -r1.51 pstat.8
--- usr.sbin/pstat/pstat.8 25 Sep 2016 15:23:37 -0000 1.51
+++ usr.sbin/pstat/pstat.8 25 Nov 2016 12:09:57 -0000
@@ -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
Index: usr.sbin/pstat/pstat.c
===================================================================
RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v
retrieving revision 1.111
diff -u -p -r1.111 pstat.c
--- usr.sbin/pstat/pstat.c 23 Oct 2016 18:14:01 -0000 1.111
+++ usr.sbin/pstat/pstat.c 25 Nov 2016 12:08:02 -0000
@@ -989,17 +989,8 @@ 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");
Index: share/man//man4/tty.4
===================================================================
RCS file: /cvs/src/share/man/man4/tty.4,v
retrieving revision 1.46
diff -u -p -r1.46 tty.4
--- share/man//man4/tty.4 2 Sep 2016 21:00:28 -0000 1.46
+++ share/man//man4/tty.4 25 Nov 2016 12:06:04 -0000
@@ -204,14 +204,8 @@ The available line disciplines currently
.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
