Update for CAM.

2 files changed, 59 insertions, 33 deletions

diff --git a/sys/conf/files b/sys/conf/files
index c68a24b..3d93d7e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,18 +1,18 @@
-aicasm				optional	ahc	device-driver	   \
-	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
-	compile-with	"${MAKE} -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
-	no-obj no-implicit-rule						   \
-	clean		"aicasm"
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
+aicasm				optional	ahc	device-driver	   \
+	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
+	compile-with	"${MAKE} -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
+	no-obj no-implicit-rule						   \
+	clean		"aicasm"
 aic7xxx_{seq,reg}.h		optional	ahc	device-driver	   \
 	compile-with	"./aicasm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
 kern/subr_bus.c			standard				\
 	dependency	"device_if.h bus_if.h"
 device_if.o			standard				\
@@ -50,6 +50,21 @@ coda/coda_subr.c	optional vcoda
 coda/coda_venus.c	optional vcoda
 coda/coda_vfsops.c	optional vcoda
 coda/coda_vnops.c	optional vcoda
+cam/cam.c		optional scbus
+cam/cam_xpt.c		optional scbus
+cam/cam_extend.c	optional scbus
+cam/cam_queue.c		optional scbus
+cam/cam_periph.c	optional scbus
+cam/cam_sim.c		optional scbus
+cam/scsi/scsi_all.c	optional scbus
+cam/scsi/scsi_da.c	optional da
+cam/scsi/scsi_pt.c	optional pt
+cam/scsi/scsi_sa.c	optional sa
+cam/scsi/scsi_cd.c	optional cd
+cam/scsi/scsi_ch.c	optional ch
+cam/scsi/scsi_pass.c	optional pass
+cam/scsi/scsi_scan.c	optional scan
+cam/scsi/scsi_target.c	optional targ
 ddb/db_access.c		optional ddb
 ddb/db_kld.c		optional ddb db_kld_symbols
 ddb/db_elf.c		optional ddb db_elf_symbols
@@ -69,11 +84,20 @@ ddb/db_trap.c		optional ddb
 ddb/db_variables.c	optional ddb
 ddb/db_watch.c		optional ddb
 ddb/db_write_cmd.c	optional ddb
+dev/advansys/advansys.c	optional adv device-driver
+dev/advansys/advlib.c	optional adv device-driver
+dev/advansys/advmcode.c	optional adv device-driver
+dev/aha/aha.c		optional aha device-driver
+dev/aic7xxx/aic7xxx.c	optional ahc device-driver		\
+	dependency	"aic7xxx_{reg,seq}.h"
+dev/aic7xxx/93cx6.c	optional ahc device-driver
+dev/aic6x60/aic.c	optional aic device-driver
+dev/buslogic/bt.c	optional bt  device-driver
 dev/ccd/ccd.c		optional ccd device-driver
 dev/isp/isp_freebsd.c	optional isp device-driver
 dev/isp/isp.c		optional isp device-driver
-dev/dpt/dpt_control.c	optional	dpt device-driver
-dev/dpt/dpt_scsi.c		optional	dpt	device-driver
+#dev/dpt/dpt_control.c	optional dpt device-driver
+dev/dpt/dpt_scsi.c	optional dpt device-driver
 dev/en/midway.c		optional en device-driver
 dev/pdq/pdq.c		optional fea device-driver
 dev/pdq/pdq_ifsubr.c	optional fea device-driver
@@ -187,8 +211,9 @@ kern/kern_time.c	standard
 kern/kern_timeout.c	standard
 kern/kern_xxx.c		standard
 kern/md5c.c		standard
-kern/subr_diskslice.c	standard
 kern/subr_autoconf.c	standard
+kern/subr_devstat.c	standard
+kern/subr_diskslice.c	standard
 kern/subr_dkbad.c	standard
 kern/subr_log.c		standard
 kern/subr_prf.c		standard
@@ -448,10 +473,11 @@ pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
 pccard/pcic.c		optional pcic device-driver
 pci/pcic_p.c		optional pcic device-driver
-pci/aic7870.c		optional ahc device-driver			\
-	dependency	"aic7xxx_reg.h $S/pci/aic7870.c"
+pci/adv_pci.c		optional adv device-driver
+pci/ahc_pci.c		optional ahc device-driver			\
+	dependency	"aic7xxx_reg.h $S/pci/ahc_pci.c"
 pci/brooktree848.c	optional bktr device-driver
-pci/bt9xx.c		optional bt device-driver
+pci/bt_pci.c		optional bt device-driver
 pci/dpt_pci.c		optional pci dpt device-driver
 pci/cy_pci.c		optional cy device-driver
 pci/if_de.c		optional de device-driver
@@ -478,23 +504,6 @@ pci/xrpu.c		optional xrpu device-driver
 posix4/posix4_mib.c	standard
 posix4/p1003_1b.c	standard
 posix4/ksched.c	optional _kposix_priority_scheduling
-scsi/cd.c		optional cd
-scsi/ch.c		optional ch
-scsi/od.c		optional od
-scsi/pt.c		optional pt
-scsi/scsi_base.c	optional scbus
-scsi/scsi_driver.c	optional scbus
-scsi/scsi_ioctl.c	optional scbus
-scsi/scsi_sense.c	optional scbus
-scsi/scsiconf.c		optional scbus
-scsi/sctarg.c		optional sctarg
-scsi/sd.c		optional sd
-scsi/ssc.c		optional ssc
-scsi/st.c		optional st
-scsi/su.c		optional ssc
-scsi/su.c		optional su
-scsi/uk.c		optional scbus
-scsi/worm.c		optional worm
 ufs/ffs/ffs_alloc.c	optional ffs
 ufs/ffs/ffs_alloc.c	optional mfs
 ufs/ffs/ffs_balloc.c	optional ffs
diff --git a/sys/conf/options b/sys/conf/options
index 8ae328e..9f39e39 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.95 1998/09/11 18:50:15 rvb Exp $
+#	$Id: options,v 1.96 1998/09/14 19:56:36 sos Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -30,6 +30,13 @@
 # If filename is missing, the default is
 # opt_<name-of-option-in-lower-case>.h
 
+# Adaptec aic7xxx SCSI controller options
+AHC_ALLOW_MEMIO		opt_aic7xxx.h	# Allow PCI devices to use memory
+					# mapped I/o
+
+AHC_TMODE_ENABLE	opt_aic7xxx.h	# Bitmap of units to enable
+					# targetmode operations.
+
 # Miscellaneous options.
 BOUNCE_BUFFERS	opt_bounce.h
 COMPAT_43	opt_compat.h
@@ -138,11 +145,21 @@ SHMMNI		opt_param.h
 SHMSEG		opt_param.h
 
 # Generic SCSI options.
-SCSIDEBUG		opt_scsi.h
+CAM_MAX_HIGHPOWER	opt_cam.h
+CAMDEBUG		opt_cam.h
+CAM_DEBUG_BUS		opt_cam.h
+CAM_DEBUG_TARGET	opt_cam.h
+CAM_DEBUG_LUN		opt_cam.h
+CAM_DEBUG_FLAGS		opt_cam.h
+SCSI_CAM		opt_scsi.h
 SCSI_DELAY		opt_scsi.h
 SCSI_REPORT_GEOMETRY	opt_scsi.h
-SCSI_2_DEF		opt_scsi.h
-NO_SCSI_SENSE		opt_scsi.h
+SCSI_NO_SENSE_STRINGS	opt_scsi.h
+SCSI_NO_OP_STRINGS	opt_scsi.h
+
+# Options used only in cam/scsi/scsi_cd.c
+CHANGER_MIN_BUSY_SECONDS	opt_cd.h
+CHANGER_MAX_BUSY_SECONDS	opt_cd.h
 
 # Options used only in scsi/od.c.
 OD_AUTO_TURNOFF		opt_od.h