From: Sascha Wildner Date: Mon, 10 Mar 2014 10:25:25 +0000 (+0100) Subject: kernel: Comment out old or yet unsupported USB devices in our configs. X-Git-Tag: v3.9.0~385 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/886e1e508c601c0ce620b8e9a1da4b2289b043b9 kernel: Comment out old or yet unsupported USB devices in our configs. --- diff --git a/sys/config/GENERIC b/sys/config/GENERIC index e7601c5420..e912f3ac18 100644 --- a/sys/config/GENERIC +++ b/sys/config/GENERIC @@ -101,7 +101,6 @@ device natapist # ATAPI tape drives device natapicam # Emulate ATAPI devices as SCSI device nataraid # support for ATA software RAID # controllers -device natausb # ATA-over-USB support options ATA_STATIC_ID # Static device numbering # SCSI Controllers @@ -344,24 +343,26 @@ pseudo-device cryptodev # the world with WANT_OLDUSB=true in /etc/make.conf, in addition # to rebuilding the kernel. # +#device oldusb # use this instead of usb for the old stack +#device natausb # ATA-over-USB support (oldusb) +#device ugen # Generic (oldusb) +#device uscanner # Scanners (oldusb) +#device urio # Diamond Rio MP3 Player (oldusb) +#device aue # ADMtek USB ethernet (oldusb) +#device cue # CATC USB ethernet (oldusb) +#device kue # Kawasaki LSI USB ethernet (oldusb) +#device rue # RealTek 8150 based USB ethernet (oldusb) + +device usb # USB Bus (required) device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -#device oldusb # use this instead of usb for the old stack -device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse -device uscanner # Scanners -device urio # Diamond Rio MP3 Player # USB Ethernet, requires mii -device aue # ADMtek USB ethernet device axe # ASIX Electronics USB Ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek 8150 based USB ethernet # USB wireless NICs, requires wlan, wlan_amrr #device rum # Ralink Technology RT2501USB/RT2601USB #device ural # Ralink Technology RT2500USB diff --git a/sys/config/LINT b/sys/config/LINT index ed256a5df9..7ddd6c4bfe 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -1208,7 +1208,6 @@ device natapifd # ATAPI floppy drives device natapist # ATAPI tape drives device natapicam # ATAPI CAM layer emulation device nataraid # support for ATA software RAID controllers -device natausb # ATA-over-USB support # The following options are valid for the NATA driver: # @@ -1427,8 +1426,6 @@ device "snd_t4dwave" device "snd_via8233" device "snd_via82c686" device "snd_vibes" -# USB -device "snd_uaudio" # # Miscellaneous hardware: @@ -2150,6 +2147,65 @@ device iir device mly # USB support +# +# NOTE: If you enable 'oldusb' you must also disable 'usb' and rebuild +# the world with WANT_OLDUSB=true in /etc/make.conf, in addition +# to rebuilding the kernel. +# +# Use this instead of usb for the old stack +#device oldusb +#device natausb # ATA-over-USB support (oldusb) +# +# USB Bluetooth (oldusb) +#device ubt +# Fm Radio (oldusb) +#device ufm +# Generic USB device driver (oldusb) +#device ugen +# USB Rio (MP3 Player) (oldusb) +#device urio +# USB scanners (oldusb) +#device uscanner +# USB com devices (oldusb) +#device moscom +#device uticom +# +# ADMtek USB ethernet (oldusb) +# Supports the LinkSys USB100TX, +# the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX +# and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus +# eval board. +#device aue +# +# CATC USB-EL1201A USB ethernet (oldusb) +# Supports the CATC Netmate +# and Netmate II, and the Belkin F5U111. +#device cue +# +# Kawasaki LSI ethernet (oldusb) +# Supports the LinkSys USB10T, +# Entrega USB-NET-E45, Peracom Ethernet Adapter, the +# 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, +# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB +# and 2104USB, and the Corega USB-T. +#device kue +# +# USB CDC ethernet (oldusb) +#Supports the LG P-500 smartphone. +#device lgue +# +# RealTek 8150 based USB ethernet device (oldusb): +# Melco LUA-KTX +# GREEN HOUSE GH-USB100B +# Billionton ThumbLAN USBKR2-100B +#device rue +# +# Ralink Technology RT2500USB (oldusb) +#device ural +# +# USB sound (oldusb) +#device "snd_uaudio" + # UHCI controller device uhci # OHCI controller @@ -2158,15 +2214,6 @@ device ohci device ehci # General USB code (mandatory for USB) device usb -# Use this instead of usb for the old stack -#device oldusb -# -# USB Bluetooth -device ubt -# Fm Radio -device ufm -# Generic USB device driver -device ugen # Human Interface Device (anything with buttons and dials) device uhid # USB keyboard @@ -2179,12 +2226,7 @@ device umass device umodem # USB mouse device ums -# USB Rio (MP3 Player) -device urio -# USB scanners -device uscanner # USB com devices -device moscom device uark device ubsa device uchcom @@ -2194,40 +2236,13 @@ device ugensa device umct device uplcom device uslcom -device uticom device uvisor device uvscom -# -# ADMtek USB ethernet. Supports the LinkSys USB100TX, -# the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX -# and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus -# eval board. -device aue # # ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the # LinkSys USB200M and various other adapters. device axe -# -# CATC USB-EL1201A USB ethernet. Supports the CATC Netmate -# and Netmate II, and the Belkin F5U111. -device cue -# -# Kawasaki LSI ethernet. Supports the LinkSys USB10T, -# Entrega USB-NET-E45, Peracom Ethernet Adapter, the -# 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, -# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB -# and 2104USB, and the Corega USB-T. -device kue -# -# USB CDC ethernet. Supports the LG P-500 smartphone. -device lgue -# -# RealTek 8150 based USB ethernet device: -# Melco LUA-KTX -# GREEN HOUSE GH-USB100B -# Billionton ThumbLAN USBKR2-100B -device rue # USB wireless NICs, requires wlan_amrr # @@ -2238,9 +2253,6 @@ device rum device run device runfw # -# Ralink Technology RT2500USB -#device ural -# # Realtek RTL8188CU/RTL8192CU wireless driver device urtwn device urtwnfw diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 83e3818d8a..dfae01015f 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -1088,7 +1088,6 @@ device natapifd # ATAPI floppy drives device natapist # ATAPI tape drives device natapicam # ATAPI CAM layer emulation device nataraid # support for ATA software RAID controllers -device natausb # ATA-over-USB support # The following options are valid for the NATA driver: # @@ -1299,8 +1298,6 @@ device "snd_t4dwave" device "snd_via8233" device "snd_via82c686" device "snd_vibes" -# USB -device "snd_uaudio" # # Miscellaneous hardware: @@ -1986,6 +1983,65 @@ device iir device mly # USB support +# +# NOTE: If you enable 'oldusb' you must also disable 'usb' and rebuild +# the world with WANT_OLDUSB=true in /etc/make.conf, in addition +# to rebuilding the kernel. +# +# Use this instead of usb for the old stack +#device oldusb +#device natausb # ATA-over-USB support (oldusb) +# +# USB Bluetooth (oldusb) +#device ubt +# Fm Radio (oldusb) +#device ufm +# Generic USB device driver (oldusb) +#device ugen +# USB Rio (MP3 Player) (oldusb) +#device urio +# USB scanners (oldusb) +#device uscanner +# USB com devices (oldusb) +#device moscom +#device uticom +# +# ADMtek USB ethernet (oldusb) +# Supports the LinkSys USB100TX, +# the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX +# and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus +# eval board. +#device aue +# +# CATC USB-EL1201A USB ethernet (oldusb) +# Supports the CATC Netmate +# and Netmate II, and the Belkin F5U111. +#device cue +# +# Kawasaki LSI ethernet (oldusb) +# Supports the LinkSys USB10T, +# Entrega USB-NET-E45, Peracom Ethernet Adapter, the +# 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, +# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB +# and 2104USB, and the Corega USB-T. +#device kue +# +# USB CDC ethernet (oldusb) +#Supports the LG P-500 smartphone. +#device lgue +# +# RealTek 8150 based USB ethernet device (oldusb): +# Melco LUA-KTX +# GREEN HOUSE GH-USB100B +# Billionton ThumbLAN USBKR2-100B +#device rue +# +# Ralink Technology RT2500USB (oldusb) +#device ural +# +# USB sound (oldusb) +#device "snd_uaudio" + # UHCI controller device uhci # OHCI controller @@ -1994,15 +2050,6 @@ device ohci device ehci # General USB code (mandatory for USB) device usb -# Use this instead of usb for the old stack -#device oldusb -# -# USB Bluetooth -device ubt -# Fm Radio -device ufm -# Generic USB device driver -device ugen # Human Interface Device (anything with buttons and dials) device uhid # USB keyboard @@ -2015,12 +2062,7 @@ device umass device umodem # USB mouse device ums -# USB Rio (MP3 Player) -device urio -# USB scanners -device uscanner # USB com devices -device moscom device uark device ubsa device uchcom @@ -2030,40 +2072,13 @@ device ugensa device umct device uplcom device uslcom -device uticom device uvisor device uvscom -# -# ADMtek USB ethernet. Supports the LinkSys USB100TX, -# the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX -# and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus -# eval board. -device aue # # ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the # LinkSys USB200M and various other adapters. device axe -# -# CATC USB-EL1201A USB ethernet. Supports the CATC Netmate -# and Netmate II, and the Belkin F5U111. -device cue -# -# Kawasaki LSI ethernet. Supports the LinkSys USB10T, -# Entrega USB-NET-E45, Peracom Ethernet Adapter, the -# 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T, -# the Netgear EA101, the D-Link DSB-650, the SMC 2102USB -# and 2104USB, and the Corega USB-T. -device kue -# -# USB CDC ethernet. Supports the LG P-500 smartphone. -device lgue -# -# RealTek 8150 based USB ethernet device: -# Melco LUA-KTX -# GREEN HOUSE GH-USB100B -# Billionton ThumbLAN USBKR2-100B -device rue # USB wireless NICs, requires wlan_amrr # @@ -2074,9 +2089,6 @@ device rum device run device runfw # -# Ralink Technology RT2500USB -#device ural -# # Realtek RTL8188CU/RTL8192CU wireless driver device urtwn device urtwnfw diff --git a/sys/config/SOEKRIS b/sys/config/SOEKRIS index 3441a0e497..ac08a5bd1d 100644 --- a/sys/config/SOEKRIS +++ b/sys/config/SOEKRIS @@ -73,7 +73,6 @@ device natapicd # ATAPI CDROM drives device natapifd # ATAPI floppy drives device natapist # ATAPI tape drives device natapicam # Emulate ATAPI devices as SCSI -device natausb # ATA-over-USB support options ATA_STATIC_ID # Static device numbering device mpt # LSI-Logic MPT/Fusion XXX @@ -174,19 +173,24 @@ pseudo-device crypto # core crypto support, used by wlan pseudo-device cryptodev # USB support +# +# NOTE: If you enable 'oldusb' you must also disable 'usb' and rebuild +# the world with WANT_OLDUSB=true in /etc/make.conf, in addition +# to rebuilding the kernel. +# +#device oldusb # use this instead of usb for the old stack +#device natausb # ATA-over-USB support (oldusb) +#device ugen # Generic (oldusb) +#device uscanner # Scanners (oldusb) +#device urio # Diamond Rio MP3 Player (oldusb) +#device aue # ADMtek USB ethernet (oldusb) +#device rue # RealTek 8150 based USB ethernet (oldusb) + +device usb # USB Bus (required) device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface -#device ehci # EHCI interface -device usb # USB Bus (required) -#device oldusb # use this instead of usb for the old stack -device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse -device uscanner # Scanners -device urio # Diamond Rio MP3 Player -# USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device rue # RealTek 8150 based USB ethernet diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC index c763ca5760..b91ebf667a 100644 --- a/sys/config/X86_64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -87,7 +87,6 @@ device natapist # ATAPI tape drives device natapicam # Emulate ATAPI devices as SCSI device nataraid # support for ATA software RAID # controllers -device natausb # ATA-over-USB support options ATA_STATIC_ID # Static device numbering # SCSI Controllers @@ -320,24 +319,26 @@ pseudo-device crypto # core crypto support, used by wlan # the world with WANT_OLDUSB=true in /etc/make.conf, in addition # to rebuilding the kernel. # +#device oldusb # use this instead of usb for the old stack +#device natausb # ATA-over-USB support (oldusb) +#device ugen # Generic (oldusb) +#device uscanner # Scanners (oldusb) +#device urio # Diamond Rio MP3 Player (oldusb) +#device aue # ADMtek USB ethernet (oldusb) +#device cue # CATC USB ethernet (oldusb) +#device kue # Kawasaki LSI USB ethernet (oldusb) +#device rue # RealTek 8150 based USB ethernet (oldusb) + +device usb # USB Bus (required) device uhci # UHCI PCI->USB interface device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -#device oldusb # use this instead of usb for the old stack -device ugen # Generic device uhid # "Human Interface Devices" device ukbd # Keyboard device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse -device uscanner # Scanners -device urio # Diamond Rio MP3 Player # USB Ethernet, requires mii -device aue # ADMtek USB ethernet device axe # ASIX Electronics USB Ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek 8150 based USB ethernet # USB wireless NICs, requires wlan, wlan_amrr #device rum # Ralink Technology RT2501USB/RT2601USB #device ural # Ralink Technology RT2500USB