unify the whole USB section with the already-improved i386 GENERIC

1 files changed, 41 insertions, 72 deletions

diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 96c2f8da1fb..4820bcb21ae 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.8 2004/04/07 03:38:57 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.9 2004/04/18 02:26:42 pvalchev Exp $
 #
 # GENERIC machine description file
 # 
@@ -168,82 +168,51 @@ ohci*	at pci?				# Open Host Controller
 # USB bus support
 usb*	at ohci?
 
-# USB Hubs
-uhub*	at usb?
-uhub*	at uhub? port ? configuration ? interface ?
-
-# USB HID device
-uhidev*	at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums*	at uhidev? reportid ?
-wsmouse*	at ums?
-
-# USB Keyboards
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ?
-
-# USB Generic HID devices
-uhid*	at uhidev? reportid ?
-
-# USB Printer
-ulpt*	at uhub? port ? configuration ? interface ?
-
-# USB Modem
-umodem*	at uhub? port ? configuration ?
+# USB devices
+uhub*	at usb?				# USB Hubs
+uhub*	at uhub? port ? configuration ?	# USB Hubs
+umodem*	at uhub? port ? configuration ?	# USB Modems/Serial
 ucom*	at umodem?
-
-# USB Mass Storage
-umass*	at uhub? port ? configuration ? interface ?
-atapiscsi* at umass?
-scsibus* at umass?
-
-# USB audio
-uaudio*	at uhub? port ? configuration ?
-audio*	at uaudio?
-
-# USB MIDI
-umidi*	at uhub? port ? configuration ?
-midi*	at umidi?
-
-# 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 LSI KL5KUSB101B based adapters
-
-# Prolofic PL2301/PL2302 host-to-host adapter
-upl*	at uhub? port ?
-
-# Serial adapters
-# FTDI FT8U100AX serial adapter
-uftdi*	at uhub? port ?
+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
+uplcom* at uhub? port ?			# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom? portno ?
-
-umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
+umct*	at uhub? port ?			# MCT USB-RS232 serial adapter
 ucom*	at umct? portno ?
-
-# Diamond Multimedia Rio 500
-urio*	at uhub? port ?
-
-# USB Handspring Visor
-uvisor*	at uhub? port ?
-ucom*	at uvisor?
-
-# USB scanners
-uscanner* at uhub? port ?
-
-# USB scanners that use SCSI emulation, e.g., HP5300
-usscanner* at uhub? port ?
+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?
-
-# Y@P firmware loader
-uyap* at uhub? port ?
-
-# USB Generic driver
-ugen* at uhub? port ?
+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
 
 # Audio Devices