From dfd9dccf7e79cded8d7e712afb418463e02acbbf Mon Sep 17 00:00:00 2001
From: Peter Valchev <pvalchev@cvs.openbsd.org>
Date: Sun, 18 Apr 2004 02:26:44 +0000
Subject: unify the whole USB section with the already-improved i386 GENERIC

---
 sys/arch/alpha/conf/GENERIC | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'sys/arch/alpha/conf')

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 22d25a61ed4..df4ac00f58b 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.121 2004/02/13 07:10:50 jolan Exp $
+#	$OpenBSD: GENERIC,v 1.122 2004/04/18 02:26:42 pvalchev Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 
 machine	alpha
@@ -57,33 +57,50 @@ ohci*	at pci?	disable			# Open Host Controller
 usb*	at uhci?
 usb*	at ohci?
 
+# USB devices
 uhub*	at usb?				# USB Hubs
 uhub*	at uhub? port ? configuration ?	# USB Hubs
-uhidev*	at uhub? port ? configuration ? interface ?
-ums*	at uhidev? reportid ?		# USB Mice
-wsmouse* at ums? mux 0
-ukbd*	at uhidev? reportid ?		# USB Keyboards
-wskbd*	at ukbd? console ? mux 1
-uhid*	at uhidev? reportid ?		# USB Generic HID devices
 umodem*	at uhub? port ? configuration ?	# USB Modems/Serial
 ucom*	at umodem?
 uvisor*	at uhub? port ? configuration ?	# Handspring Visor
 ucom*	at uvisor?
-uftdi*	at uhub? port ?
+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
+audio*	at uaudio?
+umidi*	at uhub? port ? configuration ?	# USB MIDI
+midi*	at umidi?
 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 ?	# Human Interface Devices
+ums*	at uhidev? reportid ?		# USB mouse
+wsmouse* at ums? mux 0
+ukbd*	at uhidev? reportid ?		# USB keyboard
+wskbd*	at ukbd? console ? mux 1
+uhid*	at uhidev? reportid ?		# USB generic HID support
 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
+wi*	at uhub? port ?			# WaveLAN IEEE 802.11DS
 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
+uyap*	at uhub? port ?			# Y@P firmware loader
+udsbr*	at uhub? port ?			# D-Link DSB-R100 radio
+radio*	at udsbr?			# USB radio
 ugen*	at uhub? port ? configuration ? # USB Generic driver
 
 # EV6 Tsunami Core Logic
-- 
cgit v1.2.3