enable all USB devices for which we have support in the tree; ok deraadt@

1 files changed, 41 insertions, 12 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index f107497346b..a7651633762 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.89 2004/04/03 11:10:39 naddy Exp $
+#	$OpenBSD: GENERIC,v 1.90 2004/04/14 20:44:29 naddy Exp $
 # 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
 
 machine		sparc64
@@ -83,26 +83,55 @@ opl*		at eso?
 midi*		at autri?
 midi*		at opl?
 
-# USB bridges
+# PCI USB Controllers
 ohci*	at pci? dev ? function ?	# Open Host Controller
 uhci*	at pci? dev ? function ?	# Universal Host Controller (Intel)
+
+# USB bus support
 usb*	at ohci? flags 0x1
 usb*	at uhci? flags 0x1
 
-# USB devices
-uhub*	at usb?
-uhub*	at uhub? port ? configuration ?
-uhidev*	at uhub? port ? configuration ? interface ?
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ? mux 1
-ums*	at uhidev? reportid ?
-wsmouse* at ums? mux 0
-uhid*	at uhidev? reportid ?
-ugen*	at uhub? port ? configuration ?	# USB generic device
+uhub*	at usb?				# USB Hubs
+uhub*	at uhub? port ? configuration ?	# USB Hubs
+umodem*	at uhub? port ? configuration ?	# USB Modems/Serial
+ucom*	at umodem?
+uvisor*	at uhub? port ? configuration ?	# Handspring Visor
+ucom*	at uvisor?
+uvscom*	at uhub? port ?			# SUNTAC Slipper U VS-10U serial
+ucom*	at uvscom? portno ?
+ubsa*	at uhub? port ?			# Belkin serial adapter
+ucom*	at ubsa? portno ?
 uftdi*	at uhub? port ?			# FTDI FT8U100AX serial adapter
 ucom*	at uftdi? portno ?
 uplcom* at uhub? port ?			# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom? portno ?
+umct*	at uhub? port ?			# MCT USB-RS232 serial adapter
+ucom*	at umct? portno ?
+uaudio* at uhub? port ? configuration ?	# USB Audio
+umidi* at uhub? port ? configuration ?
+ulpt*	at uhub? port ? configuration ? # USB Printers
+umass*	at uhub? port ? configuration ? # USB Mass Storage devices
+scsibus* at umass?
+uhidev*	at uhub? port ? configuration ? interface ?
+ums*	at uhidev? reportid ?
+wsmouse* at ums? mux 0
+ukbd*	at uhidev? reportid ?
+wskbd*	at ukbd? console ? mux 1
+uhid*	at uhidev? reportid ?
+aue*	at uhub? port ?			# ADMtek AN986 Pegasus Ethernet
+axe*	at uhub? port ?			# ASIX Electronics AX88172 USB Ethernet
+cue*	at uhub? port ?			# CATC USB-EL1201A based Ethernet
+kue*	at uhub? port ?			# Kawasaki KL5KUSB101B based Ethernet
+upl*	at uhub? port ?			# Prolific PL2301/PL2302 host-to-host `network'
+url*	at uhub? port ?			# Realtek RTL8150L based adapters
+urio*	at uhub? port ?			# Diamond Multimedia Rio 500
+uscanner* at uhub? port ?		# USB Scanners
+usscanner* at uhub? port ?		# USB SCSI scanners, e.g., HP5300
+scsibus* at usscanner?
+uyap*	at uhub? port ?			# Y@P firmware loader
+udsbr*	at uhub? port ?			# D-Link DSB-R100 radio
+radio*	at udsbr?
+ugen*	at uhub? port ? configuration ? # USB Generic driver
 
 #### Standard system devices -- all required for a given architecture