[src/trunk]: src/sys/dev/usb Bring usbdevices.config in line with i386 GENERI...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f894db0122e6
branches:  trunk
changeset: 767525:f894db0122e6
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Jul 20 22:33:46 2011 +0000

description:
Bring usbdevices.config in line with i386 GENERIC (this is now a superset).
uhmodem(4) and xboxcontroller(4) have been left commented out, as they do
no appear in GENERIC.  However some ucom(4) drivers that are not in GENERIC
have been added for no particular reason.

diffstat:

 sys/dev/usb/usbdevices.config |  85 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 73 insertions(+), 12 deletions(-)

diffs (158 lines):

diff -r 4904af56f355 -r f894db0122e6 sys/dev/usb/usbdevices.config
--- a/sys/dev/usb/usbdevices.config     Wed Jul 20 21:30:13 2011 +0000
+++ b/sys/dev/usb/usbdevices.config     Wed Jul 20 22:33:46 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: usbdevices.config,v 1.7 2011/07/20 21:08:30 jakllsch Exp $
+#      $NetBSD: usbdevices.config,v 1.8 2011/07/20 22:33:46 jakllsch Exp $
 #
 # This file contains all USB related configuration.
 # It is suitable for inclusion in a kernel config(5) file.
@@ -37,16 +37,30 @@
 ums*   at uhidev? reportid ?
 wsmouse* at ums? mux 0
 
+# USB Keyboards
+ukbd*  at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
+
+# USB TEMPer and TEMPerHUM
+uthum* at uhidev? reportid ?
+
+# USB serial adapter
+ucycom* at uhidev? reportid ?
+
+# USB Generic HID devices
+uhid*  at uhidev? reportid ?
+
 # USB eGalax touch-panel
 uep*   at uhub? port ?
 wsmouse* at uep? mux 0
 
-# USB Keyboards
-ukbd*  at uhidev? reportid ?
-wskbd* at ukbd? console ? mux 1
+# Xbox controller -- non-standard USB connector
+#xboxcontroller* at uhub? port ?
+#wsmouse* at xboxcontroller? mux 0
 
-# USB Generic HID devices
-uhid*  at uhidev? reportid ?
+# USB LCDs and USB-VGA adapters
+udl*   at uhub? port ?         # DisplayLink DL-1x0/1x5
+wsdisplay* at udl?
 
 # USB Printer
 ulpt*  at uhub? port ? configuration ? interface ?
@@ -55,12 +69,16 @@
 umodem*        at uhub? port ? configuration ?
 ucom*  at umodem?
 
+# Option N.V. Wireless WAN modems
+uhso*  at uhub? port ? configuration ?
+
 # USB Mass Storage
 umass* at uhub? port ? configuration ? interface ?
 wd*    at umass?
 
 # USB audio
 uaudio*        at uhub? port ? configuration ?
+uaudio* at usbifif?
 
 # USB MIDI
 umidi* at uhub? port ? configuration ?
@@ -78,6 +96,10 @@
 ustir* at uhub? port ?
 irframe* at ustir?
 
+# Windows Media Center IR transceiver
+irmce* at uhub? port ?
+cir*   at irmce?
+
 # USB Ethernet adapters
 aue*   at uhub? port ?         # ADMtek AN986 Pegasus based adapters
 axe*   at uhub? port ?         # ASIX AX88172 based adapters
@@ -86,21 +108,35 @@
 kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 udav*  at uhub? port ?         # Davicom DM9601 based adapters
 url*   at uhub? port ?         # Realtek RTL8150L based adapters
+urndis*        at uhub? port ?         # Microsoft RNDIS specification
 
-# USB 802.11b adapters
+# USB 802.11 adapters
 atu*   at uhub? port ?         # Atmel AT76C50XX based adapters
-ral*   at uhub? port ?         # Ralink Technology RT25x0 based adapters
+otus*  at uhub? port ?         # Atheros AR9001U
+ral*   at uhub? port ?         # Ralink Technology RT25x0 802.11a/b/g
+rum*   at uhub? port ?         # Ralink Technology RT2501/RT2601 802.11a/b/g
+upgt*  at uhub? port ?         # Intersil PrismGT
+zyd*   at uhub? port ?         # Zydas ZD1211
 
 # Prolific PL2301/PL2302 host-to-host adapter
 upl*   at uhub? port ?
 
 # Serial adapters
+uark*  at uhub? port ?         # ArkMicroChips 3116 serial adapter
+ucom*  at uark? portno?
+
 ubsa*  at uhub? port ?         # Belkin serial adapter
 ucom*  at ubsa? portno ?
 
+uchcom*        at uhub? port ?         # WinChipHead CH340/CH341 serial adapter
+ucom*  at uchcom? portno ?
+
 uftdi* at uhub? port ?         # FTDI FT8U100AX serial adapter
 ucom*  at uftdi? portno ?
 
+#uhmodem* at uhub? port ?      # Huawei E220 3G/HSDPA modem
+#ucom* at uhmodem?
+
 uipaq* at uhub? port ?         # iPAQ PDAs
 ucom*  at uipaq? portno ?
 
@@ -110,11 +146,17 @@
 uplcom* at uhub? port ?        # I/O DATA USB-RSAQ2 serial adapter
 ucom*  at uplcom? portno ?
 
+uslsa* at uhub? port ?         # Silicon Labs serial adapters
+ucom*  at uslsa? portno ?
+
 uvscom* at uhub? port ?        # SUNTAC Slipper U VS-10U serial adapter
 ucom*  at uvscom? portno ?
 
-uslsa* at uhub? port ?         # Silicon Labs CP210x serial adapter
-ucom*  at uslsa? portno ?
+moscom* at uhub? port ?        # Moschip MCS7xxx serial adaapter
+ucom*  at moscom? portno ?
+
+# RIM BlackBerry
+uberry* at uhub? port ?
 
 # Diamond Multimedia Rio 500
 urio*  at uhub? port ?
@@ -146,5 +188,24 @@
 # USB Generic driver
 ugen*  at uhub? port ?
 
-###
-###
+# USB 3G datacards
+u3ginit* at uhub? port?
+u3g*   at uhub? port ?
+ucom*  at u3g?
+
+# USB generic serial port (e.g., data over cellular)
+ugensa*        at uhub? port ?
+ucom*  at ugensa?
+
+# USB Video capture devices
+
+pseye* at uhub?                # Sony PLAYSTATION(R) Eye webcam
+uvideo* at uhub?               # USB Video Class capture devices
+auvitek* at uhub?              # Auvitek AU0828 video capture devices
+emdtv* at uhub?                        # Empia EM28xx video capture devices
+video* at videobus?
+dtv* at dtvbus?
+
+# USB Bluetooth controllers
+ubt* at uhub? port ?
+bthub* at ubt?