Add ahc. Reorganize some. Fix comments. Add out-commented aic entry,

it compiles but is not yet tested.  Add commented-out attachments for cy and
ahc, that has yet to be tested.

1 files changed, 20 insertions, 8 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 09dc1e17664..c60d1780277 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.26 1997/08/05 00:05:47 dgregor Exp $
+#	$OpenBSD: GENERIC,v 1.27 1997/08/05 12:20:37 niklas Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -66,12 +66,12 @@ pci*	at	lca?
 pci*	at	ppb?
 
 # PCI devices
-#ahc*	at	pci? dev ? function ?		# AHA-28xx SCSI (NOT 64-BIT)
+ahc*	at	pci? dev ? function ?		# AHA-28xx SCSI
 de*	at	pci? dev ? function ?		# 21x4[012]-based Ethernet
 ed*	at	pci? dev ? function ?		# NE2000-compat ethernet cards
-fxp*	at 	pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
+fxp*	at 	pci? dev ? function ?		# EtherExpress 10/100B ethernet
 #en*	at	pci? dev ? function ?		# ENI PCI ATM (untested)
-ep*	at	pci? dev ? function ?		# 3COM 3c59x (untested)
+ep*	at	pci? dev ? function ?		# 3COM 3c59x
 fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI cards
 le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
 ncr*	at	pci? dev ? function ?		# NCR 53c8xx SCSI
@@ -80,6 +80,7 @@ vga*	at	pci? dev ? function ?		# PCI VGA graphics
 ppb*	at	pci? dev ? function ?		# PCI-PCI bridges
 sio*	at	pci? dev ? function ?		# Intel PCI-ISA bridge
 tga*	at	pci? dev ? function ?		# DEC ZLXp-E[123] graphics
+#cy*	at	pci?				# PCI cyclom card
 
 # ISA/EISA bus support
 isa*	at	pceb?
@@ -102,18 +103,29 @@ ep*	at	isa? port ? irq ?		# 3C509 ethernet cards
 #wss*	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 wdc0	at	isa? port 0x1f0 irq 14		# ST506, ESDI, and IDE
 #wdc1	at	isa? port 0x170 irq 15		# controllers
-wd*	at	wdc? drive ?
-atapibus* at	wdc?
-acd*	at	atapibus? drive?
 cy0     at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
-
+#aic0	at	isa? port 0x340 irq 11		# Adaptec 152[02] SCSI
+# option for using CD1400 handshaking for incoming data
+# requires a special cable that exchanges the RTS and DTR lines
+# options CY_HW_RTS
+#ahc0	at	isa? port ? irq ?		# Adaptec 284x SCSI controllers
 
 # EISA devices
 fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
+#ahc*	at	eisa? slot ?			# Adaptec 274x, aic7770 SCSI
+
+# devices/busses hanging of IDE controllers
+atapibus* at	wdc?				# Virtual ATAPI bus
+wd*	at	wdc? drive ?			# ST506/ESDI/IDE disks
+
+# ATAPI devices
+acd*	at	atapibus? drive?		# ATAPI CD-ROM
 
 # SCSI bus support
 scsibus* at	esp?
 scsibus* at	ncr?
+scsibus* at	ahc?
+#scsibus* at	aic?
 
 # SCSI devices
 cd*	at	scsibus? target ? lun ?