Add a whole slew of drivers to the Alpha GENERIC. These all compile

properly, but there are many that have yet to be tested.  If anyone tests
one of the drivers listed as UNTESTED, please let me know.

The following drivers have 64-bit issues when compiling on Alpha:
adv, twe, vr, tx, hifn, ubsec

They are in GENERIC, but commented out.

1 files changed, 177 insertions, 46 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 25f8ed4d288..2be8e62fe1c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.59 2000/11/19 22:10:17 millert Exp $
+#	$OpenBSD: GENERIC,v 1.60 2000/12/11 16:14:41 nate 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.
@@ -8,6 +8,11 @@ machine	alpha
 include "../../../conf/GENERIC"
 maxusers	8
 
+option		NATIVE_ELF
+
+option		PMAP_NEW
+option		UVM
+
 # CPU Support
 option		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 option		DEC_3000_300	# Pelican etc:	3000/300*
@@ -19,8 +24,8 @@ option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 option		DEC_550		# Miata:	Digital Personal Workstation
 option		DEC_6600	# EV6:		264DP OEM Board
 
-option		PMAP_NEW
-option		UVM
+option		APERTURE	# in-kernel aperture driver for XFree86
+option		FFS_SOFTUPDATES	# Soft updates
 
 option		COMPAT_OSF1	# OSF/1 binary compatibility
 
@@ -33,6 +38,7 @@ option		DISKLABEL_ALL	# All of the ones mentined below
 option		EISAVERBOSE		# recognize "unknown" EISA devices
 option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
+#option		USBVERBOSE
 
 option		WSEMUL_VT100		# wscons VT100 emulation
 
@@ -41,10 +47,56 @@ config		bsd	swap generic
 mainbus0 at	root
 cpu*	at	mainbus0
 
+# !!!UNTESTED!!!
+# USB devices are untested on alpha
+
+# PCI USB Controllers
+uhci*	at pci? disable			# Universal Host Controller (Intel)
+ohci*	at pci? disable			# Open Host Controller
+
+# USB bus support
+usb*	at uhci?
+usb*	at ohci?
+
+# USB Hubs
+uhub*	at usb?
+uhub*	at uhub? port ? configuration ? interface ?
+
+# USB Generic HID devices
+uhid*	at uhub? port ? configuration ? interface ?
+
+# USB Printers
+ulpt*	at uhub? port ? configuration ? interface ?
+
+# USB Mass Storage devices
+umass*	at uhub? port ? configuration ? interface ?
+scsibus* at umass?
+
+# USB Modems
+umodem*	at uhub? port ? configuration ?
+ucom*	at umodem?
+
+# USB Audio
+uaudio* at uhub? port ? configuration ?
+
+# USB Ethernet adapters
+aue*	at uhub? port ?			# ADMtek AN986 Pegasus based adapters
+cue*	at uhub? port ?			# CATC USB-EL1201A based adapters
+kue*	at uhub? port ?			# Kawasaki KL5KUSB101B based adapters
+
+# Diamond Multimedia Rio 500
+urio*	at uhub? port ?
+
+# Handspring Visor
+uvisor*	at uhub? port ? configuration ?
+ucom*	at uvisor?
+
+# USB Generic driver
+ugen*	at uhub? port ? configuration ? interface ?
+
 # EV6 Tsunami Core Logic
 tsc*	at	mainbus0
 
-
 # TurboChannel host bus adapter support
 tcasic*	at	mainbus0
 
@@ -60,6 +112,7 @@ scc1	at	ioasic? offset ?
 tcds0	at	tc? slot ? offset ?
 asc0	at	tcds? slot ?
 asc1	at	tcds? slot ?
+scsibus* at asc?
 cfb*	at	tc? slot ? offset ?
 sfb*	at	tc? slot ? offset ?
 le*	at	tc? slot ? offset ?
@@ -79,35 +132,84 @@ pci*	at	ppb?
 pci*	at	tsp?
 
 # PCI devices
-#ahc*	at	pci? dev ? function ?		# AHA-28xx SCSI
-de*	at	pci? dev ? function ?		# 21x4[012]-based Ethernet
-ne*	at	pci? dev ? function ?		# NE2000-compat 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
-xl*	at	pci? dev ? function ?		# 3COM 3c9xx
-tl*	at	pci? dev ? function ?		# Compaq Thunderlan ethernet
-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
-pceb*	at	pci? dev ? function ?		# Intel PCI-EISA brige
-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
-isp*	at	pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
+ppb*	at pci? dev ? function ?	# PCI-PCI bridges
+sio*	at pci? dev ? function ?	# Intel PCI-ISA bridge
+pceb*	at pci? dev ? function ?	# Intel PCI-EISA brige
+
+cy*	at pci?				# PCI cyclom card
+
+# PCI SCSI devices
+
+ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
+scsibus* at ahc?
+isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
+scsibus* at isp?
+ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
+scsibus* at ncr?
+
+#UNTESTED: the following three drivers are untested.
+adw*	at pci? dev ? function ?	# AdvanSys ULTRA WIDE SCSI
+scsibus* at adw?
+dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID PCI
+scsibus* at dpt?
+gdt*	at pci? dev ? function ?	# ICP Vortex GDT RAID controllers
+scsibus* at gdt?
+
+#BROKEN: adv and twe have 64-bit problems
+#adv*	at pci? dev ? function ?	# AdvanSys 1200A/B and ULTRA SCSI
+#scsibus* at adv?
+#twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
+#scsibus*	at twe?
+
+# PCI Network devices
+de*	at pci? dev ? function ?	# 21x4[012]-based Ethernet
+ne*	at pci? dev ? function ?	# NE2000-compat ethernet cards
+fxp*	at pci? dev ? function ?	# EtherExpress 10/100B ethernet
+ep*	at pci? dev ? function ?	# 3COM 3c59x
+xl*	at pci? dev ? function ?	# 3COM 3c9xx
+fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI cards
+
+#UNTESTED:  the vollowing section of drivers is untested on alpha.
+en*	at pci? dev ? function ?	# ENI PCI ATM (untested)
+tl*	at pci? dev ? function ?	# Compaq Thunderlan ethernet
+le*	at pci? dev ? function ?	# PCI LANCE Ethernet (untested)
+lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/T3/HSSI
+rl*	at pci? dev ? function ?	# RealTek 81[23]9 ethernet
+wb*	at pci? dev ? function ?	# Winbond W89C840F ethernet
+sf*	at pci? dev ? function ?	# Adaptec AIC-6915 ethernet
+sis*	at pci? dev ? function ?	# SiS 900/7016 ethernet
+ste*	at pci? dev ? function ?	# Sundance ST201 ethernet
+dc*	at pci? dev ? function ?	# 21143, "tulip" clone ethernet
+ti*	at pci? dev ? function ?	# Alteon Tigon 1Gb ethernet
+skc*	at pci? dev ? function ?	# SysKonnect GEnesis 984x
+sk*	at skc?				#  each port of above
+wx*	at pci? dev ? function ?	# Intel Pro/1000 ethernet
+
+#BROKEN:  The following two drivers have 64-bit issues
+#tx*	at pci? dev ? function ?	# SMC 83C170 EPIC ethernet
+#vr*	at pci? dev ? function ?	# VIA Rhine ethernet
+
+vga*	at pci? dev ? function ?	# PCI VGA graphics
+tga*	at pci? dev ? function ?	# DEC ZLXp-E[123] graphics
 
 # Media Independent Interface (mii) drivers
-exphy*	at mii? phy ?				# 3Com internal PHYs
-inphy*	at mii? phy ?				# Intel 82555 PHYs
-#icsphy*	at mii? phy ?				# ICS 1890 PHYs
-#lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-#qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
-#sqphy*	at mii? phy ?				# Seeq 8x220 PHYs
-#mtdphy*	at mii? phy ?				# Myson MTD972 PHYs
-#ukphy*	at mii? phy ?				# "unknown" PHYs
+# UNTESTED: some of the following PHY's are untested.
+exphy*	at mii? phy ?			# 3Com internal PHYs
+inphy*	at mii? phy ?			# Intel 82555 PHYs
+iophy*	at mii? phy ?			# Intel 82553 PHYs
+icsphy*	at mii? phy ?			# ICS 1890 PHYs
+lxtphy*	at mii? phy ?			# Level1 LXT970 PHYs
+nsphy*	at mii? phy ?			# NS and compatible PHYs
+qsphy*	at mii? phy ?			# Quality Semi QS6612 PHYs
+sqphy*	at mii? phy ?			# Seeq 8x220 PHYs
+rlphy*	at mii? phy ?			# RealTek 8139 internal PHYs
+mtdphy*	at mii? phy ?			# Myson MTD972 PHYs
+dcphy*	at mii? phy ?			# Digital Clone PHYs
+amphy*	at mii? phy ?			# AMD 79C873 PHYs
+tqphy*	at mii? phy ?			# TDK 78Q212x PHYs
+brgphy*	at mii? phy ?			# Broadcom Gigabit PHYs
+xmphy*	at mii? phy ?			# XaQti XMAC-II PHYs
+ukphy*	at mii? phy ?			# "unknown" PHYs
 
 # ISA/EISA bus support
 isa*	at	pceb?
@@ -133,8 +235,12 @@ ne1	at	isa? port 0x300 irq 10		# NE[12]000 ethernet cards
 ne2	at	isa? port 0x280 irq 9		# NE[12]000 ethernet cards
 ep*	at	isa? port ? irq ?		# 3C509 ethernet cards
 #wss*	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
+
 cy0     at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
+
 #aic0	at	isa? port 0x340 irq 11		# Adaptec 152[02] SCSI
+#scsibus* at aic?
+
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
 # options CY_HW_RTS
@@ -142,9 +248,17 @@ cy0     at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
 
 # EISA devices
 fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
-#ahc*	at	eisa? slot ?			# Adaptec 274x, aic7770 SCSI
+ahc*	at	eisa? slot ?			# Adaptec 274x, aic7770 SCSI
+
+# SCSI devices
+cd*	at	scsibus? target ? lun ?
+sd*	at	scsibus? target ? lun ?
+ss*	at	scsibus? target ? lun ?
+st*	at	scsibus? target ? lun ?
+ch*	at	scsibus? target ? lun ?
+uk*	at	scsibus? target ? lun ?
 
-# IDE
+# IDE controllers
 pciide* at pci ? dev ? function ? flags 0x0000
 wdc0	at isa? port 0x1f0 irq 14 flags 0x00
 wdc1	at isa? port 0x170 irq 15 flags 0x00
@@ -156,20 +270,30 @@ atapiscsi* at wdc? channel ?
 atapiscsi* at pciide? channel ?
 scsibus* at atapiscsi?
  
-# SCSI bus support
-scsibus* at	asc?
-scsibus* at	ncr?
-scsibus* at	isp?
-#scsibus* at	ahc?
-#scsibus* at	aic?
+# Audio devices
+eap*	at pci? dev ? function ?		# Ensoniq AudioPCI S5016
 
-# SCSI devices
-cd*	at	scsibus? target ? lun ?
-sd*	at	scsibus? target ? lun ?
-ss*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-ch*	at	scsibus? target ? lun ?
-uk*	at	scsibus? target ? lun ?
+# UNTESTED.  The following drivers are untested
+eso*	at pci? dev ? function ?		# ESS Solo-1 PCI AudioDrive
+sv*	at pci? dev ? function ?		# S3 SonicVibes (S3 617)
+cmpci*	at pci? dev ? function ?		# C-Media CMI8338/8738
+fms*	at pci? dev ? function ?		# Forte Media FM801
+auvia*	at pci? dev ? function ?		# VIA VT82C686A
+
+# OPL[23] FM syntheziers
+opl*	at eso?
+
+# MIDI support
+midi*	at opl?			# OPL FM synth
+
+#Audio Support
+audio*  at eap?
+audio*	at eso?
+audio*  at sv?
+audio*	at cmpci?
+audio*	at fms?
+audio*	at auvia?
+audio*	at uaudio?
 
 # Workstation Console attachments
 #wsdisplay*	at	cfb?
@@ -179,6 +303,13 @@ wsdisplay*	at	tga?
 wskbd*		at	pckbd?
 wsmouse*	at	pms?
 
+# crypto support
+#BROKEN: The following two drivers are broken because of 64-bit issues.
+#hifn*	at pci? dev ? function ?	# Hi/fn 7751 crypto card
+#ubsec*	at pci? dev ? function ?	# Bluesteel Networks 5xxx crypto card
+
+#pseudo-device	raid		4	# RAIDframe disk driver
+
 # for IPv6
 pseudo-device	gif		4
 #pseudo-device	faith		1