add all the possible SCSI device types to the GENERIC configs.

9 files changed, 28 insertions, 9 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 004b73f38a1..cd7717859b8 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -118,6 +118,9 @@ scsibus* at	ncr?
 sd*	at	scsibus? target ? lun ?
 st*	at	scsibus? target ? lun ?
 cd*	at	scsibus? target ? lun ?
+ch*	at	scsibus? target ? lun ?
+ss*	at	scsibus? target ? lun ?
+uk*	at	scsibus? target ? lun ?
 
 pseudo-device	bpfilter
 pseudo-device	loop
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index b7e1d101e54..c5317c058b5 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.9 1996/05/07 09:36:07 niklas Exp $
+#	$OpenBSD: GENERIC,v 1.10 1996/05/15 08:56:13 mickey Exp $
 #	$NetBSD: GENERIC,v 1.56 1996/04/30 17:40:34 is Exp $
 
 #
@@ -223,10 +223,11 @@ scsibus*	at empsc0
 # each hard drive from low target to high
 # will configure to the next available sd unit number
 sd*	at scsibus? target ? lun ?	# scsi disks
-
 st*	at scsibus? target ? lun ?	# scsi tapes
 cd*	at scsibus? target ? lun ?	# scsi cd's
+ch*	at scsibus? target ? lun ?	# scsi cd changers
 ss*	at scsibus? target ? lun ?	# scsi scanners
+uk*	at scsibus? target ? lun ?	# unknown scsi
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	sl	1		# slip
diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC
index c54ee1aa88e..aa3b2d2266a 100644
--- a/sys/arch/arm32/conf/GENERIC
+++ b/sys/arch/arm32/conf/GENERIC
@@ -39,7 +39,7 @@ options		FDESC		# /dev/fd
 options		FIFO		# FIFOs; RECOMMENDED
 options		KERNFS		# /kern
 options		NULLFS		# loopback file system
-options		PORTAL		# ?
+options		PORTAL		# create sockets with open(2)
 options		PROCFS		# /proc
 options		UMAPFS		# NULLFS + uid and gid remapping
 options		UNION		# union file system
@@ -170,8 +170,8 @@ sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
 ch*	at scsibus? target ? lun ?	# SCSI auto-changers
-uk*	at scsibus? target ? lun ?	# SCSI unknown device
 ss*	at scsibus? target ? lun ?	# SCSI scanner
+uk*	at scsibus? target ? lun ?	# SCSI unknown device
 
 #kie*	at podulebus? slot ? offset ?
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b3595e33e2b..846ba592806 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.14 1996/05/14 18:38:13 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.15 1996/05/15 08:56:15 mickey Exp $
 #	$NetBSD: GENERIC,v 1.45 1996/05/07 00:59:53 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -162,6 +162,8 @@ sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
 ch*	at scsibus? target ? lun ?	# SCSI autochangers
+ss*	at scsibus? target ? lun ?	# SCSI scanners
+uk*	at scsibus? target ? lun ?	# unknown SCSI
 
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370 irq ? drq ?
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index 649d126da18..e42e1aa2dc3 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.5 1996/04/28 11:24:33 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.6 1996/05/15 08:56:15 mickey Exp $
 
 machine		mvme68k m68k
 
@@ -104,3 +104,6 @@ scsibus* at siop?
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+ch*	at scsibus? target ? lun ?
+ss*	at scsibus? target ? lun ?
+uk*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 1b451e53073..8d7f9c4d43b 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC AMIGA
 #
-#	$Id: GENERIC,v 1.1 1995/10/18 10:54:18 deraadt Exp $
+#	$Id: GENERIC,v 1.2 1996/05/15 08:56:16 mickey Exp $
 #
 # This configuration file contains all possible options
 #
@@ -106,9 +106,11 @@ scsibus1	at bugscsi0
 # each hard drive from low target to high
 # will configure to the next available sd unit number
 sd*	at scsibus? target ? lun ?	# scsi disks
-
 st*	at scsibus? target ? lun ?	# scsi tapes
 cd*	at scsibus? target ? lun ?	# scsi cd's
+ch*	at scsibus? target ? lun ?	# scsi cd changers
+ss*	at scsibus? target ? lun ?	# scsi scanners
+uk*	at scsibus? target ? lun ?	# unknown scsi
 
 pseudo-device	sl			# slip
 pseudo-device	ppp			# ppp
diff --git a/sys/arch/pica/conf/GENERIC b/sys/arch/pica/conf/GENERIC
index b7117683508..c0261a93ea9 100644
--- a/sys/arch/pica/conf/GENERIC
+++ b/sys/arch/pica/conf/GENERIC
@@ -80,6 +80,9 @@ scsibus* 	at asc?
 sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?
 cd*		at scsibus? target ? lun ?
+ch*		at scsibus? target ? lun ?
+ss*		at scsibus? target ? lun ?
+uk*		at scsibus? target ? lun ?
 
 pseudo-device	sl		 2	# serial-line IP ports
 pseudo-device	ppp		 2	# serial-line PPP ports
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 4c3b84dc616..61af08d2ad3 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -147,6 +147,9 @@ scsibus* at sw?
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+ch*	at scsibus? target ? lun ?
+ss*	at scsibus? target ? lun ?
+uk*	at scsibus? target ? lun ?
 
 fdc0	at mainbus0
 fd*	at fdc0
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 231c753f246..6f1a0db6f45 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -148,7 +148,9 @@ st* at scsibus? target ? lun ?
 cd0 at scsibus? target 6 lun 0
 cd* at scsibus? target ? lun ?
 
-#ch* at scsibus? target ? lun ?
+ch* at scsibus? target ? lun ?
+ss* at scsibus? target ? lun ?
+uk* at scsibus? target ? lun ?
 
 # RAM-disk drivers
 pseudo-device	rd	2