sd->da, od is gone, no SCSI control devices.

new pass, xpt, and targ devices.

Nuke no longer used AHC options.

14 files changed, 266 insertions, 257 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 17978d9..6d75391 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.114 1998/08/17 16:46:33 bde Exp $
+#	$Id: GENERIC,v 1.115 1998/09/04 19:55:51 msmith Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -32,8 +32,8 @@ options		FFS_ROOT		#FFS usable as root device [keep this!]
 options		NFS_ROOT		#NFS usable as root device
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
-options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
+options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options		SCSI_CAM		#We're using CAM in this kernel
 options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
@@ -70,7 +70,7 @@ device		wfd0		#IDE Floppy (e.g. LS-120)
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
 controller	ncr0
-controller	amd0
+#controller	amd0
 controller	ahb0
 controller	ahc0
 controller	isp0
@@ -79,24 +79,25 @@ controller	isp0
 # document here  - see the LINT file in this directory and look up the
 # dpt0 entry there for much fuller documentation on this.  The options
 # line following dpt0 here is also currently a *required* option for it.
-controller      dpt0
-options DPT_MEASURE_PERFORMANCE
-
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
-controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
-controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
-controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
+# controller      dpt0
+# options DPT_MEASURE_PERFORMANCE
+
+controller	adv0	at isa? port ? cam irq ?
+controller	bt0	at isa? port ? cam irq ?
+controller	aha0	at isa? port ? cam irq ?
+#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
+#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
+#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
+#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
 
 controller	scbus0
 
-device		sd0
+device		da0
 
-device		od0	#See LINT for possible `od' options.
+device		sa0
 
-device		st0
+device		pass0
 
 device		cd0	#Only need one of these, the code dynamically grows
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4eb2568..0755653 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.462 1998/09/11 18:50:16 rvb Exp $
+#	$Id: LINT,v 1.463 1998/09/14 19:56:38 sos Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -588,8 +588,8 @@ options		"_KPOSIX_VERSION=199309L"
 
 # This old behavior is maintained as the default behavior.  The unit
 # assignment begins with the first non-wired down unit for a device
-# type.  For example, if you wire a disk as "sd3" then the first
-# non-wired disk will be assigned sd4.
+# type.  For example, if you wire a disk as "da3" then the first
+# non-wired disk will be assigned da4.
 
 # The syntax for wiring down devices is:
 
@@ -597,9 +597,9 @@ options		"_KPOSIX_VERSION=199309L"
 # controller	scbus1 at ahc1 bus 0	# Single bus device
 # controller	scbus3 at ahc2 bus 0	# Twin bus device
 # controller	scbus2 at ahc2 bus 1	# Twin bus device
-# disk 		sd0 at scbus0 target 0 unit 0
-# disk		sd1 at scbus3 target 1
-# disk		sd2 at scbus2 target 3
+# disk 		da0 at scbus0 target 0 unit 0
+# disk		da1 at scbus3 target 1
+# disk		da2 at scbus2 target 3
 # tape		st1 at scbus1 target 6
 # device	cd0 at scbus?
 
@@ -613,47 +613,59 @@ options		"_KPOSIX_VERSION=199309L"
 
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
-device		sd0	#SCSI disks
-device		st0	#SCSI tapes
+device		da0	#SCSI direct access devices (aka disks)
+device		sa0	#SCSI tapes
 device		cd0	#SCSI CD-ROMs
-device		od0	#SCSI optical disk
+#device		od0	#SCSI optical disk
+device		pass0	#CAM passthrough driver
 
-# The previous devices (ch, sd, st, cd) are recognized by config.
+# The previous devices (ch, da, st, cd) are recognized by config.
 # config doesn't (and shouldn't) know about these newer ones,
 # so we have to specify that they are on a SCSI bus with the "at scbus?"
 # clause.
 
-device worm0 at scbus?	# SCSI worm
 device pt0 at scbus?	# SCSI processor type
 device sctarg0 at scbus? # SCSI target
 
-# SCSI OPTIONS:
-
-# SCSIDEBUG: When defined enables debugging macros
-# NO_SCSI_SENSE: When defined disables sense descriptions (about 4k)
+# CAM OPTIONS:
+# debugging options:
+# -- NOTE --  If you specify one of the bus/target/lun options, you must
+#             specify them all!
+# CAMDEBUG: When defined enables debugging macros
+# CAM_DEBUG_BUS:  Debug the given bus.  Use -1 to debug all busses.
+# CAM_DEBUG_TARGET:  Debug the given target.  Use -1 to debug all targets.
+# CAM_DEBUG_LUN:  Debug the given lun.  Use -1 to debug all luns.
+# CAM_DEBUG_FLAGS:  OR together CAM_DEBUG_INFO, CAM_DEBUG_TRACE and
+#                   CAM_DEBUG_SUBTRACE
+# 
+# CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
+# SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
+# SCSI_NO_OP_STRINGS: When defined disables opcode descriptions
 # SCSI_REPORT_GEOMETRY: Always report disk geometry at boot up instead
 #                       of only when booting verbosely.
-options		SCSIDEBUG
-#options	NO_SCSI_SENSE
+options		CAMDEBUG
+options		"CAM_DEBUG_BUS=-1"
+options		"CAM_DEBUG_TARGET=-1"
+options		"CAM_DEBUG_LUN=-1"
+options		"CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_SUBTRACE"
+options		"CAM_MAX_HIGHPOWER=4"
+options		SCSI_NO_SENSE_STRINGS
+options		SCSI_NO_OP_STRINGS
 options		SCSI_REPORT_GEOMETRY
 
-# Options for the `od' optical disk driver:
-#
-# If drive returns sense key as 0x02 with vendor specific additional
-# sense code (ASC) and additional sense code qualifier (ASCQ), or
-# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
-# To suppress this, use the following option.
-#
-options		OD_BOGUS_NOT_READY
+# Options for the CAM CDROM driver:
+# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
+# CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only
+#                           enforced if there is I/O waiting for another LUN
+# The compiled in defaults for these variables are 2 and 10 seconds,
+# respectively.
 #
-# For an automatic spindown, try this.  Again, preferably as an
-# option in your config file.
-# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
-# groks it fine, while Shunsuke's Fujitsu chokes on it and times
-# out.
+# These can also be changed on the fly with the following sysctl variables:
+# kern.cam.cd.changer.min_busy_seconds
+# kern.cam.cd.changer.max_busy_seconds
 #
-options		OD_AUTO_TURNOFF
-
+options		"CHANGER_MIN_BUSY_SECONDS=2"
+options		"CHANGER_MAX_BUSY_SECONDS=10"
 
 
 #####################################################################
@@ -674,10 +686,6 @@ pseudo-device	ccd	4	#Concatenated disk driver
 # broken
 #pseudo-device	tb
 
-# These are only for watching for bitrot in old SCSI code.
-pseudo-device	su		#scsi user
-pseudo-device	ssc		#super scsi
-
 # Size of the kernel message buffer.  Should be N * pagesize.
 options		"MSGBUF_SIZE=40960"
 
@@ -819,6 +827,7 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 #
 # SCSI host adapters: `aha', `aic', `bt', `nca'
 #
+# adv: Most AdvanSys SCSI controllers
 # aha: Adaptec 154x
 # ahc: Adaptec 274x/284x/294x
 # aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
@@ -832,7 +841,8 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
+controller	bt0	at isa? port "IO_BT0" cam irq ?
+controller	adv0	at isa? port ? cam irq ?
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
@@ -1315,13 +1325,6 @@ controller	ahb0
 controller	ahc0
 device		fea0
 
-# enable tagged command queuing, which is a major performance win on
-# devices that support it (and controllers with enough SCB's)
-options	AHC_TAGENABLE
-
-# enable SCB paging - See the ahc.4 man page
-options	AHC_SCBPAGING_ENABLE
-
 # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set. Unfortunately,
 # this doesn't work on some motherboards, which prevents it from being the
@@ -1598,8 +1601,8 @@ options		PCVT_SCREENSAVER
 options		PCVT_USEKBDSEC
 options		"PCVT_VT220KEYB"
 options		PSM_DEBUG=1
-options		"SCSI_2_DEF"
-options		SCSI_DELAY=8	# Be pessimistic about Joe SCSI device
+options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options		SCSI_CAM	#We're using CAM in this kernel
 options		SCSI_NCR_DEBUG
 options		SCSI_NCR_DFLT_TAGS=4
 options		SCSI_NCR_MAX_SYNC=10000
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index e2a865e..5302df4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.201 1998/09/04 06:06:55 nsouch Exp $
+#	$Id: files.i386,v 1.202 1998/09/08 20:57:46 sos Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -28,10 +28,11 @@ i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
 i386/eisa/3c5x9.c		optional	ep	device-driver
-i386/eisa/aic7770.c		optional	ahc	device-driver	   \
-	dependency	"aic7xxx_reg.h $S/i386/eisa/aic7770.c"
-i386/eisa/aha1742.c		optional	ahb	device-driver
-i386/eisa/bt74x.c		optional	bt	device-driver
+i386/eisa/adv_eisa.c		optional	adv	device-driver
+i386/eisa/ahc_eisa.c		optional	ahc	device-driver	   \
+	dependency	"aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
+i386/eisa/ahb.c			optional	ahb	device-driver
+i386/eisa/bt_eisa.c		optional	bt	device-driver
 i386/eisa/eisaconf.c		optional	eisa
 i386/eisa/if_vx_eisa.c		optional	vx	device-driver
 i386/eisa/if_fea.c		optional	fea	device-driver
@@ -91,11 +92,14 @@ i386/ibcs2/ibcs2_errno.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysent.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysvec.c	optional 	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/aha1542.c		optional	aha	device-driver
-i386/isa/aic6360.c              optional        aic     device-driver
+i386/isa/adv_isa.c		optional	adv	device-driver
+#i386/isa/aha1542.c		optional	aha	device-driver
+i386/isa/aha_isa.c		optional	aha	device-driver
+#i386/isa/aic6360.c              optional        aic     device-driver
+i386/isa/aic_isa.c              optional        aic     device-driver
 i386/isa/alog.c                 optional        alog    device-driver
 i386/isa/b004.c			optional	bqu	device-driver
-i386/isa/bt5xx-445.c		optional	bt	device-driver
+i386/isa/bt_isa.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
 i386/isa/ctx.c			optional	ctx	device-driver
@@ -139,7 +143,7 @@ i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 i386/isa/mse.c			optional	mse	device-driver
-i386/isa/ncr5380.c		optional	nca	device-driver
+#i386/isa/ncr5380.c		optional	nca	device-driver
 i386/isa/npx.c			mandatory	npx	device-driver
 i386/isa/pcaudio.c		optional	pca	device-driver
 i386/isa/matcd/matcd.c		optional	matcd	device-driver
@@ -161,7 +165,7 @@ i386/isa/random_machdep.c	standard
 i386/isa/rc.c			optional	rc	device-driver
 i386/isa/rp.c			optional	rp	device-driver
 i386/isa/scd.c			optional	scd	device-driver
-i386/isa/seagate.c		optional	sea	device-driver
+#i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/si.c			optional	si	device-driver
 i386/isa/si2_z280.c		optional	si	device-driver
 i386/isa/si3_t225.c		optional	si	device-driver
@@ -237,7 +241,7 @@ i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
 i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
-i386/isa/ultra14f.c		optional	uha	device-driver
+#i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/atapi.c		optional	atapi	device-driver
@@ -261,10 +265,6 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i386/scsi/93cx6.c		optional	ahc	device-driver
-i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
-	dependency	"aic7xxx_{reg,seq}.h"
-i386/scsi/bt.c			optional	bt	device-driver
 libkern/bcd.c			standard
 libkern/divdi3.c		standard
 libkern/inet_ntoa.c		standard
diff --git a/sys/conf/majors b/sys/conf/majors
index c871d3a..1a49796 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.47 1998/09/09 03:07:02 gibbs Exp $
+$Id: majors.i386,v 1.48 1998/09/09 18:57:59 nsouch Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -17,8 +17,8 @@ blkdev	name		comments
 1	wfd		ATAPI Floppy client of "ata"
 2	fd		floppy disk
 3	wt		QIC-02/36 tape
-4	sd		SCSI "disk" type
-5	st		SCSI "tape" type
+4	da		SCSI "direct acess" devices
+5	sa		SCSI "sequential access" devices
 6	cd		SCSI "cdrom" type
 7	mcd		Mitsumi CDROM interface
 8	lkm		assigned to Loadable Kernel modules
@@ -33,10 +33,8 @@ blkdev	name		comments
 17	matcd		Matsushita/Panasonic/Creative(SB) CDROM interface
 18	ata		"device independent" ATA/IDE driver
 19	wcdb		ATAPI CDROM client of "ata"
-20	od		SCSI "magneto-optical" disk
 21	ccd		concatenated disk
 22	gd		Geometry disk.
-23	worm		SCSI "worm type"
 24	wstb		ATAPI tape client of "ata"
 25	vinum		RAID fs
 26	sw		VM internal swap device
@@ -57,8 +55,8 @@ chrdev	name		comments
 10	wt		QIC-02/36 tape
 11	spigot		Video capture?
 12	sc		syscons/pcvt virtual consoles
-13	sd		SCSI "disk type"
-14	st		SCSI "tape type"
+13	da		SCSI "direct access devices"
+14	sa		SCSI "sequential access devices"
 15	cd		SCSI "CDROM type"
 16	lpt		PC parallel printer port
 17	ch		SCSI changer
@@ -75,7 +73,7 @@ chrdev	name		comments
 28	sio		16450/16550 serial
 29	mcd		Mitsumi CDROM interface
 30	snd		sound driver system
-31	uk		SCSI "unknown device type"
+31	pass		SCSI "Application Pass-Thru"
 32	lkmc		Loadable Kernel Module Controller
 33	lkm		assigned to Loadable Kernel Modules
 34	lkm		assigned to Loadable Kernel Modules
@@ -109,12 +107,11 @@ chrdev	name		comments
 62	worm		SCSI "worm type"
 63	rc		Riscom/8 driver
 64	??		Talisman
-65	sctarg		SCSI target
+65	targ		SCSI target sample driver
 66	labpc		National Instruments LabPC
 67	meteor		Matrox Meteor video capture
 68	si		Specialix SI/XIO (peter@freebsd.org)
 69	wcd		ATAPI CDROM client of "ata"
-70	od		SCSI "magneto-optical disk type"
 71	asc		AmiScan driver
 72	stl		Stallion (cd1400 based) (gerg@stallion.oz.au)
 73	??		was qcam
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 2b232d5..c07d086 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.84 1998/08/10 08:40:27 yokota Exp $
+#	$Id: options.i386,v 1.85 1998/09/08 18:09:50 brian Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -42,11 +42,6 @@ NBUS			opt_smp.h
 NAPIC			opt_smp.h
 NINTR			opt_smp.h
 
-AHC_TAGENABLE		opt_aic7xxx.h
-AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
-AHC_ALLOW_MEMIO		opt_aic7xxx.h
-AHC_SHARE_SCBS		opt_aic7xxx.h
-
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 CLK_USE_TSC_CALIBRATION		opt_clock.h
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 17978d9..6d75391 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.114 1998/08/17 16:46:33 bde Exp $
+#	$Id: GENERIC,v 1.115 1998/09/04 19:55:51 msmith Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -32,8 +32,8 @@ options		FFS_ROOT		#FFS usable as root device [keep this!]
 options		NFS_ROOT		#NFS usable as root device
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
-options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
+options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options		SCSI_CAM		#We're using CAM in this kernel
 options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
@@ -70,7 +70,7 @@ device		wfd0		#IDE Floppy (e.g. LS-120)
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
 controller	ncr0
-controller	amd0
+#controller	amd0
 controller	ahb0
 controller	ahc0
 controller	isp0
@@ -79,24 +79,25 @@ controller	isp0
 # document here  - see the LINT file in this directory and look up the
 # dpt0 entry there for much fuller documentation on this.  The options
 # line following dpt0 here is also currently a *required* option for it.
-controller      dpt0
-options DPT_MEASURE_PERFORMANCE
-
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
-controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
-controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
-controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
+# controller      dpt0
+# options DPT_MEASURE_PERFORMANCE
+
+controller	adv0	at isa? port ? cam irq ?
+controller	bt0	at isa? port ? cam irq ?
+controller	aha0	at isa? port ? cam irq ?
+#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
+#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
+#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
+#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
 
 controller	scbus0
 
-device		sd0
+device		da0
 
-device		od0	#See LINT for possible `od' options.
+device		sa0
 
-device		st0
+device		pass0
 
 device		cd0	#Only need one of these, the code dynamically grows
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 4eb2568..0755653 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.462 1998/09/11 18:50:16 rvb Exp $
+#	$Id: LINT,v 1.463 1998/09/14 19:56:38 sos Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -588,8 +588,8 @@ options		"_KPOSIX_VERSION=199309L"
 
 # This old behavior is maintained as the default behavior.  The unit
 # assignment begins with the first non-wired down unit for a device
-# type.  For example, if you wire a disk as "sd3" then the first
-# non-wired disk will be assigned sd4.
+# type.  For example, if you wire a disk as "da3" then the first
+# non-wired disk will be assigned da4.
 
 # The syntax for wiring down devices is:
 
@@ -597,9 +597,9 @@ options		"_KPOSIX_VERSION=199309L"
 # controller	scbus1 at ahc1 bus 0	# Single bus device
 # controller	scbus3 at ahc2 bus 0	# Twin bus device
 # controller	scbus2 at ahc2 bus 1	# Twin bus device
-# disk 		sd0 at scbus0 target 0 unit 0
-# disk		sd1 at scbus3 target 1
-# disk		sd2 at scbus2 target 3
+# disk 		da0 at scbus0 target 0 unit 0
+# disk		da1 at scbus3 target 1
+# disk		da2 at scbus2 target 3
 # tape		st1 at scbus1 target 6
 # device	cd0 at scbus?
 
@@ -613,47 +613,59 @@ options		"_KPOSIX_VERSION=199309L"
 
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
-device		sd0	#SCSI disks
-device		st0	#SCSI tapes
+device		da0	#SCSI direct access devices (aka disks)
+device		sa0	#SCSI tapes
 device		cd0	#SCSI CD-ROMs
-device		od0	#SCSI optical disk
+#device		od0	#SCSI optical disk
+device		pass0	#CAM passthrough driver
 
-# The previous devices (ch, sd, st, cd) are recognized by config.
+# The previous devices (ch, da, st, cd) are recognized by config.
 # config doesn't (and shouldn't) know about these newer ones,
 # so we have to specify that they are on a SCSI bus with the "at scbus?"
 # clause.
 
-device worm0 at scbus?	# SCSI worm
 device pt0 at scbus?	# SCSI processor type
 device sctarg0 at scbus? # SCSI target
 
-# SCSI OPTIONS:
-
-# SCSIDEBUG: When defined enables debugging macros
-# NO_SCSI_SENSE: When defined disables sense descriptions (about 4k)
+# CAM OPTIONS:
+# debugging options:
+# -- NOTE --  If you specify one of the bus/target/lun options, you must
+#             specify them all!
+# CAMDEBUG: When defined enables debugging macros
+# CAM_DEBUG_BUS:  Debug the given bus.  Use -1 to debug all busses.
+# CAM_DEBUG_TARGET:  Debug the given target.  Use -1 to debug all targets.
+# CAM_DEBUG_LUN:  Debug the given lun.  Use -1 to debug all luns.
+# CAM_DEBUG_FLAGS:  OR together CAM_DEBUG_INFO, CAM_DEBUG_TRACE and
+#                   CAM_DEBUG_SUBTRACE
+# 
+# CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
+# SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
+# SCSI_NO_OP_STRINGS: When defined disables opcode descriptions
 # SCSI_REPORT_GEOMETRY: Always report disk geometry at boot up instead
 #                       of only when booting verbosely.
-options		SCSIDEBUG
-#options	NO_SCSI_SENSE
+options		CAMDEBUG
+options		"CAM_DEBUG_BUS=-1"
+options		"CAM_DEBUG_TARGET=-1"
+options		"CAM_DEBUG_LUN=-1"
+options		"CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_SUBTRACE"
+options		"CAM_MAX_HIGHPOWER=4"
+options		SCSI_NO_SENSE_STRINGS
+options		SCSI_NO_OP_STRINGS
 options		SCSI_REPORT_GEOMETRY
 
-# Options for the `od' optical disk driver:
-#
-# If drive returns sense key as 0x02 with vendor specific additional
-# sense code (ASC) and additional sense code qualifier (ASCQ), or
-# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
-# To suppress this, use the following option.
-#
-options		OD_BOGUS_NOT_READY
+# Options for the CAM CDROM driver:
+# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
+# CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only
+#                           enforced if there is I/O waiting for another LUN
+# The compiled in defaults for these variables are 2 and 10 seconds,
+# respectively.
 #
-# For an automatic spindown, try this.  Again, preferably as an
-# option in your config file.
-# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
-# groks it fine, while Shunsuke's Fujitsu chokes on it and times
-# out.
+# These can also be changed on the fly with the following sysctl variables:
+# kern.cam.cd.changer.min_busy_seconds
+# kern.cam.cd.changer.max_busy_seconds
 #
-options		OD_AUTO_TURNOFF
-
+options		"CHANGER_MIN_BUSY_SECONDS=2"
+options		"CHANGER_MAX_BUSY_SECONDS=10"
 
 
 #####################################################################
@@ -674,10 +686,6 @@ pseudo-device	ccd	4	#Concatenated disk driver
 # broken
 #pseudo-device	tb
 
-# These are only for watching for bitrot in old SCSI code.
-pseudo-device	su		#scsi user
-pseudo-device	ssc		#super scsi
-
 # Size of the kernel message buffer.  Should be N * pagesize.
 options		"MSGBUF_SIZE=40960"
 
@@ -819,6 +827,7 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 #
 # SCSI host adapters: `aha', `aic', `bt', `nca'
 #
+# adv: Most AdvanSys SCSI controllers
 # aha: Adaptec 154x
 # ahc: Adaptec 274x/284x/294x
 # aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
@@ -832,7 +841,8 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
+controller	bt0	at isa? port "IO_BT0" cam irq ?
+controller	adv0	at isa? port ? cam irq ?
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
@@ -1315,13 +1325,6 @@ controller	ahb0
 controller	ahc0
 device		fea0
 
-# enable tagged command queuing, which is a major performance win on
-# devices that support it (and controllers with enough SCB's)
-options	AHC_TAGENABLE
-
-# enable SCB paging - See the ahc.4 man page
-options	AHC_SCBPAGING_ENABLE
-
 # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set. Unfortunately,
 # this doesn't work on some motherboards, which prevents it from being the
@@ -1598,8 +1601,8 @@ options		PCVT_SCREENSAVER
 options		PCVT_USEKBDSEC
 options		"PCVT_VT220KEYB"
 options		PSM_DEBUG=1
-options		"SCSI_2_DEF"
-options		SCSI_DELAY=8	# Be pessimistic about Joe SCSI device
+options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options		SCSI_CAM	#We're using CAM in this kernel
 options		SCSI_NCR_DEBUG
 options		SCSI_NCR_DFLT_TAGS=4
 options		SCSI_NCR_MAX_SYNC=10000
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 4eb2568..0755653 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.462 1998/09/11 18:50:16 rvb Exp $
+#	$Id: LINT,v 1.463 1998/09/14 19:56:38 sos Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -588,8 +588,8 @@ options		"_KPOSIX_VERSION=199309L"
 
 # This old behavior is maintained as the default behavior.  The unit
 # assignment begins with the first non-wired down unit for a device
-# type.  For example, if you wire a disk as "sd3" then the first
-# non-wired disk will be assigned sd4.
+# type.  For example, if you wire a disk as "da3" then the first
+# non-wired disk will be assigned da4.
 
 # The syntax for wiring down devices is:
 
@@ -597,9 +597,9 @@ options		"_KPOSIX_VERSION=199309L"
 # controller	scbus1 at ahc1 bus 0	# Single bus device
 # controller	scbus3 at ahc2 bus 0	# Twin bus device
 # controller	scbus2 at ahc2 bus 1	# Twin bus device
-# disk 		sd0 at scbus0 target 0 unit 0
-# disk		sd1 at scbus3 target 1
-# disk		sd2 at scbus2 target 3
+# disk 		da0 at scbus0 target 0 unit 0
+# disk		da1 at scbus3 target 1
+# disk		da2 at scbus2 target 3
 # tape		st1 at scbus1 target 6
 # device	cd0 at scbus?
 
@@ -613,47 +613,59 @@ options		"_KPOSIX_VERSION=199309L"
 
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
-device		sd0	#SCSI disks
-device		st0	#SCSI tapes
+device		da0	#SCSI direct access devices (aka disks)
+device		sa0	#SCSI tapes
 device		cd0	#SCSI CD-ROMs
-device		od0	#SCSI optical disk
+#device		od0	#SCSI optical disk
+device		pass0	#CAM passthrough driver
 
-# The previous devices (ch, sd, st, cd) are recognized by config.
+# The previous devices (ch, da, st, cd) are recognized by config.
 # config doesn't (and shouldn't) know about these newer ones,
 # so we have to specify that they are on a SCSI bus with the "at scbus?"
 # clause.
 
-device worm0 at scbus?	# SCSI worm
 device pt0 at scbus?	# SCSI processor type
 device sctarg0 at scbus? # SCSI target
 
-# SCSI OPTIONS:
-
-# SCSIDEBUG: When defined enables debugging macros
-# NO_SCSI_SENSE: When defined disables sense descriptions (about 4k)
+# CAM OPTIONS:
+# debugging options:
+# -- NOTE --  If you specify one of the bus/target/lun options, you must
+#             specify them all!
+# CAMDEBUG: When defined enables debugging macros
+# CAM_DEBUG_BUS:  Debug the given bus.  Use -1 to debug all busses.
+# CAM_DEBUG_TARGET:  Debug the given target.  Use -1 to debug all targets.
+# CAM_DEBUG_LUN:  Debug the given lun.  Use -1 to debug all luns.
+# CAM_DEBUG_FLAGS:  OR together CAM_DEBUG_INFO, CAM_DEBUG_TRACE and
+#                   CAM_DEBUG_SUBTRACE
+# 
+# CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
+# SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
+# SCSI_NO_OP_STRINGS: When defined disables opcode descriptions
 # SCSI_REPORT_GEOMETRY: Always report disk geometry at boot up instead
 #                       of only when booting verbosely.
-options		SCSIDEBUG
-#options	NO_SCSI_SENSE
+options		CAMDEBUG
+options		"CAM_DEBUG_BUS=-1"
+options		"CAM_DEBUG_TARGET=-1"
+options		"CAM_DEBUG_LUN=-1"
+options		"CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_SUBTRACE"
+options		"CAM_MAX_HIGHPOWER=4"
+options		SCSI_NO_SENSE_STRINGS
+options		SCSI_NO_OP_STRINGS
 options		SCSI_REPORT_GEOMETRY
 
-# Options for the `od' optical disk driver:
-#
-# If drive returns sense key as 0x02 with vendor specific additional
-# sense code (ASC) and additional sense code qualifier (ASCQ), or
-# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
-# To suppress this, use the following option.
-#
-options		OD_BOGUS_NOT_READY
+# Options for the CAM CDROM driver:
+# CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
+# CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only
+#                           enforced if there is I/O waiting for another LUN
+# The compiled in defaults for these variables are 2 and 10 seconds,
+# respectively.
 #
-# For an automatic spindown, try this.  Again, preferably as an
-# option in your config file.
-# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
-# groks it fine, while Shunsuke's Fujitsu chokes on it and times
-# out.
+# These can also be changed on the fly with the following sysctl variables:
+# kern.cam.cd.changer.min_busy_seconds
+# kern.cam.cd.changer.max_busy_seconds
 #
-options		OD_AUTO_TURNOFF
-
+options		"CHANGER_MIN_BUSY_SECONDS=2"
+options		"CHANGER_MAX_BUSY_SECONDS=10"
 
 
 #####################################################################
@@ -674,10 +686,6 @@ pseudo-device	ccd	4	#Concatenated disk driver
 # broken
 #pseudo-device	tb
 
-# These are only for watching for bitrot in old SCSI code.
-pseudo-device	su		#scsi user
-pseudo-device	ssc		#super scsi
-
 # Size of the kernel message buffer.  Should be N * pagesize.
 options		"MSGBUF_SIZE=40960"
 
@@ -819,6 +827,7 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 #
 # SCSI host adapters: `aha', `aic', `bt', `nca'
 #
+# adv: Most AdvanSys SCSI controllers
 # aha: Adaptec 154x
 # ahc: Adaptec 274x/284x/294x
 # aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
@@ -832,7 +841,8 @@ device		npx0	at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
+controller	bt0	at isa? port "IO_BT0" cam irq ?
+controller	adv0	at isa? port ? cam irq ?
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
@@ -1315,13 +1325,6 @@ controller	ahb0
 controller	ahc0
 device		fea0
 
-# enable tagged command queuing, which is a major performance win on
-# devices that support it (and controllers with enough SCB's)
-options	AHC_TAGENABLE
-
-# enable SCB paging - See the ahc.4 man page
-options	AHC_SCBPAGING_ENABLE
-
 # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set. Unfortunately,
 # this doesn't work on some motherboards, which prevents it from being the
@@ -1598,8 +1601,8 @@ options		PCVT_SCREENSAVER
 options		PCVT_USEKBDSEC
 options		"PCVT_VT220KEYB"
 options		PSM_DEBUG=1
-options		"SCSI_2_DEF"
-options		SCSI_DELAY=8	# Be pessimistic about Joe SCSI device
+options		SCSI_DELAY=8000	# Be pessimistic about Joe SCSI device
+options		SCSI_CAM	#We're using CAM in this kernel
 options		SCSI_NCR_DEBUG
 options		SCSI_NCR_DFLT_TAGS=4
 options		SCSI_NCR_MAX_SYNC=10000
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index fd01f86..5ff9d03 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: PCCARD,v 1.2 1997/11/11 00:47:01 nate Exp $
+#	$Id: PCCARD,v 1.3 1998/09/08 18:09:50 brian Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -29,7 +29,7 @@ options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
+options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
 options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index 62c9301..f0a5ddf 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SMP-GENERIC,v 1.11 1998/04/22 18:18:14 mjacob Exp $
+#	$Id: SMP-GENERIC,v 1.12 1998/04/29 06:58:43 max Exp $
 
 machine		"i386"
 # SMP does NOT support 386/486 CPUs.
@@ -46,7 +46,8 @@ options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
+options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options		SCSI_CAM		#We're using CAM in this kernel
 options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
 options		UCONSOLE		#Allow users to grab the console
 options		FAILSAFE		#Be conservative
@@ -62,6 +63,9 @@ controller	pci0
 controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
+# Unless you know very well what you're doing, leave ft0 at drive 2, or
+# remove the line entirely if you don't need it.  Trying to configure
+# it on another unit might cause surprises, see PR kern/7176.
 tape		ft0	at fdc0 drive 2
 
 options		"CMD640"	# work around CMD640 chip deficiency
@@ -80,26 +84,34 @@ device		wcd0	#IDE CD-ROM
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
 controller	ncr0
-controller	amd0
+#controller	amd0
 controller	ahb0
 controller	ahc0
 controller	isp0
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
-controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
-controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
-controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
-controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
-controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
-controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
+# This controller offers a number of configuration options, too many to
+# document here  - see the LINT file in this directory and look up the
+# dpt0 entry there for much fuller documentation on this.  The options
+# line following dpt0 here is also currently a *required* option for it.
+# controller      dpt0
+# options DPT_MEASURE_PERFORMANCE
+
+controller	adv0	at isa? port ? cam irq ?
+controller	bt0	at isa? port ? cam irq ?
+controller	aha0	at isa? port ? cam irq ?
+#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
+#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
+#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
+#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
+#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
 
 controller	scbus0
 
-device		sd0
+device		da0
 
-device		od0	#See LINT for possible `od' options.
+device		sa0
 
-device		st0
+device		pass0
 
 device		cd0	#Only need one of these, the code dynamically grows
 
@@ -114,7 +126,6 @@ device		scd0	at isa? port 0x230 bio
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
-#options		PCVT_FREEBSD=210	# pcvt running on FreeBSD >= 2.0.5
 #options		XSERVER			# include code for XFree86
 #options		FAT_CURSOR		# start with block cursor
 # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
@@ -149,12 +160,13 @@ device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
 # revision 1.20 of this file.
 device de0
 device fxp0
+device tl0
+device tx0
 device vx0
+device xl0
 
 device ed0 at isa? port 0x280 net irq  5 iomem 0xd8000 vector edintr
-device ed1 at isa? port 0x300 net irq  5 iomem 0xd8000 vector edintr
 device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
-device ie1 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
 device ep0 at isa? port 0x300 net irq 10 vector epintr
 device ex0 at isa? port? net irq? vector exintr
 device fe0 at isa? port 0x300 net irq ? vector feintr
@@ -162,11 +174,11 @@ device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
 device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
 device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
+device cs0 at isa? port 0x300 net irq ? vector csintr
 
 pseudo-device	loop
 pseudo-device	ether
 pseudo-device	sl	1
-# iijppp uses tun instead of ppp device
 #pseudo-device	ppp	1
 pseudo-device	tun	1
 pseudo-device	pty	16
@@ -177,3 +189,6 @@ pseudo-device	gzip		# Exec gzipped a.out's
 # the costs of each syscall.
 options		KTRACE		#kernel tracing
 
+# This provides support for System V shared memory.
+#
+options         SYSVSHM  
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index d8c6a4a..ccba4ec 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,18 +1,17 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.i386,v 1.12 1998/01/16 22:13:00 pst Exp $
+#	$Id: devices.i386,v 1.13 1998/02/17 11:33:31 sos Exp $
 #
 wd	0
 wfd	1
 fd	2
 wt	3
-sd	4
-st	5
+da	4
+sa	5
 cd	6
 mcd	7
 vn	15
 scd	16
 pcd	17
 wcd	19
-od	20
 wst	24
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index e2a865e..5302df4 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.201 1998/09/04 06:06:55 nsouch Exp $
+#	$Id: files.i386,v 1.202 1998/09/08 20:57:46 sos Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -28,10 +28,11 @@ i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
 i386/eisa/3c5x9.c		optional	ep	device-driver
-i386/eisa/aic7770.c		optional	ahc	device-driver	   \
-	dependency	"aic7xxx_reg.h $S/i386/eisa/aic7770.c"
-i386/eisa/aha1742.c		optional	ahb	device-driver
-i386/eisa/bt74x.c		optional	bt	device-driver
+i386/eisa/adv_eisa.c		optional	adv	device-driver
+i386/eisa/ahc_eisa.c		optional	ahc	device-driver	   \
+	dependency	"aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
+i386/eisa/ahb.c			optional	ahb	device-driver
+i386/eisa/bt_eisa.c		optional	bt	device-driver
 i386/eisa/eisaconf.c		optional	eisa
 i386/eisa/if_vx_eisa.c		optional	vx	device-driver
 i386/eisa/if_fea.c		optional	fea	device-driver
@@ -91,11 +92,14 @@ i386/ibcs2/ibcs2_errno.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysent.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysvec.c	optional 	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/aha1542.c		optional	aha	device-driver
-i386/isa/aic6360.c              optional        aic     device-driver
+i386/isa/adv_isa.c		optional	adv	device-driver
+#i386/isa/aha1542.c		optional	aha	device-driver
+i386/isa/aha_isa.c		optional	aha	device-driver
+#i386/isa/aic6360.c              optional        aic     device-driver
+i386/isa/aic_isa.c              optional        aic     device-driver
 i386/isa/alog.c                 optional        alog    device-driver
 i386/isa/b004.c			optional	bqu	device-driver
-i386/isa/bt5xx-445.c		optional	bt	device-driver
+i386/isa/bt_isa.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
 i386/isa/ctx.c			optional	ctx	device-driver
@@ -139,7 +143,7 @@ i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 i386/isa/mse.c			optional	mse	device-driver
-i386/isa/ncr5380.c		optional	nca	device-driver
+#i386/isa/ncr5380.c		optional	nca	device-driver
 i386/isa/npx.c			mandatory	npx	device-driver
 i386/isa/pcaudio.c		optional	pca	device-driver
 i386/isa/matcd/matcd.c		optional	matcd	device-driver
@@ -161,7 +165,7 @@ i386/isa/random_machdep.c	standard
 i386/isa/rc.c			optional	rc	device-driver
 i386/isa/rp.c			optional	rp	device-driver
 i386/isa/scd.c			optional	scd	device-driver
-i386/isa/seagate.c		optional	sea	device-driver
+#i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/si.c			optional	si	device-driver
 i386/isa/si2_z280.c		optional	si	device-driver
 i386/isa/si3_t225.c		optional	si	device-driver
@@ -237,7 +241,7 @@ i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
 i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
-i386/isa/ultra14f.c		optional	uha	device-driver
+#i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/atapi.c		optional	atapi	device-driver
@@ -261,10 +265,6 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i386/scsi/93cx6.c		optional	ahc	device-driver
-i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
-	dependency	"aic7xxx_{reg,seq}.h"
-i386/scsi/bt.c			optional	bt	device-driver
 libkern/bcd.c			standard
 libkern/divdi3.c		standard
 libkern/inet_ntoa.c		standard
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index c871d3a..1a49796 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.47 1998/09/09 03:07:02 gibbs Exp $
+$Id: majors.i386,v 1.48 1998/09/09 18:57:59 nsouch Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -17,8 +17,8 @@ blkdev	name		comments
 1	wfd		ATAPI Floppy client of "ata"
 2	fd		floppy disk
 3	wt		QIC-02/36 tape
-4	sd		SCSI "disk" type
-5	st		SCSI "tape" type
+4	da		SCSI "direct acess" devices
+5	sa		SCSI "sequential access" devices
 6	cd		SCSI "cdrom" type
 7	mcd		Mitsumi CDROM interface
 8	lkm		assigned to Loadable Kernel modules
@@ -33,10 +33,8 @@ blkdev	name		comments
 17	matcd		Matsushita/Panasonic/Creative(SB) CDROM interface
 18	ata		"device independent" ATA/IDE driver
 19	wcdb		ATAPI CDROM client of "ata"
-20	od		SCSI "magneto-optical" disk
 21	ccd		concatenated disk
 22	gd		Geometry disk.
-23	worm		SCSI "worm type"
 24	wstb		ATAPI tape client of "ata"
 25	vinum		RAID fs
 26	sw		VM internal swap device
@@ -57,8 +55,8 @@ chrdev	name		comments
 10	wt		QIC-02/36 tape
 11	spigot		Video capture?
 12	sc		syscons/pcvt virtual consoles
-13	sd		SCSI "disk type"
-14	st		SCSI "tape type"
+13	da		SCSI "direct access devices"
+14	sa		SCSI "sequential access devices"
 15	cd		SCSI "CDROM type"
 16	lpt		PC parallel printer port
 17	ch		SCSI changer
@@ -75,7 +73,7 @@ chrdev	name		comments
 28	sio		16450/16550 serial
 29	mcd		Mitsumi CDROM interface
 30	snd		sound driver system
-31	uk		SCSI "unknown device type"
+31	pass		SCSI "Application Pass-Thru"
 32	lkmc		Loadable Kernel Module Controller
 33	lkm		assigned to Loadable Kernel Modules
 34	lkm		assigned to Loadable Kernel Modules
@@ -109,12 +107,11 @@ chrdev	name		comments
 62	worm		SCSI "worm type"
 63	rc		Riscom/8 driver
 64	??		Talisman
-65	sctarg		SCSI target
+65	targ		SCSI target sample driver
 66	labpc		National Instruments LabPC
 67	meteor		Matrox Meteor video capture
 68	si		Specialix SI/XIO (peter@freebsd.org)
 69	wcd		ATAPI CDROM client of "ata"
-70	od		SCSI "magneto-optical disk type"
 71	asc		AmiScan driver
 72	stl		Stallion (cd1400 based) (gerg@stallion.oz.au)
 73	??		was qcam
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 2b232d5..c07d086 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.84 1998/08/10 08:40:27 yokota Exp $
+#	$Id: options.i386,v 1.85 1998/09/08 18:09:50 brian Exp $
 
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
@@ -42,11 +42,6 @@ NBUS			opt_smp.h
 NAPIC			opt_smp.h
 NINTR			opt_smp.h
 
-AHC_TAGENABLE		opt_aic7xxx.h
-AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
-AHC_ALLOW_MEMIO		opt_aic7xxx.h
-AHC_SHARE_SCBS		opt_aic7xxx.h
-
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 CLK_USE_TSC_CALIBRATION		opt_clock.h