On Tue, May 19, 2009 at 17:16 +0200, Marc Balmer wrote:
> Remove the STRIPDISC symbol completely and add MSTSDISC in a few places where
> it is missing.
>
> ok?
>
ok.
> Index: sys/sys/ttycom.h
> ===================================================================
> RCS file: /cvs/src/sys/sys/ttycom.h,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 ttycom.h
> --- sys/sys/ttycom.h 26 Aug 2008 14:42:34 -0000 1.1.1.1
> +++ sys/sys/ttycom.h 19 May 2009 15:12:30 -0000
> @@ -139,7 +139,6 @@
> #define TABLDISC 3 /* tablet discipline */
> #define SLIPDISC 4 /* serial IP discipline */
> #define PPPDISC 5 /* ppp discipline */
> -#define STRIPDISC 6 /* metricom wireless IP
> discipline */
> #define NMEADISC 7 /* NMEA0183 discipline */
> #define MSTSDISC 8 /* Meinberg time string
> discipline */
>
> Index: bin/stty/print.c
> ===================================================================
> RCS file: /cvs/src/bin/stty/print.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 print.c
> --- bin/stty/print.c 26 Aug 2008 14:36:31 -0000 1.1.1.1
> +++ bin/stty/print.c 19 May 2009 15:12:30 -0000
> @@ -72,11 +72,11 @@
> case PPPDISC:
> cnt += printf("ppp disc; ");
> break;
> - case STRIPDISC:
> - cnt += printf("strip disc; ");
> - break;
> case NMEADISC:
> cnt += printf("nmea disc; ");
> + break;
> + case MSTSDISC:
> + cnt += printf("msts disc; ");
> break;
> default:
> cnt += printf("#%d disc; ", ldisc);
> Index: sbin/slattach/slattach.c
> ===================================================================
> RCS file: /cvs/src/sbin/slattach/slattach.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 slattach.c
> --- sbin/slattach/slattach.c 26 Aug 2008 14:40:29 -0000 1.1.1.1
> +++ sbin/slattach/slattach.c 19 May 2009 15:12:30 -0000
> @@ -191,10 +191,6 @@
> {
> if (strcmp(name, "slip") == 0)
> return(SLIPDISC);
> -#ifdef STRIPDISC
> - else if (strcmp(name, "strip") == 0)
> - return(STRIPDISC);
> -#endif
> else
> usage();
> }
> Index: share/man/man4/tty.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/tty.4,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 tty.4
> --- share/man/man4/tty.4 26 Aug 2008 14:40:41 -0000 1.1.1.1
> +++ share/man/man4/tty.4 19 May 2009 15:12:31 -0000
> @@ -211,8 +211,6 @@
> 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
> Index: usr.sbin/pstat/pstat.8
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pstat/pstat.8,v
> retrieving revision 1.2
> diff -u -r1.2 pstat.8
> --- usr.sbin/pstat/pstat.8 26 Dec 2008 18:52:28 -0000 1.2
> +++ usr.sbin/pstat/pstat.8 19 May 2009 15:12:31 -0000
> @@ -206,14 +206,13 @@
> .Ql ppp
> for PPPDISC (see
> .Xr ppp 4 ) ,
> -.Ql strip
> -for STRIPDISC,
> -.\" (see
> -.\" .Xr strip 4 ) .
> -and
> -.Ql nmea
> +.Ql nmea ,
> for NMEADISC (see
> .Xr nmea 4 ) .
> +and
> +.Ql msts ,
> +for MSTSDISC (see
> +.Xr msts 4 ) .
> .El
> .It Fl v
> Print the active vnodes.
> Index: usr.sbin/pstat/pstat.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pstat/pstat.c,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 pstat.c
> --- usr.sbin/pstat/pstat.c 26 Aug 2008 14:44:31 -0000 1.1.1.1
> +++ usr.sbin/pstat/pstat.c 19 May 2009 15:12:31 -0000
> @@ -974,11 +974,11 @@
> case PPPDISC:
> (void)printf("ppp\n");
> break;
> - case STRIPDISC:
> - (void)printf("strip\n");
> - break;
> case NMEADISC:
> (void)printf("nmea\n");
> + break;
> + case MSTSDISC:
> + (void)printf("msts\n");
> break;
> default:
> (void)printf("%d\n", tp->t_line);
>
> --
> 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."
