sync

7 files changed, 182 insertions, 171 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 4e9a7352bd0..5c4f2101934 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.1 2002/01/08 01:33:19 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.15 2002/01/08 05:10:38 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	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: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.63 2002/01/08 05:29:13 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.64 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -89,6 +89,8 @@
 #	ss*	SCSI scanners
 #	xfs*	XFS filesystem devices
 #	audio*	audio device
+#	speaker	pc speaker
+#	music*	midi devices
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -194,6 +196,11 @@ U=`unt $i`
 [ "$U" ] || U=0
 
 case $i in
+floppy)
+	R std wt0 fd0 wd0 wd1 sd0 sd1 tty00 tty01
+	R st0 cd0 ttyC0 random
+	;;
+
 raminst)
 	R std random
 	R sd0 sd1 sd2 wd0 st0
@@ -231,6 +238,17 @@ mmclock)
 	M mmclock c 28 0 444
 	;;
 
+music*)
+	M music$U     c 53 $U
+	M sequencer$U c 53 $(($U+128))
+	MKlist="$MKlist;[ -e music ] || ln -s music$U music"
+	MKlist="$MKlist;[ -e sequencer ] || ln -s sequencer$U sequencer"
+	;;
+
+speaker)
+	M speaker c 27 0 600
+	;;
+
 audio*)
 	M sound$U	c 24 $U
 	M mixer$U	c 24 $(($U+16))
@@ -284,8 +302,8 @@ fd)
 	;;
 
 usbs)
-	R usb0 usb1 uhid0 uhid1 uhid2 uhid3 ulpt0 ulpt1 ugen0 ugen1
-	R utty0 utty1
+	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+	R usb0 usb1
 	;;
 
 pci)
@@ -470,26 +488,23 @@ local)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 rd0
-	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf
-	R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R tty00 tty01 tty02 tty03 lkm mmclock
-	R lpa0 lpt0 lpa1 lpt1 lpa2 lpt2 random uk0 uk1 ss0 ss1 xfs0
-	R audio0 usbs iop0 iop1 pci wscons
-	;;
-
-sd*|ccd*|raid*|wd*)
+	R wscons pci iop0 iop1 usbs 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
+	R tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8
+	R bpf9 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
+	R fd0D fd0E fd0F fd0G fd0H rd0 raid0 raid1 raid2 raid3 wd0 wd1
+	R wd2 wd3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 ch0
+	R st0 pty0 fd sd0 sd1 sd2 sd3 sd4
+	;;
+
+wd*|sd*|raid*|ccd*)
 	case $i in
+	wd*) dodisk wd $U 0 36 $U 0;;
 	sd*) dodisk sd $U 8 8 $U 0;;
-	ccd*) dodisk ccd $U 7 27 $U 0;;
 	raid*) dodisk raid $U 16 43 $U 0;;
-	wd*) dodisk wd $U 0 36 $U 0;;
+	ccd*) dodisk ccd $U 7 27 $U 0;;
 	esac
 	;;
 
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 6a9181237d0..4cc1dfd2e50 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/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.15 2002/01/08 05:10:38 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.109 2002/01/08 05:29:13 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.110 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -253,8 +253,8 @@ mouse*)
 	;;
 
 usbs)
-	R usb0 usb1 urio uscanner0 uhid0 uhid1 uhid2 uhid3
-	R ulpt0 ulpt1 ugen0 ugen1 utty0 utty1
+	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+	R urio0 usb0 usb1
 	;;
 
 radio*)
@@ -561,27 +561,24 @@ local)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R mcd0 vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 rd0
-	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 pctr bktr0 altq pf crypto apm
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R tty00 tty01 tty02 tty03 lkm lpa0 lpt0 lpa1 lpt1 lpa2 lpt2
-	R joy0 joy1 random ses0 uk0 uk1 ss0 ss1 wt0 wdt0 xfs0 audio0
-	R speaker music0 radio0 tuner0
-	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 usbs
-	R  iop0 iop1 pci wscons
-	;;
-
-sd*|ccd*|raid*|wd*)
+	R wscons pci iop0 iop1 usbs rmidi0 rmidi1 rmidi2 rmidi3
+	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker
+	R audio0 xfs0 wdt0 wt0 ss0 uk0 ses0 rndrandom joy0 joy1 lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
+	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf altq
+	R pctr tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
+	R bpf7 bpf8 bpf9 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0
+	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H rd0 raid0 raid1 raid2
+	R raid3 wd0 wd1 wd2 wd3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2
+	R vnd3 std cd0 ch0 st0 pty0 fd mcd0 sd0 sd1 sd2 sd3 sd4
+	;;
+
+wd*|sd*|raid*|ccd*)
 	case $i in
+	wd*) dodisk wd $U 0 3 $U 0;;
 	sd*) dodisk sd $U 4 13 $U 0;;
-	ccd*) dodisk ccd $U 16 18 $U 0;;
 	raid*) dodisk raid $U 19 54 $U 0;;
-	wd*) dodisk wd $U 0 3 $U 0;;
+	ccd*) dodisk ccd $U 16 18 $U 0;;
 	esac
 	;;
 
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 7945542ade5..ef57429c0fa 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/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.15 2002/01/08 05:10:38 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.37 2002/01/08 05:29:13 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.38 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -355,11 +355,11 @@ fd)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf tty00 tty01 ttye0 lkm random
-	R uk0 uk1 ss0 ss1 xfs0 asc0 adb grf0 grf1 grf2 grf3 local
+	R local grf0 grf1 grf2 grf3 adb asc0 xfs0 ss0 uk0 rndrandom
+	R lkm ttye0 tty00 tty01 pf altq tun0 tun1 tun2 tun3 bpf0 bpf1
+	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 ccd0 ccd1 ccd2 ccd3
+	R vnd0 vnd1 vnd2 vnd3 std cd0 ch0 st0 pty0 fd sd0 sd1 sd2 sd3
+	R sd4
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 71dd58c8f93..a55aded0e5c 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/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.15 2002/01/08 05:10:38 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.5 2002/01/08 05:29:13 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -228,8 +228,8 @@ pci)
 	;;
 
 usbs)
-	R usb0 usb1 urio uscanner0 uhid0 uhid1 uhid2 uhid3
-	R ulpt0 ulpt1 ugen0 ugen1 utty0 utty1
+	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+	R urio0 usb0 usb1
 	;;
 
 crypto)
@@ -439,21 +439,20 @@ fd)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 rd0
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf crypto apm
-	R tty00 tty01 tty02 tty03 lkm random uk0 uk1 ss0 ss1 xfs0
-	R audio0 usbs iop0 iop1 pci wscons local
+	R local wscons pci iop0 iop1 usbs audio0 xfs0 ss0 uk0
+	R rndrandom lkm tty00 tty01 tty02 tty03 apm crypto pf altq
+	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
+	R bpf8 bpf9 rd0 raid0 raid1 raid2 raid3 wd0 wd1 wd2 wd3 ccd0
+	R ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 ch0 st0 pty0 fd
+	R sd0 sd1 sd2 sd3 sd4
 	;;
 
-sd*|ccd*|raid*|wd*)
+wd*|sd*|raid*|ccd*)
 	case $i in
+	wd*) dodisk wd $U 0 11 $U 0;;
 	sd*) dodisk sd $U 2 8 $U 0;;
-	ccd*) dodisk ccd $U 16 18 $U 0;;
 	raid*) dodisk raid $U 19 54 $U 0;;
-	wd*) dodisk wd $U 0 11 $U 0;;
+	ccd*) dodisk ccd $U 16 18 $U 0;;
 	esac
 	;;
 
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 58829f20dc4..f2ba811fc3b 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.4 2002/01/12 21:25:45 jason Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.17 2002/01/12 21:14:57 jason Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	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.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.74 2002/01/12 21:26:14 jason Exp $
+#	$OpenBSD: MAKEDEV,v 1.75 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -75,7 +75,9 @@
 #	tun*	network tunnel driver
 #	*random	inkernel random data source
 #	magma*	magma card (makes 16 tty and 2 bpp)
+#	bppmag[mno]	magma parallel port device
 #	spif*	spif card (makes 8 tty and 1 bpp)
+#	bpp[jkl]	spif parallel port device
 #	xfs*	XFS filesystem devices
 #	raid*	RAIDframe disk devices
 #	fd	makes fd/* for the fdescfs
@@ -216,55 +218,55 @@ std)
 	M kbd		c 29 0
 	;;
 
-magma*)
+ses*)
+	M ses$U c 124 $U 640 operator
+	;;
+
+fd)
+	RMlist="mkdir -p fd;$RMlist" n=0
+	while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
+	MKlist="$MKlist;chmod 555 fd"
+	;;
+
+xfs*)
+	M xfs$U c 51 $U 600
+	;;
+
+spif*)
 	case $U in
-	0)	offset=0  nam=m;;
-	1)	offset=16 nam=n;;
-	2)	offset=32 nam=o;;
+	0)	offset=0  nam=j;;
+	1)	offset=16 nam=k;;
+	2)	offset=32 nam=l;;
 	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
 	offset=$(($U*64))
 	n=0
-	while [ $n -lt 16 ]
+	while [ $n -lt 8 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c 100 $(($offset+$n)) 660 dialer uucp
+		M tty$name c 102 $(($offset+$n)) 660 dialer uucp
 		n=$(($n+1))
 	done
-	M bpp${nam}0 c 101 $(($offset+0)) 600 wheel root
-	M bpp${nam}1 c 101 $(($offset+1)) 600 wheel root
+	M bpp${nam}0 c 103 $(($offset+0)) 600
 	;;
 
-spif*)
+magma*)
 	case $U in
-	0)	offset=0  nam=j;;
-	1)	offset=16 nam=k;;
-	2)	offset=32 nam=l;;
+	0)	offset=0  nam=m;;
+	1)	offset=16 nam=n;;
+	2)	offset=32 nam=o;;
 	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
 	offset=$(($U*64))
 	n=0
-	while [ $n -lt 8 ]
+	while [ $n -lt 16 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c 102 $(($offset+$n)) 660 dialer uucp
+		M tty$name c 100 $(($offset+$n)) 660 dialer uucp
 		n=$(($n+1))
 	done
-	M bpp${nam}0 c 103 $(($offset+0)) 600 wheel root
-	;;
-
-ses*)
-	M ses$U c 124 $U 640 operator
-	;;
-
-fd)
-	RMlist="mkdir -p fd;$RMlist" n=0
-	while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
-	MKlist="$MKlist;chmod 555 fd"
-	;;
-
-xfs*)
-	M xfs$U c 51 $U 600
+	M bpp${nam}0 c 101 $(($offset+0)) 600
+	M bpp${nam}1 c 101 $(($offset+1)) 600
 	;;
 
 *random)
@@ -472,25 +474,23 @@ local)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3
-	R raid0 raid1 raid2 raid3 xy0 xy1 xy2 xy3 xd0 xd1 xd2 xd3 rd0
-	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf ttya ttyb ttyc ttyd
-	R cuaa cuab cuac cuad lkm random ses0 uk0 uk1 ss0 ss1 xfs0
-	R audio0 bwtwo0 cgtwo0 cgthree0 cgfour0 cgsix0 cgeight0
-	R cgfourteen0 tcx0
-	;;
-
-sd*|ccd*|raid*|xd*|xy*)
+	R tcx0 cgfourteen0 cgeight0 cgsix0 cgfour0 cgthree0 cgtwo0
+	R bwtwo0 audio0 xfs0 ss0 uk0 ses0 rndrandom lkm cuaa cuab cuac
+	R cuad ttya ttyb ttyc ttyd pf altq tun0 tun1 tun2 tun3 bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B fd1C
+	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
+	R fd0H rd0 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3 raid0 raid1 raid2
+	R raid3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 ch0
+	R st0 pty0 fd sd0 sd1 sd2 sd3 sd4
+	;;
+
+xd*|xy*|sd*|raid*|ccd*)
 	case $i in
-	sd*) dodisk sd $U 7 17 $U 0;;
-	ccd*) dodisk ccd $U 9 23 $U 0;;
-	raid*) dodisk raid $U 25 123 $U 0;;
 	xd*) dodisk xd $U 10 42 $U 0;;
 	xy*) dodisk xy $U 3 9 $U 0;;
+	sd*) dodisk sd $U 7 17 $U 0;;
+	raid*) dodisk raid $U 25 123 $U 0;;
+	ccd*) dodisk ccd $U 9 23 $U 0;;
 	esac
 	;;
 
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 37c3053058d..55becb85c35 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.8 2002/01/13 02:06:45 jason Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.17 2002/01/12 21:14:57 jason Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	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.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.41 2002/01/13 02:07:28 jason Exp $
+#	$OpenBSD: MAKEDEV,v 1.42 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -89,7 +89,9 @@
 #	lkm	loadable kernel modules interface
 #	*random	inkernel random data source
 #	magma*	magma card (makes 16 tty and 2 bpp)
+#	bppmag[mno]	magma parallel port device
 #	spif*	spif card (makes 8 tty and 1 bpp)
+#	bpp[jkl]	spif parallel port device
 #	crypto	hardware crypto access driver
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -230,47 +232,48 @@ mouse*)name=${i##mouse-}
 		$0 $name	# make the appropriate device
 	fi
 	RMlist="$RMlist mouse"
-	MKlist="$MKlist;ln -s $name mouse";;
+	MKlist="$MKlist;ln -s $name mouse"
+	;;
 
-magma*)
+crypto)
+	M crypto c 75 0
+	;;
+
+spif*)
 	case $U in
-	0)	offset=0  nam=m;;
-	1)	offset=16 nam=n;;
-	2)	offset=32 nam=o;;
+	0)	offset=0  nam=j;;
+	1)	offset=16 nam=k;;
+	2)	offset=32 nam=l;;
 	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
 	offset=$(($U*64))
 	n=0
-	while [ $n -lt 16 ]
+	while [ $n -lt 8 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c 71 $(($offset+$n)) 660 dialer uucp
+		M tty$name c 108 $(($offset+$n)) 660 dialer uucp
 		n=$(($n+1))
 	done
-	M bpp${nam}0 c 72 $(($offset+0)) 600 wheel root
-	M bpp${nam}1 c 72 $(($offset+1)) 600 wheel root
+	M bpp${nam}0 c 109 $(($offset+0)) 600
 	;;
 
-spif*)
+magma*)
 	case $U in
-	0)	offset=0  nam=j;;
-	1)	offset=16 nam=k;;
-	2)	offset=32 nam=l;;
+	0)	offset=0  nam=m;;
+	1)	offset=16 nam=n;;
+	2)	offset=32 nam=o;;
 	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
 	offset=$(($U*64))
 	n=0
-	while [ $n -lt 8 ]
+	while [ $n -lt 16 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c 108 $(($offset+$n)) 660 dialer uucp
+		M tty$name c 71 $(($offset+$n)) 660 dialer uucp
 		n=$(($n+1))
 	done
-	M bpp${nam}0 c 109 $(($offset+0)) 600 wheel root
-	;;
-
-crypto)
-	M crypto c 75 0
+	M bpp${nam}0 c 72 $(($offset+0)) 600
+	M bpp${nam}1 c 72 $(($offset+1)) 600
 	;;
 
 *random)
@@ -342,8 +345,8 @@ ses*)
 	;;
 
 usbs)
-	R usb0 usb1 urio uscanner0 uhid0 uhid1 uhid2 uhid3
-	R ulpt0 ulpt1 ugen0 ugen1 utty0 utty1
+	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
+	R urio0 usb0 usb1
 	;;
 
 uscanner*)
@@ -532,24 +535,22 @@ local)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 ch0 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 rd0
-	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf crypto ttyh0 ttyh1
-	R ttya ttyb ttyc ttyd cuaa cuab cuac cuad
-	R tty00 tty01 tty02 tty03 lkm random ses0 uk0 uk1 ss0 ss1 xfs0
-	R audio0 usbs wscons
-	;;
-
-sd*|ccd*|raid*|wd*)
+	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
+	;;
+
+wd*|sd*|raid*|ccd*)
 	case $i in
+	wd*) dodisk wd $U 12 26 $U 0;;
 	sd*) dodisk sd $U 7 17 $U 0;;
-	ccd*) dodisk ccd $U 9 23 $U 0;;
 	raid*) dodisk raid $U 25 121 $U 0;;
-	wd*) dodisk wd $U 12 26 $U 0;;
+	ccd*) dodisk ccd $U 9 23 $U 0;;
 	esac
 	;;
 
diff --git a/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV
index cc9d54309b7..89fc058ea76 100644
--- a/etc/etc.sun3/MAKEDEV
+++ b/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.15 2002/01/08 05:10:38 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.4 2002/01/07 06:54:10 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.18 2002/01/23 06:10:35 todd Exp 
+#	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.41 2002/01/08 05:29:14 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.42 2002/01/23 06:21:20 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -334,20 +334,19 @@ local)
 	;;
 
 all)
-	R std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1 st0 st1 cd0 cd1
-	R vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3 xy0 xy1 xy2 xy3
-	R xd0 xd1 xd2 xd3 rd0
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R tun0 tun1 tun2 tun3 altq pf ttya ttyb ttyc ttyd random
-	R uk0 uk1 ss0 ss1 xfs0 bwtwo0 cgtwo0 cgfour0 local
+	R local cgfour0 cgtwo0 bwtwo0 xfs0 ss0 uk0 rndrandom ttya
+	R ttyb ttyc ttyd pf altq tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
+	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 rd0 xd0 xd1 xd2 xd3 xy0
+	R xy1 xy2 xy3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0
+	R st0 pty0 fd sd0 sd1 sd2 sd3 sd4
 	;;
 
-sd*|ccd*|xd*|xy*)
+xd*|xy*|sd*|ccd*)
 	case $i in
-	sd*) dodisk sd $U 7 17 $U 0;;
-	ccd*) dodisk ccd $U 9 33 $U 0;;
 	xd*) dodisk xd $U 10 42 $U 0;;
 	xy*) dodisk xy $U 3 9 $U 0;;
+	sd*) dodisk sd $U 7 17 $U 0;;
+	ccd*) dodisk ccd $U 9 33 $U 0;;
 	esac
 	;;