From 12319e196d631ccedbbebd7b0896fb7aac377093 Mon Sep 17 00:00:00 2001
From: todd <>
Date: Wed, 23 Jan 2002 07:54:42 +0000
Subject: [PATCH] sync

---
 src/etc/etc.alpha/MAKEDEV   | 28 +++++++++++++---------------
 src/etc/etc.i386/MAKEDEV    | 16 ++++++++--------
 src/etc/etc.mac68k/MAKEDEV  | 15 ++++++---------
 src/etc/etc.macppc/MAKEDEV  | 18 +++++++-----------
 src/etc/etc.sparc/MAKEDEV   | 10 ++--------
 src/etc/etc.sparc64/MAKEDEV | 22 ++++++++--------------
 src/etc/etc.sun3/MAKEDEV    |  4 ++--
 7 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 5c4f2101..745ec97a 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.2 2002/01/23 06:15:53 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.3 2002/01/23 06:40:28 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.64 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.65 2002/01/23 07:54:41 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -90,6 +90,7 @@
 #	xfs*	XFS filesystem devices
 #	audio*	audio device
 #	speaker	pc speaker
+#	rmidi*	raw midi devices
 #	music*	midi devices
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -201,14 +202,6 @@ floppy)
 	R st0 cd0 ttyC0 random
 	;;
 
-raminst)
-	R std random
-	R sd0 sd1 sd2 wd0 st0
-	R cd0
-	R rd0 bpf0
-	R ttyB0 ttyB1 ttyE0 ttyE1 pty0
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 1 0
@@ -239,14 +232,18 @@ mmclock)
 	;;
 
 music*)
-	M music$U     c 53 $U
-	M sequencer$U c 53 $(($U+128))
+	M music$U     c 42 $U
+	M sequencer$U c 42 $(($U+128))
 	MKlist="$MKlist;[ -e music ] || ln -s music$U music"
 	MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
 	;;
 
+rmidi*)
+	M rmidi$U c 41 $U 666
+	;;
+
 speaker)
-	M speaker c 27 0 600
+	M speaker c 40 0 600
 	;;
 
 audio*)
@@ -488,7 +485,8 @@ local)
 	;;
 
 all)
-	R wscons pci iop0 iop1 usbs music0 speaker audio0 xfs0 ss0
+	R wscons pci iop0 iop1 usbs rmidi0 rmidi1 rmidi2 rmidi3
+	R rmidi4 rmidi5 rmidi6 rmidi7 music0 speaker audio0 xfs0 ss0
 	R uk0 rndrandom lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 mmclock lkm
 	R tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
 	R ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf altq tun0
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 4cc1dfd2..ba8cab2a 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.1 2002/01/07 07:52:35 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.110 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.111 2002/01/23 07:54:41 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -36,6 +36,7 @@
 #		Tries to make the ``standard'' number of each type.
 #	floppy	devices to be put on install floppies
 #	std	standard devices
+#	ramdisk	makes all devices for a ramdisk kernel
 #	local	configuration specific devices
 # Tapes:
 #	wt*		QIC-interface (e.g. not SCSI) 3M cartridge tape
@@ -216,12 +217,6 @@ floppy)
 	R st0 cd0 ttyC0 random
 	;;
 
-ramdisk)
-	R std lkm tty00 tty01 tty02 tty03 ttyC0 random
-	R wt0 fd0 rd0 wd0 wd1 wd2 wd3 bpf0
-	R sd0 sd1 sd2 sd3 st0 st1 cd0 cd1 mcd0
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 1 0
@@ -560,6 +555,11 @@ local)
 	test -s $T.local && sh $T.local
 	;;
 
+ramdisk)
+	R bpf0 std mcd0 st0 st1 cd0 cd1 sd0 sd1 sd2 sd3 wd0 wd1 wd2
+	R wd3 rd0 wt0 ttyC0
+	;;
+
 all)
 	R wscons pci iop0 iop1 usbs rmidi0 rmidi1 rmidi2 rmidi3
 	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index ef57429c..56cea9cb 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.1 2002/01/08 03:14:50 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.38 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.39 2002/01/23 07:54:41 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -171,13 +171,6 @@ U=`unt $i`
 [ "$U" ] || U=0
 
 case $i in
-ramdisk)
-	R std
-	R sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
-	R adb asc0 grf0 grf1 ttye0
-	R tty00 tty01 pty0
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 1 0
@@ -344,6 +337,10 @@ st*)
 	done
 	;;
 
+ramdisk)
+	R bpf0 std pty0 tty00 tty01 asc0 adb st0 st1 sd0 sd1 sd2 sd3
+	;;
+
 local)
 	test -s $T.local && sh $T.local
 	;;
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index a55aded0..c6c87143 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.2 2002/01/08 03:26:03 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.6 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 2002/01/23 07:54:41 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -31,6 +31,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices.
 #		Tries to make the ``standard'' number of each type.
@@ -190,15 +191,6 @@ U=`unt $i`
 [ "$U" ] || U=0
 
 case $i in
-ramdisk)
-	R std
-	R sd0 sd1 sd2 sd3 sd4 st0 st1 cd0 cd1
-	R rd0
-	R ttyE0
-	R random
-	R tty00 tty01 pty0
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 1 0
@@ -428,6 +420,10 @@ st*)
 	done
 	;;
 
+ramdisk)
+	R bpf0 std pty0 ttyE0 rd0 cd0 cd1 st0 st1 sd0 sd1 sd2 sd3 sd4
+	;;
+
 local)
 	test -s $T.local && sh $T.local
 	;;
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index f2ba811f..4e574993 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.5 2002/01/23 06:17:09 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.75 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.76 2002/01/23 07:54:42 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -192,12 +192,6 @@ floppy)
 	R fd0 sd0 sd1
 	;;
 
-ramdisk)
-	R std random
-	R fd0 sd0 sd1 sd2 sd3 rd0 cd0
-	R bpf0
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 2 0
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 55becb85..4c5cb6a6 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.9 2002/01/23 06:18:52 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.42 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.43 2002/01/23 07:54:42 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -203,12 +203,6 @@ floppy)
 	R st0 cd0 random
 	;;
 
-ramdisk)
-	R std lkm random
-	R fd0 rd0 wd0 wd1 wd2 wd3 bpf0
-	R sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
-	;;
-
 std)
 	M console	c 0 0 600
 	M tty		c 2 0
@@ -537,12 +531,12 @@ local)
 all)
 	R wscons usbs audio0 xfs0 ss0 uk0 ses0 rndrandom lkm tty00
 	R tty01 tty02 tty03 cuaa cuab cuac cuad ttya ttyb ttyc ttyd
-	R tth0 tth1 crypto pf altq tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
-	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B fd1C fd1D fd1E
-	R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H rd0
-	R raid0 raid1 raid2 raid3 wd0 wd1 wd2 wd3 ccd0 ccd1 ccd2 ccd3
-	R vnd0 vnd1 vnd2 vnd3 std cd0 ch0 st0 pty0 fd sd0 sd1 sd2 sd3
-	R sd4
+	R ttyh0 ttyh1 crypto pf altq tun0 tun1 tun2 tun3 bpf0 bpf1
+	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B fd1C fd1D
+	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
+	R rd0 raid0 raid1 raid2 raid3 wd0 wd1 wd2 wd3 ccd0 ccd1 ccd2
+	R ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 ch0 st0 pty0 fd sd0 sd1 sd2
+	R sd3 sd4
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 89fc058e..72115e9f 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.1 2002/01/08 00:59:59 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.20 2002/01/23 06:43:53 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.42 2002/01/23 06:21:20 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.43 2002/01/23 07:54:42 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.