Module Name: src
Committed By: martin
Date: Fri Sep 7 12:27:27 UTC 2018
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: GENERIC
src/sys/arch/i386/conf [netbsd-8]: GENERIC
src/sys/dev/usb [netbsd-8]: usbdevices.config
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1011):
sys/dev/usb/usbdevices.config: revision 1.32 (patch)
sys/arch/amd64/conf/GENERIC: revision 1.502 (patch)
sys/arch/i386/conf/GENERIC: revision 1.1188 (patch)
- add commented entries that exist in amd64 GENERIC: oboe, mos, umb.
(XXX: mos might be deleteable now?).
- comment uscanner(4) -- usb scanners use ugen(4) interface.
- minor sort.
-
use dev/usb/usbdevices.config, gaining these missing drivers:
slurm(4), uthum(4), umcs(4), uark(4), upgt(4), and usmsc(4).
-
use dev/usb/usbdevices.config instead of a local list.
adds slurm(4), umcs(4), uark(4), and usmsc(4).
To generate a diff of this commit:
cvs rdiff -u -r1.459.2.10 -r1.459.2.11 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1156.2.10 -r1.1156.2.11 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/dev/usb/usbdevices.config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.459.2.10 src/sys/arch/amd64/conf/GENERIC:1.459.2.11
--- src/sys/arch/amd64/conf/GENERIC:1.459.2.10 Sat Jun 9 15:12:21 2018
+++ src/sys/arch/amd64/conf/GENERIC Fri Sep 7 12:27:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.459.2.10 2018/06/09 15:12:21 martin Exp $
+# $NetBSD: GENERIC,v 1.459.2.11 2018/09/07 12:27:26 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.459.2.10 $"
+#ident "GENERIC-$Revision: 1.459.2.11 $"
maxusers 64 # estimated number of users
@@ -900,180 +900,7 @@ usb* at ohci?
usb* at uhci?
usb* at slhci?
-# USB Hubs
-uhub* at usb?
-uhub* at uhub? port ?
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums* at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB Touchscreens
-uts* at uhidev? reportid ?
-wsmouse* at uts? mux 0
-
-# 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
-
-# USB serial adapter
-ucycom* at uhidev? reportid ?
-
-# USB Generic HID devices
-uhid* at uhidev? reportid ?
-
-# USB LCDs and USB-VGA adaptors
-udl* at uhub? port ? # DisplayLink DL-1x0/1x5
-wsdisplay* at udl?
-
-# USB Printer
-ulpt* at uhub? port ? configuration ? interface ?
-
-# USB Modem
-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 ?
-
-# USB IrDA
-# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
-irframe* at uirda?
-
-stuirda* at uhub? port ? configuration ? interface ?
-irframe* at stuirda?
-
-# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
-irframe* at ustir?
-
-# KingSun/DonShine USB/IrDA Bridge
-udsir* at uhub? port ?
-irframe* at udsir?
-
-# 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
-axen* at uhub? port ? # ASIX AX88178a/AX88179 based adapters
-cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
-cue* at uhub? port ? # CATC USB-EL1201A based adapters
-kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
-#mos* at uhub? port ? # Moschip MCS7730/MCS7830/MCS7832 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
-
-# Prolific PL2301/PL2302 host-to-host adapter
-upl* at uhub? port ?
-
-# Serial adapters
-ubsa* at uhub? port ? # Belkin serial adapter
-ucom* at ubsa? portno ?
-
-uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
-ucom* at uchcom? portno ?
-
-uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
-ucom* at uftdi? portno ?
-
-uipaq* at uhub? port ? # iPAQ PDAs
-ucom* at uipaq? portno ?
-
-umct* at uhub? port ? # MCT USB-RS232 serial adapter
-ucom* at umct? portno ?
-
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom? portno ?
-
-uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter
-ucom* at uslsa? portno ?
-
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
-ucom* at uvscom? portno ?
-
-# RIM BlackBerry
-uberry* at uhub? port ?
-
-# Apple iPad
-uipad* at uhub? port ?
-
-# Diamond Multimedia Rio 500
-urio* at uhub? port ?
-
-# USB Handspring Visor
-uvisor* at uhub? port ?
-ucom* at uvisor?
-
-# Kyocera AIR-EDGE PHONE
-ukyopon* at uhub? port ?
-ucom* at ukyopon? portno ?
-
-# USB scanners
-#uscanner* at uhub? port ?
-
-# USB 802.11 adapters
-athn* at uhub? port ? # Atheros AR9002U
-atu* at uhub? port ? # Atmel at76c50x 802.11b
-otus* at uhub? port ? # Atheros AR9001U
-ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
-rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
-run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
-urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g
-urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
-zyd* at uhub? port ? # Zydas ZD1211
-
-# USB scanners that use SCSI emulation, e.g., HP5300
-usscanner* at uhub? port ?
-
-# Topfield TF5000PVR range of DVB recorders
-utoppy* at uhub? port ?
-
-# Y@P firmware loader
-uyap* at uhub? port ?
-
-# D-Link DSB-R100 USB radio
-udsbr* at uhub? port ?
-radio* at udsbr?
-
-# USB Generic driver
-ugen* at uhub? port ?
-
-# USB 3G datacards
-umodeswitch* 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?
-
-# Araneus Alea I/II TRNG
-#ualea* at uhub? port ? configuration ? interface ?
-
-# IrDA and Consumer Ir devices
+include "dev/usb/usbdevices.config"
# Toshiba Oboe
#oboe* at pci? dev ? function ? # broken -- vtophys
@@ -1149,13 +976,8 @@ midi* at pcppi? # MIDI interface to the
# Video capture devices
-auvitek* at uhub? # Auvitek AU0828 USB TV
coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
-emdtv* at uhub? # Empia EM28xx USB TV
-cir* at emdtv?
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
-uvideo* at uhub? # USB Video Class capture devices
video* at videobus? # Analog capture interface
dtv* at dtvbus? # Digital capture interface
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.10 src/sys/arch/i386/conf/GENERIC:1.1156.2.11
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.10 Sat Jun 9 15:12:21 2018
+++ src/sys/arch/i386/conf/GENERIC Fri Sep 7 12:27:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.10 2018/06/09 15:12:21 martin Exp $
+# $NetBSD: GENERIC,v 1.1156.2.11 2018/09/07 12:27:26 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1156.2.10 $"
+#ident "GENERIC-$Revision: 1.1156.2.11 $"
maxusers 64 # estimated number of users
@@ -1191,181 +1191,7 @@ usb* at ohci?
usb* at slhci?
usb* at uhci?
-# USB Hubs
-uhub* at usb?
-uhub* at uhub? port ?
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums* at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB generic touchscreen
-uts* at uhidev? reportid ?
-wsmouse* at uts? mux 0
-
-# 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
-
-# USB TEMPer and TEMPerHUM
-uthum* at uhidev? reportid ?
-
-# USB serial adapter
-ucycom* at uhidev? reportid ?
-
-# USB Generic HID devices
-uhid* at uhidev? reportid ?
-
-# USB LCDs and USB-VGA adaptors
-udl* at uhub? port ? # DisplayLink DL-1x0/1x5
-wsdisplay* at udl?
-
-# USB Printer
-ulpt* at uhub? port ? configuration ? interface ?
-
-# USB Modem
-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 ?
-
-# USB IrDA
-# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
-irframe* at uirda?
-
-stuirda* at uhub? port ? configuration ? interface ?
-irframe* at stuirda?
-
-# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
-irframe* at ustir?
-
-# KingSun/DonShine USB/IrDA Bridge
-udsir* at uhub? port ?
-irframe* at udsir?
-
-# 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
-axen* at uhub? port ? # ASIX AX88178a/AX88179 based adapters
-cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
-cue* at uhub? port ? # CATC USB-EL1201A based adapters
-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.11 adapters
-athn* at uhub? port ? # Atheros AR9002U
-atu* at uhub? port ? # Atmel AT76C50XX based adapters
-otus* at uhub? port ? # Atheros AR9001U
-ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
-rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
-run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
-upgt* at uhub? port ? # Intersil PrismGT
-urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g
-urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
-zyd* at uhub? port ? # Zydas ZD1211
-
-# Prolific PL2301/PL2302 host-to-host adapter
-upl* at uhub? port ?
-
-# Serial adapters
-ubsa* at uhub? port ? # Belkin serial adapter
-ucom* at ubsa? portno ?
-
-uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
-ucom* at uchcom? portno ?
-
-uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
-ucom* at uftdi? portno ?
-
-uipaq* at uhub? port ? # iPAQ PDAs
-ucom* at uipaq? portno ?
-
-umct* at uhub? port ? # MCT USB-RS232 serial adapter
-ucom* at umct? portno ?
-
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom? portno ?
-
-uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter
-ucom* at uslsa? portno ?
-
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
-ucom* at uvscom? portno ?
-
-# RIM BlackBerry
-uberry* at uhub? port ?
-
-# Apple iPad
-uipad* at uhub? port ?
-
-# Diamond Multimedia Rio 500
-urio* at uhub? port ?
-
-# USB Handspring Visor
-uvisor* at uhub? port ?
-ucom* at uvisor?
-
-# Kyocera AIR-EDGE PHONE
-ukyopon* at uhub? port ?
-ucom* at ukyopon? portno ?
-
-# USB scanners
-#uscanner* at uhub? port ?
-
-# USB scanners that use SCSI emulation, e.g., HP5300
-usscanner* at uhub? port ?
-
-# Topfield TF5000PVR range of DVB recorders
-utoppy* at uhub? port ?
-
-# Y@P firmware loader
-uyap* at uhub? port ?
-
-# D-Link DSB-R100 USB radio
-udsbr* at uhub? port ?
-radio* at udsbr?
-
-# USB Generic driver
-ugen* at uhub? port ?
-
-# USB 3G datacards
-umodeswitch* 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?
-
-# Araneus Alea I/II TRNG
-#ualea* at uhub? port ? configuration ? interface ?
+include "dev/usb/usbdevices.config"
# IrDA and Consumer Ir devices
@@ -1501,17 +1327,8 @@ midi* at pcppi? # MIDI interface to the
# Video capture devices
-
-auvitek* at uhub? # Auvitek AU0828 USB TV
coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
-emdtv* at uhub? # Empia EM28xx USB TV
-cir* at emdtv?
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
-uvideo* at uhub? # USB Video Class capture devices
-
-video* at videobus? # Analog capture interface
-dtv* at dtvbus? # Digital capture interface
# TV cards
@@ -1530,17 +1347,12 @@ btbc* at pcmcia? function ? # AnyCom Bl
# Bluetooth SDIO Controller
sbt* at sdmmc?
-# Bluetooth USB Controllers
-ubt* at uhub? port ?
-aubtfwl* at uhub? port ?
-
# Bluetooth Device Hub
bthub* at bcsp?
bthub* at bt3c?
bthub* at btbc?
bthub* at btuart?
bthub* at sbt?
-bthub* at ubt?
# Bluetooth HID support
bthidev* at bthub?
Index: src/sys/dev/usb/usbdevices.config
diff -u src/sys/dev/usb/usbdevices.config:1.30 src/sys/dev/usb/usbdevices.config:1.30.2.1
--- src/sys/dev/usb/usbdevices.config:1.30 Thu May 25 10:02:15 2017
+++ src/sys/dev/usb/usbdevices.config Fri Sep 7 12:27:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: usbdevices.config,v 1.30 2017/05/25 10:02:15 ryo Exp $
+# $NetBSD: usbdevices.config,v 1.30.2.1 2018/09/07 12:27:26 martin Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@@ -116,6 +116,10 @@ irframe* at udsir?
irmce* at uhub? port ?
cir* at irmce?
+# Toshiba Oboe
+#oboe* at pci? dev ? function ? # broken -- vtophys
+#irframe* at oboe?
+
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
axe* at uhub? port ? # ASIX AX88172 based adapters
@@ -123,22 +127,23 @@ axen* at uhub? port ? # ASIX AX88178a/A
cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+#mos* at uhub? port ? # Moschip MCS7730/MCS7830/MCS7832 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
usmsc* at uhub? port ? # SMSC95xx based adapters
# USB 802.11 adapters
+athn* at uhub? port ? # Atheros AR9002U
atu* at uhub? port ? # Atmel AT76C50XX based adapters
otus* at uhub? port ? # Atheros AR9001U
-ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt* at uhub? port ? # Intersil PrismGT
+ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g
urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd* at uhub? port ? # Zydas ZD1211
-athn* at uhub? port ? # Atheros AR9002U
# Prolific PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?
@@ -199,7 +204,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ? # Scanners supported via ugen(4) mostly.
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
