Change to cam.

9 files changed, 28 insertions, 38 deletions

diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index 48f4761..9a76894 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: autoconf.c,v 1.6 1998/08/10 07:53:58 dfr Exp $
+ *	$Id: autoconf.c,v 1.7 1998/08/20 08:27:10 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +44,6 @@
 #include <machine/rpb.h>
 
 #include "scbus.h"
-#if NSCBUS > 0
-#include <scsi/scsiconf.h>
-#endif
 
 static void	configure __P((void *));
 SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure, NULL)
@@ -55,20 +52,19 @@ static void	configure_finish __P((void));
 static void	configure_start __P((void));
 device_t isa_bus_device = 0;
 
+extern void xpt_init __P((void));
+
 static void
 configure_start()
 {
 #if NSCBUS > 0
-	scsi_configure_start();
+	xpt_init();
 #endif
 }
 
 static void
 configure_finish()
 {
-#if NSCBUS > 0
-	scsi_configure_finish();
-#endif
 }
 
 extern void pci_configure(void);
@@ -110,7 +106,7 @@ configure(void *dummy)
 void
 cpu_rootconf()
 {
-    static char rootname[] = "sd0a";
+    static char rootname[] = "da0a";
     mountrootfsname = "ufs";
 
     rootdevs[0] = rootdev;
@@ -118,7 +114,7 @@ cpu_rootconf()
     rootdevnames[0] = rootname;
 
     rootdevs[1] = makedev(4, dkmakeminor(0, COMPATIBILITY_SLICE, 0));
-    rootdevnames[1] = "sd0a";
+    rootdevnames[1] = "da0a";
 }
 
 void
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 9df59dc..11a7053 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/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.4 1998/08/20 08:27:10 dfr Exp $
+#	$Id: GENERIC,v 1.5 1998/08/30 10:50:30 dfr Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -38,7 +38,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		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
 
@@ -67,9 +68,9 @@ controller	esp0
 
 controller	scbus0
 
-device		sd0
-device		od0
-device		st0
+device		da0
+device		sa0
+device		pass0
 device		cd0
 
 # real time clock
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index de8d7a3..1606004 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.7 1998/08/10 07:53:58 dfr Exp $
+#	$Id: Makefile.alpha,v 1.8 1998/09/07 07:29:30 dfr Exp $
 #
 # Makefile for FreeBSD
 #
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	300005
+%VERSREQ=	300006
 
 BINFORMAT?=	elf
 
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 9df59dc..11a7053 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -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.4 1998/08/20 08:27:10 dfr Exp $
+#	$Id: GENERIC,v 1.5 1998/08/30 10:50:30 dfr Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -38,7 +38,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		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
 
@@ -67,9 +68,9 @@ controller	esp0
 
 controller	scbus0
 
-device		sd0
-device		od0
-device		st0
+device		da0
+device		sa0
+device		pass0
 device		cd0
 
 # real time clock
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 842428f..1448d7b 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.7 1998/08/24 08:48:22 dfr Exp $
+#	$Id: files.alpha,v 1.8 1998/09/07 07:29:30 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -28,6 +28,7 @@ alpha/alpha/dec_3000_500.c	optional	dec_3000_500
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
+alpha/alpha/busdma_machdep.c	standard
 alpha/alpha/cons.c		standard
 alpha/alpha/prom.c		standard
 alpha/alpha/promcons.c		standard
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index 4b1c3e9..a0a5590 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.5 1998/08/20 08:27:10 dfr Exp $
+#	$Id: options.alpha,v 1.6 1998/08/21 23:43:15 gpalmer Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
@@ -19,11 +19,6 @@ CMD640			opt_wd.h
 SHOW_BUSYBUFS
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 
-AHC_TAGENABLE		opt_aic7xxx.h
-AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
-AHC_ALLOW_MEMIO		opt_aic7xxx.h
-AHC_SHARE_SCBS		opt_aic7xxx.h
-
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
 SLOW_VGA		opt_syscons.h
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index de8d7a3..1606004 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.7 1998/08/10 07:53:58 dfr Exp $
+#	$Id: Makefile.alpha,v 1.8 1998/09/07 07:29:30 dfr Exp $
 #
 # Makefile for FreeBSD
 #
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	300005
+%VERSREQ=	300006
 
 BINFORMAT?=	elf
 
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 842428f..1448d7b 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.7 1998/08/24 08:48:22 dfr Exp $
+#	$Id: files.alpha,v 1.8 1998/09/07 07:29:30 dfr Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -28,6 +28,7 @@ alpha/alpha/dec_3000_500.c	optional	dec_3000_500
 alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/ipl_funcs.c		standard
 alpha/alpha/pal.s		standard
+alpha/alpha/busdma_machdep.c	standard
 alpha/alpha/cons.c		standard
 alpha/alpha/prom.c		standard
 alpha/alpha/promcons.c		standard
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index 4b1c3e9..a0a5590 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.5 1998/08/20 08:27:10 dfr Exp $
+#	$Id: options.alpha,v 1.6 1998/08/21 23:43:15 gpalmer Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
@@ -19,11 +19,6 @@ CMD640			opt_wd.h
 SHOW_BUSYBUFS
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 
-AHC_TAGENABLE		opt_aic7xxx.h
-AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
-AHC_ALLOW_MEMIO		opt_aic7xxx.h
-AHC_SHARE_SCBS		opt_aic7xxx.h
-
 SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
 SLOW_VGA		opt_syscons.h