summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2002-02-19 21:06:01 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2002-02-19 21:06:01 +0000
commit23b775fab884acb1570160ada54ec6bbe8a517b2 (patch)
tree3cc4166ebcf32ef7fc4ce61a91ec079d2dc0d472
parenta348e3b8dea1b795968e6bdd80adb64789c1d7b2 (diff)
sync
-rw-r--r--etc/etc.alpha/MAKEDEV27
-rw-r--r--etc/etc.amiga/MAKEDEV4
-rw-r--r--etc/etc.hp300/MAKEDEV4
-rw-r--r--etc/etc.hppa/MAKEDEV4
-rw-r--r--etc/etc.i386/MAKEDEV27
-rw-r--r--etc/etc.mac68k/MAKEDEV4
-rw-r--r--etc/etc.macppc/MAKEDEV27
-rw-r--r--etc/etc.sparc/MAKEDEV4
-rw-r--r--etc/etc.sparc64/MAKEDEV28
-rw-r--r--etc/etc.sun3/MAKEDEV4
10 files changed, 77 insertions, 56 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index b83045c02a2..0be59639f3a 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# 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/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 9cc23a65653..6960cc925c5 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 85b493de597..a105616e800 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 5a9a0828b06..b36c79dec18 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index d3fab36b7b1..da94fcab988 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# 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/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 0e4a17b0111..5bd7d31fb38 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 5f40265ca89..f042670c4da 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# 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/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 51a0bc1da44..8f2f7ee0eb9 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 9be9ea91f3f..16469150066 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# 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/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV
index 4e869b86096..6417f463c83 100644
--- a/etc/etc.sun3/MAKEDEV
+++ b/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 <todd@OpenBSD.org>
# All rights reserved.