From 8bbb3956e3875bc10971e15973269985a9ebdc3b Mon Sep 17 00:00:00 2001
From: gibbs <gibbs@FreeBSD.org>
Date: Tue, 15 Sep 1998 10:01:14 +0000
Subject: sd->da, od is gone, no SCSI control devices. new pass, xpt, and targ
 devices.

Nuke no longer used AHC options.
---
 sys/amd64/conf/GENERIC | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'sys/amd64/conf')

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
 
-- 
cgit v1.1