From ae32d4a9d60eca105fbf3e479d68dceba61fa512 Mon Sep 17 00:00:00 2001 From: todd <> Date: Tue, 19 Feb 2002 21:06:00 +0000 Subject: [PATCH] sync --- src/etc/etc.alpha/MAKEDEV | 27 ++++++++++++++++----------- src/etc/etc.amiga/MAKEDEV | 4 ++-- src/etc/etc.hp300/MAKEDEV | 4 ++-- src/etc/etc.hppa/MAKEDEV | 4 ++-- src/etc/etc.i386/MAKEDEV | 27 ++++++++++++++++----------- src/etc/etc.mac68k/MAKEDEV | 4 ++-- src/etc/etc.macppc/MAKEDEV | 27 ++++++++++++++++----------- src/etc/etc.sparc/MAKEDEV | 4 ++-- src/etc/etc.sparc64/MAKEDEV | 28 +++++++++++++++++----------- src/etc/etc.sun3/MAKEDEV | 4 ++-- 10 files changed, 77 insertions(+), 56 deletions(-) diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index b83045c0..0be59639 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.alpha/MAKEDEV.md,v 1.8 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.77 2002/02/17 05:14:54 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.78 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. @@ -51,7 +51,7 @@ # Terminal ports: # ttyB? DEC 3000 ZS8530 ("scc") serial ports # ttyC0 wscons screen 0 -# ttyC* wscons virtual consoles +# ttyC-F* wscons virtual consoles # wskbd* wscons keyboards # wsmux wscons keyboard/mouse mux devices # tty0* NS16x50 serial ports @@ -411,20 +411,25 @@ wskbd*) M wskbd$U c 29 $U 600 ;; -ttyC*) - U=${i##ttyC} +tty[C-F]*) + U=${i##tty[C-F]} + case $i in + ttyC*) n=C m=0;; + ttyD*) n=D m=256;; + ttyE*) n=E m=512;; + ttyF*) n=F m=768;; + esac case $U in - [0-9a-f]) M ttyC$U c 25 $(( 16#$U )) 600;; - cfg) M ttyCcfg c 25 255 600;; + [0-9a-f]) M tty$n$U c 25 $(( 16#$U + $m )) 600;; + cfg) M tty${n}cfg c 25 $((255+$m)) 600;; *) echo bad unit $U for $i; exit 1;; esac ;; wscons) - R ttyCcfg - R ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 - R ttyCa ttyCb wsmux wskbd0 wskbd1 wskbd2 wskbd3 - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 + R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 + R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 + R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb ;; fd*) diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV index 9cc23a65..6960cc92 100644 --- a/src/etc/etc.amiga/MAKEDEV +++ b/src/etc/etc.amiga/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.amiga/MAKEDEV.md,v 1.5 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.58 2002/02/17 05:14:54 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.59 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index 85b493de..a105616e 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.hp300/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.44 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.45 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV index 5a9a0828..b36c79de 100644 --- a/src/etc/etc.hppa/MAKEDEV +++ b/src/etc/etc.hppa/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.hppa/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.16 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.17 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index d3fab36b..da94fcab 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.i386/MAKEDEV.md,v 1.5 2002/02/17 05:14:30 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.121 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.122 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. @@ -53,7 +53,7 @@ # raid* RAIDframe disk devices # Console ports: # ttyC0 wscons screen 0 -# ttyC* wscons virtual consoles +# ttyC-F* wscons virtual consoles # wskbd* wscons keyboards # wsmux wscons keyboard/mouse mux devices # Pointing devices: @@ -464,20 +464,25 @@ wskbd*) M wskbd$U c 67 $U 600 ;; -ttyC*) - U=${i##ttyC} +tty[C-F]*) + U=${i##tty[C-F]} + case $i in + ttyC*) n=C m=0;; + ttyD*) n=D m=256;; + ttyE*) n=E m=512;; + ttyF*) n=F m=768;; + esac case $U in - [0-9a-f]) M ttyC$U c 12 $(( 16#$U )) 600;; - cfg) M ttyCcfg c 12 255 600;; + [0-9a-f]) M tty$n$U c 12 $(( 16#$U + $m )) 600;; + cfg) M tty${n}cfg c 12 $((255+$m)) 600;; *) echo bad unit $U for $i; exit 1;; esac ;; wscons) - R ttyCcfg - R ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 - R ttyCa ttyCb wsmux wskbd0 wskbd1 wskbd2 wskbd3 - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 + R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 + R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 + R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb ;; rd*) diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index 0e4a17b0..5bd7d31f 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.mac68k/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.48 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.49 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV index 5f40265c..f042670c 100644 --- a/src/etc/etc.macppc/MAKEDEV +++ b/src/etc/etc.macppc/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.macppc/MAKEDEV.md,v 1.4 2002/02/14 13:29:20 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.18 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.19 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. @@ -51,7 +51,7 @@ # ccd* concatenated disk devices # Console ports: # ttyC0 wscons screen 0 -# ttyC* wscons virtual consoles +# ttyC-F* wscons virtual consoles # wskbd* wscons keyboards # wsmouse* wscons mice # wsmux wscons keyboard/mouse mux devices @@ -374,20 +374,25 @@ wskbd*) M wskbd$U c 68 $U 600 ;; -ttyC*) - U=${i##ttyC} +tty[C-F]*) + U=${i##tty[C-F]} + case $i in + ttyC*) n=C m=0;; + ttyD*) n=D m=256;; + ttyE*) n=E m=512;; + ttyF*) n=F m=768;; + esac case $U in - [0-9a-f]) M ttyC$U c 67 $(( 16#$U )) 600;; - cfg) M ttyCcfg c 67 255 600;; + [0-9a-f]) M tty$n$U c 67 $(( 16#$U + $m )) 600;; + cfg) M tty${n}cfg c 67 $((255+$m)) 600;; *) echo bad unit $U for $i; exit 1;; esac ;; wscons) - R ttyCcfg - R ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 - R ttyCa ttyCb wsmux wskbd0 wskbd1 wskbd2 wskbd3 - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 + R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 + R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 + R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb ;; rd*) diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index 51a0bc1d..8f2f7ee0 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.sparc/MAKEDEV.md,v 1.9 2002/02/17 05:14:30 deraadt Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.86 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.87 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV index 9be9ea91..16469150 100644 --- a/src/etc/etc.sparc64/MAKEDEV +++ b/src/etc/etc.sparc64/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.sparc64/MAKEDEV.md,v 1.17 2002/02/14 13:29:21 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.57 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.58 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved. @@ -51,7 +51,7 @@ # raid* RAIDframe disk devices # Console ports: # ttyC0 wscons screen 0 -# ttyC* wscons virtual consoles +# ttyC-F* wscons virtual consoles # wskbd* wscons keyboards # wsmux wscons keyboard/mouse mux devices # console PROM console @@ -462,20 +462,26 @@ wskbd*) M wskbd$U c 79 $U 600 ;; -ttyC*) - U=${i##ttyC} +tty[C-F]*) + U=${i##tty[C-F]} + case $i in + ttyC*) n=C m=0;; + ttyD*) n=D m=256;; + ttyE*) n=E m=512;; + ttyF*) n=F m=768;; + esac case $U in - [0-9a-f]) M ttyC$U c 78 $(( 16#$U )) 600;; - cfg) M ttyCcfg c 78 255 600;; + [0-9a-f]) M tty$n$U c 78 $(( 16#$U + $m )) 600;; + cfg) M tty${n}cfg c 78 $((255+$m)) 600;; *) echo bad unit $U for $i; exit 1;; esac ;; wscons) - R ttyCcfg - R ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 - R ttyCa ttyCb wsmux wskbd0 wskbd1 wskbd2 wskbd3 - R wsmouse0 wsmouse1 wsmouse2 wsmouse3 + R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2 + R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 + R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb ttyDcfg ttyD0 ttyD1 + R ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb ;; rd*) diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV index 4e869b86..6417f463 100644 --- a/src/etc/etc.sun3/MAKEDEV +++ b/src/etc/etc.sun3/MAKEDEV @@ -4,10 +4,10 @@ # generated from: # # OpenBSD: etc.sun3/MAKEDEV.md,v 1.2 2002/02/14 13:29:21 todd Exp -# OpenBSD: MAKEDEV.mi,v 1.34 2002/02/17 05:14:30 deraadt Exp +# OpenBSD: MAKEDEV.mi,v 1.36 2002/02/19 21:05:10 todd Exp # OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp # -# $OpenBSD: MAKEDEV,v 1.52 2002/02/17 05:14:55 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.53 2002/02/19 21:06:00 todd Exp $ # # Copyright (c) 2001,2002 Todd T. Fries # All rights reserved.