On Tue, May 19, 2009 at 17:46 +0200, Marc Balmer wrote:
> The tablet line discipline TABLDISC has been defunct for quite some time,
> I suggest we remove it as well.
>
> ok?
>
sure.
> Index: bin/stty/print.c
> ===================================================================
> RCS file: /cvs/src/bin/stty/print.c,v
> retrieving revision 1.2
> diff -u -r1.2 print.c
> --- bin/stty/print.c 19 May 2009 15:37:23 -0000 1.2
> +++ bin/stty/print.c 19 May 2009 15:43:41 -0000
> @@ -63,9 +63,6 @@
> /* Line discipline. */
> if (ldisc != TTYDISC) {
> switch(ldisc) {
> - case TABLDISC:
> - cnt += printf("tablet disc; ");
> - break;
> case SLIPDISC:
> cnt += printf("slip disc; ");
> break;
> Index: share/man/man4/tty.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/tty.4,v
> retrieving revision 1.2
> diff -u -r1.2 tty.4
> --- share/man/man4/tty.4 19 May 2009 15:37:23 -0000 1.2
> +++ share/man/man4/tty.4 19 May 2009 15:43:41 -0000
> @@ -205,8 +205,6 @@
> .Bl -tag -width TIOCGWINSZ -compact
> .It TTYDISC
> Termios interactive line discipline.
> -.It TABLDISC
> -Tablet line discipline.
> .It SLIPDISC
> Serial IP line discipline.
> .It PPPDISC
> Index: sys/compat/linux/linux_termios.c
> ===================================================================
> RCS file: /cvs/src/sys/compat/linux/linux_termios.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 linux_termios.c
> --- sys/compat/linux/linux_termios.c 26 Aug 2008 14:41:47 -0000 1.1.1.1
> +++ sys/compat/linux/linux_termios.c 19 May 2009 15:43:42 -0000
> @@ -558,10 +558,6 @@
> case PPPDISC:
> idat = LINUX_N_PPP;
> break;
> - /*
> - * Linux does not have the tablet line discipline.
> - */
> - case TABLDISC:
> default:
> idat = -1; /* XXX What should this be? */
> break;
> Index: sys/sys/ttycom.h
> ===================================================================
> RCS file: /cvs/src/sys/sys/ttycom.h,v
> retrieving revision 1.2
> diff -u -r1.2 ttycom.h
> --- sys/sys/ttycom.h 19 May 2009 15:37:23 -0000 1.2
> +++ sys/sys/ttycom.h 19 May 2009 15:43:42 -0000
> @@ -136,7 +136,6 @@
> #define TIOCMODS TIOCMSET
>
> #define TTYDISC 0 /* termios tty line discipline
> */
> -#define TABLDISC 3 /* tablet discipline */
> #define SLIPDISC 4 /* serial IP discipline */
> #define PPPDISC 5 /* ppp discipline */
> #define NMEADISC 7 /* NMEA0183 discipline */
> Index: usr.sbin/pstat/pstat.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v
> retrieving revision 1.2
> diff -u -r1.2 pstat.c
> --- usr.sbin/pstat/pstat.c 19 May 2009 15:37:23 -0000 1.2
> +++ usr.sbin/pstat/pstat.c 19 May 2009 15:43:43 -0000
> @@ -965,9 +965,6 @@
> case TTYDISC:
> (void)printf("term\n");
> break;
> - case TABLDISC:
> - (void)printf("tab\n");
> - break;
> case SLIPDISC:
> (void)printf("slip\n");
> break;
> --
> Marc Balmer, Micro Systems, Wiesendamm 2a, Postfach, CH-4019 Basel,
> Switzerland
> http://www.msys.ch/ http://www.vnode.ch/ "In God we trust, in C we
> code."
