sync

20 files changed, 244 insertions, 134 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 10599a6fdcf..342c3fe8fb9 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.43 2009/06/03 14:45:39 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.44 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -76,7 +76,7 @@
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
-#	music*	MIDI devices
+#	music*	MIDI sequencer
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
@@ -90,6 +90,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -245,6 +246,10 @@ ttyB*|ttyc*)
 	M cua$type$U c $major $(($minor+128)) 660 dialer uucp
 	;;
 
+vscsi*)
+	M vscsi$U c 61 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -539,14 +544,14 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H nnpfs0 ss0 ss1 ch0 bio hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2
-	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0
-	R speaker video0 audio0 audio1 audio2 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
-	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3
-	R ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd
+	R fd0G fd0H vscsi0 nnpfs0 ss0 ss1 ch0 bio hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
+	R music0 speaker video0 audio0 audio1 audio2 uk0 random lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
+	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2
+	R ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0
+	R raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index e0a960581e4..93fe636c806 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.36 2009/06/03 14:45:39 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.38 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -78,11 +78,12 @@
 #	crypto	Hardware crypto access driver
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
+#	gpio*	General Purpose Input/Output
 #	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
-#	music*	MIDI devices
+#	music*	MIDI sequencer
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
@@ -98,6 +99,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -248,6 +250,10 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
+vscsi*)
+	M vscsi$U c 89 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -343,6 +349,10 @@ gpr*)
 	M gpr$U c 80 $U
 	;;
 
+gpio*)
+	M gpio$U c 88 $U 600
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 22 $n;n=$(($n+1));done
@@ -576,18 +586,19 @@ local)
 	;;
 
 all)
-	R drm0 agp0 bthub0 bthub1 bthub2 nvram bktr0 ccd0 ccd1 ccd2
-	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
-	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D fd1E
-	R fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H nnpfs0
-	R ss0 ss1 ch0 hotplug ptm gpr0 local wscons pci0 pci1 pci2
-	R pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker video0
-	R audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
-	R lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3
-	R ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1
-	R wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R drm0 agp0 bthub0 bthub1 bthub2 nvram gpio0 gpio1 gpio2
+	R bktr0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2
+	R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3
+	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0
+	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
+	R fd0E fd0F fd0G fd0H vscsi0 nnpfs0 ss0 ss1 ch0 hotplug ptm
+	R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 speaker video0 audio0 audio1 audio2 uk0 random
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
+	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto
+	R pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 3be0c2c0d96..182d424226e 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.13 2009/06/03 14:45:39 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.15 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -85,6 +85,7 @@
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,6 +230,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
+vscsi*)
+	M vscsi$U c 100 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -492,12 +497,13 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
-	R ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
-	R iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
-	R rmidi7 tuner0 radio0 music0 video0 audio0 audio1 audio2 uk0
-	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
-	R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0
+	R nnpfs0 ss0 ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+	R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 audio0
+	R audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm
+	R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.aviion/MAKEDEV b/etc/etc.aviion/MAKEDEV
index a5d6b0b570d..5d85e76e7fe 100644
--- a/etc/etc.aviion/MAKEDEV
+++ b/etc/etc.aviion/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.8 2009/06/03 14:45:39 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.9 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -57,6 +57,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -197,6 +198,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -337,9 +342,9 @@ ramdisk)
 all)
 	R ttya ttyb ttyc ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
-	R ch0 nvram0 ptm local uk0 random lkm pf systrace std st0 st1
-	R fd
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0
+	R nnpfs0 ss0 ch0 nvram0 ptm local uk0 random lkm pf systrace
+	R std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 87da5d0abcc..583f25316dc 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.35 2009/06/03 14:45:39 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.36 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,6 +70,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -277,6 +278,10 @@ ppi*)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -454,8 +459,8 @@ all)
 	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 ccd0 ccd1
 	R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1
 	R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
-	R bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0 ptm local ppi0 apci0
-	R wscons uk0 random lkm pf systrace std st0 st1 fd
+	R bpf6 bpf7 bpf8 bpf9 pty0 vscsi0 nnpfs0 ss0 ch0 ptm local
+	R ppi0 apci0 wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|hd*|ccd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 6c351c7cf8d..b25a6b4d68c 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.38 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.39 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -82,6 +82,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -227,6 +228,10 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
+vscsi*)
+	M vscsi$U c 54 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 32 $U 600
 	;;
@@ -497,10 +502,11 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H nnpfs0 ss0 ss1 bio ch0 hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 uall video0 audio0 audio1 audio2 uk0
-	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R fd0G fd0H vscsi0 nnpfs0 ss0 ss1 bio ch0 hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall video0 audio0 audio1 audio2
+	R uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
+	R tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1
+	R fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 8156e02848c..bd309d952bf 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.15 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.16 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -73,6 +73,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -218,6 +219,10 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
+vscsi*)
+	M vscsi$U c 46 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 32 $U 600
 	;;
@@ -443,10 +448,10 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H nnpfs0 ss0 ss1 ch0 ptm local wscons pci0 pci1 pci2
-	R pci3 video0 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2
-	R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R fd0G fd0H vscsi0 nnpfs0 ss0 ss1 ch0 ptm local wscons pci0
+	R pci1 pci2 pci3 video0 audio0 audio1 audio2 uk0 random lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto
+	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index aabbfcaef2e..fc8a78591e6 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.52 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.53 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -86,7 +86,7 @@
 #	iop*	I2O controller devices
 #	joy*	Joystick driver
 #	lkm	Loadable kernel modules interface
-#	music*	MIDI devices
+#	music*	MIDI sequencer
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
@@ -102,6 +102,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -252,6 +253,10 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
+vscsi*)
+	M vscsi$U c 90 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -601,14 +606,14 @@ all)
 	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
-	R fd0D fd0E fd0F fd0G fd0H nnpfs0 ss0 ss1 ch0 hotplug ptm gpr0
-	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 music0 speaker video0 audio0 audio1 audio2 uk0 random
-	R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
-	R tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd mcd0
+	R fd0D fd0E fd0F fd0G fd0H vscsi0 nnpfs0 ss0 ss1 ch0 hotplug
+	R ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 music0 speaker video0 audio0 audio1 audio2 uk0
+	R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+	R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0
+	R raid1 raid2 raid3 std st0 st1 fd mcd0
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index f5259b54c97..e5ba96f4f9f 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.15 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.17 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -81,6 +81,7 @@
 #	systrace*	System call tracing device
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -225,6 +226,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
+vscsi*)
+	M vscsi$U c 99 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -468,12 +473,12 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
-	R ss1 ch0 ttya hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R radio0 music0 video0 audio0 audio1 audio2 uk0 random lkm
-	R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
-	R std st0 st1 fd
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0
+	R nnpfs0 ss0 ss1 ch0 ttya hotplug ptm local wscons pci0 pci1
+	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 radio0 music0 video0 audio0 audio1 audio2 uk0
+	R random lkm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
+	R raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index 7cf54327bdb..d9c1dd02e61 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.11 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.12 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -64,6 +64,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -204,6 +205,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -371,8 +376,9 @@ ramdisk)
 all)
 	R lcd ttya ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
 	R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
-	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0
-	R ptm local wscons uk0 random lkm pf systrace std st0 st1 fd
+	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0 nnpfs0
+	R ss0 ch0 ptm local wscons uk0 random lkm pf systrace std st0
+	R st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 0464337d49a..fcfa28c1024 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.29 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.30 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -64,6 +64,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,6 +230,10 @@ asc*)
 	M asc$U c 36 $U
 	;;
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -390,10 +395,10 @@ ramdisk)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0
-	R ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 bio ptm
-	R local wscons asc0 uk0 random lkm tty00 tty01 pf systrace std
-	R st0 st1 fd
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0
+	R nnpfs0 ss0 ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
+	R bio ptm local wscons asc0 uk0 random lkm tty00 tty01 pf
+	R systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index a912168e854..4560e71483b 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.39 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.40 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -88,6 +88,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -230,6 +231,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 83 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -516,9 +521,9 @@ all)
 	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
 	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 cuaa cuab
-	R ttya ttyb hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
-	R iop1 uall tuner0 radio0 video0 audio0 audio1 audio2 uk0
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0 nnpfs0 ss0 ss1 ch0 cuaa
+	R cuab ttya ttyb hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R iop0 iop1 uall tuner0 radio0 video0 audio0 audio1 audio2 uk0
 	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
 	R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 1daa40781ad..ca542729b4d 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.24 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.25 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -67,6 +67,7 @@
 #	vmel0	VMEbus D32 space
 #	vmes0	VMEbus D16 space
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -207,6 +208,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -422,8 +427,9 @@ all)
 	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd ccd0 ccd1 ccd2 ccd3
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0
 	R tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0
-	R sram0 ptm local uk0 random lkm pf systrace std st0 st1 fd
+	R bpf8 bpf9 pty0 vscsi0 nnpfs0 ss0 ss1 ch0 vmel0 vmes0 flash0
+	R nvram0 sram0 ptm local uk0 random lkm pf systrace std st0
+	R st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index 267fa58c960..e40cdb0fc29 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.23 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.24 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,6 +62,7 @@
 #	vmes0	VMEbus D16 space
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -202,6 +203,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 53 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -377,8 +382,8 @@ all)
 	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
 	R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ch0 vmel0 vmes0 nvram0 sram0
-	R ptm local uk0 random lkm pf systrace std st0 st1 fd
+	R bpf7 bpf8 bpf9 pty0 vscsi0 nnpfs0 ss0 ch0 vmel0 vmes0 nvram0
+	R sram0 ptm local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 262c4c2646d..38387aace05 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.25 2009/06/03 18:32:24 jasper Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.26 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -76,6 +76,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -215,6 +216,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
+vscsi*)
+	M vscsi$U c 68 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -443,10 +448,10 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
-	R nnpfs0 ss0 ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2
-	R pci3 uall video0 audio0 audio1 audio2 uk0 random tty00 tty01
-	R tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1
-	R fd
+	R vscsi0 nnpfs0 ss0 ss1 ch0 hotplug ptm local wscons pci0 pci1
+	R pci2 pci3 uall video0 audio0 audio1 audio2 uk0 random tty00
+	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index 909343d95a1..8a8228a0454 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.7 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.8 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -84,6 +84,7 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -224,6 +225,10 @@ std)
 	;;
 
 
+vscsi*)
+	M vscsi$U c 78 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -482,11 +487,11 @@ all)
 	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
 	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 nnpfs0 ss0 ss1 ch0 hotplug ptm
-	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall radio0
-	R video0 audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02
-	R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 vscsi0 nnpfs0 ss0 ss1 ch0
+	R hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
+	R radio0 video0 audio0 audio1 audio2 uk0 random lkm tty00
+	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3
+	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 14ed18b2231..08a45f6b708 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.39 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.40 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -79,6 +79,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -225,6 +226,10 @@ std)
 	M openprom	c 70 0	640 kmem
 	;;
 
+vscsi*)
+	M vscsi$U c 128 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -514,8 +519,8 @@ all)
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H nnpfs0 ss0 ss1 ch0 bio cuaa cuab cuac
-	R cuad ttya ttyb ttyc ttyd ptm local wscons audio0 audio1
+	R fd0E fd0F fd0G fd0H vscsi0 nnpfs0 ss0 ss1 ch0 bio cuaa cuab
+	R cuac cuad ttya ttyb ttyc ttyd ptm local wscons audio0 audio1
 	R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm pf
 	R systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 83525933354..d4ae644f07b 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.54 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.55 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -95,6 +95,7 @@
 #	uperf	Performance counters
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -241,6 +242,10 @@ std)
 	M mdesc		c 70 1 640 kmem
 	;;
 
+vscsi*)
+	M vscsi$U c 128 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -605,11 +610,11 @@ all)
 	R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C
 	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
-	R fd0H nnpfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug ptm
-	R local wscons pci0 pci1 pci2 pci3 uall video0 audio0 audio1
-	R audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
-	R tty01 tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0 wd1 wd2
-	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R fd0H vscsi0 nnpfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 audio0
+	R audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
+	R tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0
+	R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index bcd973cd11e..ca769f77249 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.37 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.vax/MAKEDEV.md,v 1.38 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -80,6 +80,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -273,6 +274,10 @@ ht*|tm*|mt*|ts*|ut*)
 	umask 77
 	;;
 
+vscsi*)
+	M vscsi$U c 78 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 74 $U 600
 	;;
@@ -515,9 +520,9 @@ local)
 all)
 	R dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0 sd1
 	R sd2 sd3 cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 pty0 nnpfs0 ss0 ptm local wscons uk0 random lkm pf
-	R systrace rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd
+	R bpf7 pty0 vscsi0 nnpfs0 ss0 ptm local wscons uk0 random lkm
+	R pf systrace rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0
+	R raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 up*|sd*|rx*|rl*|rb*|raid*|ra*|hp*|hk*|hd*|ccd*)
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index 8f576357e7a..eebff871f34 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.20 2009/06/03 14:45:40 jj Exp 
-#	OpenBSD: MAKEDEV.common,v 1.43 2009/06/03 14:45:39 jj Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.22 2009/08/13 15:12:36 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.45 2009/08/13 15:12:36 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -83,6 +83,7 @@
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
+#	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -227,6 +228,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
+vscsi*)
+	M vscsi$U c 100 $U 600
+	;;
+
 nnpfs*)
 	M nnpfs$U c 51 $U 600
 	;;
@@ -481,12 +486,12 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio nnpfs0
-	R ss0 ss1 ch0 hotplug ptm local wscons uall rmidi0 rmidi1
-	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
-	R music0 video0 audio0 audio1 audio2 uk0 random lkm tty00
-	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio vscsi0
+	R nnpfs0 ss0 ss1 ch0 hotplug ptm local wscons uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 video0 audio0 audio1 audio2 uk0 random lkm
+	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
+	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)