Module Name: src
Committed By: martin
Date: Wed May 13 10:33:16 UTC 2020
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Remove local USB device declarations, include the central list instead
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/arch/sparc64/conf/GENERIC
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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.227 src/sys/arch/sparc64/conf/GENERIC:1.228
--- src/sys/arch/sparc64/conf/GENERIC:1.227 Mon May 11 18:29:59 2020
+++ src/sys/arch/sparc64/conf/GENERIC Wed May 13 10:33:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.227 2020/05/11 18:29:59 jdc Exp $
+# $NetBSD: GENERIC,v 1.228 2020/05/13 10:33:16 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.227 $"
+#ident "GENERIC-$Revision: 1.228 $"
maxusers 64
@@ -558,120 +558,8 @@ 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 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 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 ?
-
-# USB audio
-uaudio* at uhub? port ? configuration ?
-
-# USB MIDI
-umidi* at uhub? port ? configuration ?
-
-# USB IrDA
-# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
-irframe* at uirda?
-
-# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
-irframe* at ustir?
-
-# USB Ethernet adapters
-aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
-axe* at uhub? port ? # ASIX AX88172 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
-mue* at uhub? port ? # Microchip LAN75xx/LAN78xx based adapters
-udav* at uhub? port ? # Davicom DM9601 based adapters
-ure* at uhub? port ? # Realtek RTL8152/RTL8153 based adapters
-url* at uhub? port ? # Realtek RTL8150L based adapters
-
-# USB 802.11 adapters
-atu* at uhub? port ? # Atmel AT76C50XX based adapters
-ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
-#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 ?
-
-uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
-ucom* at uftdi? 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 ?
-
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
-ucom* at uvscom? portno ?
-
-# 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 ?
-
-# 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 device drivers
+include "dev/usb/usbdevices.config"
# Firewire support
fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
