Date: Sat, 3 Mar 2012 13:48:05 +0100 From: Robert Millan <rmh@freebsd.org> To: Hans Petter Selasky <hselasky@c2i.net> Cc: Kostik Belousov <kostikbel@gmail.com>, Adrian Chadd <adrian@freebsd.org>, freebsd-usb@freebsd.org, freebsd-arch@freebsd.org Subject: Re: Exclude USB drivers from main kernel image? Message-ID: <20120303124805.GA4725@thorin> In-Reply-To: <201202181720.27135.hselasky@c2i.net> References: <CAOfDtXNDXV-hM5t56XKj6-m-Bc=SSZsmB7JnEXsoDGdF2DEuqw@mail.gmail.com> <201202181720.27135.hselasky@c2i.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--ZfOjI3PrQbgiZnxM
Content-Type: multipart/mixed; boundary="EeQfGwPcQSOJBaQU"
Content-Disposition: inline
--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sat, Feb 18, 2012 at 05:20:27PM +0100, Hans Petter Selasky wrote:
> The /etc/devd/usb.conf is regularly updated, though not automatically. It=
=20
> should auto-load most kind of devices. Only additional case that comes to=
mind=20
> is that USB serial console will not be active until devd has executed, if=
that=20
> is enabled.
If early USB serial output is desired, it can be enabled by enabling the
module in bootloader. Is that an acceptable trade-off?
> Your patch looks OK. Adding ARCH @
>=20
> Instead of commenting out, I would just remove those lines.
Here's a new patch that removes the lines instead of commenting them out.
Consistently with that, it also removes a few lines which were already
commented out, using the same criteria.
Also, it disables a few more USB drivers. Due to an oversight my previous
patch didn't disable all drivers that devd can handle.
Patch is tested with "make universe" on HEAD.
--=20
Robert Millan
--EeQfGwPcQSOJBaQU
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="usb.diff"
Content-Transfer-Encoding: quoted-printable
Index: sys/amd64/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/amd64/conf/GENERIC (revision 232404)
+++ sys/amd64/conf/GENERIC (working copy)
@@ -302,39 +302,8 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices (needs netgraph)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device run # Ralink Technology RT2700/RT2800/RT3000 NICs.
-device uath # Atheros AR5523 wireless NICs
-device upgt # Conexant/Intersil PrismGT wireless NICs.
-device ural # Ralink Technology RT2500USB wireless NICs
-device urtw # Realtek RTL8187B/L wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
=20
# FireWire support
device firewire # FireWire bus code
@@ -350,7 +319,6 @@
device snd_es137x # Ensoniq AudioPCI ES137x
device snd_hda # Intel High Definition Audio
device snd_ich # Intel, NVidia and other ICH AC'97 Audio
-device snd_uaudio # USB Audio
device snd_via8233 # VIA VT8233x Audio
=20
# MMC/SD
Index: sys/arm/conf/KB920X
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/conf/KB920X (revision 232404)
+++ sys/arm/conf/KB920X (working copy)
@@ -99,34 +99,8 @@
options USB_DEBUG # enable debug msgs
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
+device miibus # Required for USB Ethernet
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
Index: sys/arm/conf/QILA9G20
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/conf/QILA9G20 (revision 232404)
+++ sys/arm/conf/QILA9G20 (working copy)
@@ -124,26 +124,8 @@
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
-device uhid # "Human Interface Devices"
-#device ulpt # Printer
-#device udbp # USB Double Bulk Pipe devices
+device miibus # Required for USB Ethernet
=20
-# USB Ethernet, requires miibus
-device miibus
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-
-# USB Wireless
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device uath # Atheros AR5523 wireless NICs
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device zyd # ZyDAS zd1211/zd1211b wireless NICs
-
# Wireless NIC cards
#device wlan # 802.11 support
#device wlan_wep # 802.11 WEP support
Index: sys/arm/conf/HL200
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/conf/HL200 (revision 232404)
+++ sys/arm/conf/HL200 (working copy)
@@ -98,35 +98,9 @@
options USB_DEBUG # enable debug msgs
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
#device ubser # not yet converted.
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
+device miibus # Required for USB Ethernet
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
Index: sys/arm/conf/HL201
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/conf/HL201 (revision 232404)
+++ sys/arm/conf/HL201 (working copy)
@@ -99,25 +99,8 @@
# USB support
#device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-#device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-
-# USB Ethernet, requires miibus
-device miibus
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device uath # Atheros AR5523 wireless NICs
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device zyd # ZyDAS zd1211/zd1211b wireless NICs
+device miibus # Required for USB Ethernet
# SCSI peripherals
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
Index: sys/arm/conf/SAM9G20EK
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/conf/SAM9G20EK (revision 232404)
+++ sys/arm/conf/SAM9G20EK (working copy)
@@ -124,26 +124,8 @@
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
-device uhid # "Human Interface Devices"
-#device ulpt # Printer
-#device udbp # USB Double Bulk Pipe devices
+device miibus # Required for USB Ethernet
=20
-# USB Ethernet, requires miibus
-device miibus
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-
-# USB Wireless
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device uath # Atheros AR5523 wireless NICs
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device zyd # ZyDAS zd1211/zd1211b wireless NICs
-
# Wireless NIC cards
#device wlan # 802.11 support
#device wlan_wep # 802.11 WEP support
Index: sys/i386/conf/XBOX
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/i386/conf/XBOX (revision 232404)
+++ sys/i386/conf/XBOX (working copy)
@@ -80,20 +80,10 @@
#device uhci # UHCI PCI->USB interface
device ohci # OHCI PCI->USB interface
device usb # USB Bus (required)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
=20
device miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
=20
device sound
device snd_ich # nForce audio
Index: sys/i386/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/i386/conf/GENERIC (revision 232404)
+++ sys/i386/conf/GENERIC (working copy)
@@ -315,39 +315,8 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices (needs netgraph)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device run # Ralink Technology RT2700/RT2800/RT3000 NICs.
-device uath # Atheros AR5523 wireless NICs
-device upgt # Conexant/Intersil PrismGT wireless NICs.
-device ural # Ralink Technology RT2500USB wireless NICs
-device urtw # Realtek RTL8187B/L wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
=20
# FireWire support
device firewire # FireWire bus code
@@ -363,7 +332,6 @@
device snd_es137x # Ensoniq AudioPCI ES137x
device snd_hda # Intel High Definition Audio
device snd_ich # Intel, NVidia and other ICH AC'97 Audio
-device snd_uaudio # USB Audio
device snd_via8233 # VIA VT8233x Audio
=20
# MMC/SD
Index: sys/ia64/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/ia64/conf/GENERIC (revision 232404)
+++ sys/ia64/conf/GENERIC (working copy)
@@ -127,11 +127,8 @@
device ehci # EHCI host controller
device ohci # OHCI PCI->USB interface
device uhci # UHCI PCI->USB interface
-device uhid # Human Interface Devices
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage (need scbus & da)
-device ums # Mouse
=20
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
@@ -162,25 +159,6 @@
device vge # VIA VT612x gigabit Ethernet
device xl # 3Com 3c90x ("Boomerang", "Cyclone")
=20
-# USB Ethernet
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-
-# USB Serial
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-
# Wireless NIC cards.
# The wlan(4) module assumes this, so just define it so it
# at least correctly loads.
Index: sys/mips/conf/XLRN32
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/mips/conf/XLRN32 (revision 232404)
+++ sys/mips/conf/XLRN32 (working copy)
@@ -104,9 +104,7 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
options USB_DEBUG # enable debug msgs
-#device udbp # USB Double Bulk Pipe devices
#device ugen # Generic
-#device uhid # "Human Interface Devices"
device umass # Disks/Mass storage - Requires scbus and =
da
=20
#device cfi
Index: sys/mips/conf/XLR64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/mips/conf/XLR64 (revision 232404)
+++ sys/mips/conf/XLR64 (working copy)
@@ -103,7 +103,6 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
options USB_DEBUG # enable debug msgs
-#device uhid # "Human Interface Devices"
device umass # Disks/Mass storage - Requires scbus and da
=20
#device cfi
Index: sys/mips/conf/std.XLP
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/mips/conf/std.XLP (revision 232404)
+++ sys/mips/conf/std.XLP (working copy)
@@ -81,7 +81,6 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
#options USB_DEBUG # enable debug msgs
#device ugen # Generic
-#device uhid # "Human Interface Devices"
device umass # Requires scbus and da
=20
options FDT
Index: sys/mips/conf/XLR
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/mips/conf/XLR (revision 232404)
+++ sys/mips/conf/XLR (working copy)
@@ -128,7 +128,6 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
#options USB_DEBUG # enable debug msgs
-#device uhid # "Human Interface Devices"
device umass # Disks/Mass storage - Requires scbus and da
=20
#device cfi
Index: sys/mips/conf/OCTEON1
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/mips/conf/OCTEON1 (revision 232404)
+++ sys/mips/conf/OCTEON1 (working copy)
@@ -267,32 +267,4 @@
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
Index: sys/pc98/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/pc98/conf/GENERIC (revision 232404)
+++ sys/pc98/conf/GENERIC (working copy)
@@ -239,36 +239,9 @@
#device ohci # OHCI PCI->USB interface
#device ehci # EHCI PCI->USB interface (USB 2.0)
#device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices (needs netgraph)
-#device uhid # "Human Interface Devices"
#device ukbd # Keyboard
-#device ulpt # Printer
#device umass # Disks/Mass storage - Requires scbus and da
-#device ums # Mouse
-#device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-#device uark # Technologies ARK3116 based serial adapters
-#device ubsa # Belkin F5U103 and compatible serial adapters
#device ubser # BWCT console serial adapters
-#device uftdi # For FTDI usb serial adapters
-#device uipaq # Some WinCE based devices
-#device uplcom # Prolific PL-2303 serial adapters
-#device uslcom # SI Labs CP2101/CP2102 serial adapters
-#device uvisor # Visor and Palm devices
-#device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
-#device udav # Davicom DM9601E USB
-# USB Wireless
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device uath # Atheros AR5523 wireless NICs
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device zyd # ZyDAS zd1211/zd1211b wireless NICs
=20
# FireWire support
#device firewire # FireWire bus code
@@ -280,4 +253,3 @@
#device snd_mss # Microsoft Sound System
#device "snd_sb16" # Sound Blaster 16
#device snd_sbc # Sound Blaster
-#device snd_uaudio # USB Audio
Index: sys/powerpc/conf/GENERIC64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/powerpc/conf/GENERIC64 (revision 232404)
+++ sys/powerpc/conf/GENERIC64 (working copy)
@@ -156,19 +156,9 @@
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface
device usb # USB Bus (required)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da0
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Ethernet
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
=20
# Wireless NIC cards
options IEEE80211_SUPPORT_MESH
@@ -197,5 +187,4 @@
# Sound support
device sound # Generic sound driver (required)
device snd_ai2s # Apple I2S audio
-device snd_uaudio # USB Audio
=20
Index: sys/powerpc/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/powerpc/conf/GENERIC (revision 232404)
+++ sys/powerpc/conf/GENERIC (working copy)
@@ -159,20 +159,9 @@
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface
device usb # USB Bus (required)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da0
-device ums # Mouse
-device atp # Apple USB touchpad
-device urio # Diamond Rio 500 MP3 player
-# USB Ethernet
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
=20
# Wireless NIC cards
options IEEE80211_SUPPORT_MESH
@@ -205,5 +194,4 @@
device sound # Generic sound driver (required)
device snd_ai2s # Apple I2S audio
device snd_davbus # Apple DAVBUS audio
-device snd_uaudio # USB Audio
=20
Index: sys/sparc64/conf/GENERIC
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/sparc64/conf/GENERIC (revision 232404)
+++ sys/sparc64/conf/GENERIC (working copy)
@@ -235,35 +235,8 @@
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices (needs netgraph)
-device uhid # "Human Interface Devices"
device ukbd # Keyboard
-device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
-device ums # Mouse
-device urio # Diamond Rio 500 MP3 player
-# USB Serial devices
-device uark # Technologies ARK3116 based serial adapters
-device ubsa # Belkin F5U103 and compatible serial adapters
-device uftdi # For FTDI usb serial adapters
-device uipaq # Some WinCE based devices
-device uplcom # Prolific PL-2303 serial adapters
-device uslcom # SI Labs CP2101/CP2102 serial adapters
-device uvisor # Visor and Palm devices
-device uvscom # USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
-device udav # Davicom DM9601E USB
-# USB Wireless
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zd1211/zd1211b wireless NICs
=20
# FireWire support
device firewire # FireWire bus code
@@ -279,4 +252,3 @@
device snd_audiocs # Crystal Semiconductor CS4231
device snd_es137x # Ensoniq AudioPCI ES137x
device snd_t4dwave # Acer Labs M5451
-device snd_uaudio # USB Audio
--EeQfGwPcQSOJBaQU--
--ZfOjI3PrQbgiZnxM
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/kFreeBSD)
iQIcBAEBCAAGBQJPUhMEAAoJELd1onhloKnORW0P/RLDg4ie4j4H0zdSTVSp2VdZ
0rKiqr4Umme0zP4weE7who3d+TN96VSpb0PVLHapr/7/24PspdBZL5fpKRe6ewe1
036TXs5E6LzxBJEUDDoY6Jh1hQaDwvftLi1LTSXF4FIluzs01ySXeoFx7eDHKtyg
zpevczl5D5Bi97lpBdLQWHgKk0S+0afcw4CA1CfFGSuTkslioMw+HSwC1pp8fGKY
vzINI8PWGjEN5z8oGjT+6RktTot8TpRVb2Yhe8V0T5N4AJHMTg0kKEya+wWNiLd/
f8Ur4r8mQPCXma4Etb0NNpMXzCWXaHmI6V9HT60TCuF+PN8pyYakaesJI1k5hYW0
tJf9h32QAtfl2CTtMRJ4/ZfSFBOtJCVpMd3okwm0b4nKLmNsmZ8KpvowtN+7lfQe
+DxPQalBBwSEAbbAF1aSdvLQ7GfnUTxlWCZZgDVlVnOBUXmb2ar04BiW+8ZiXHui
7TcbaQK9wC293U6hePhCUlkW+OzgtKVz39J+DCH3DBQSqGyG9I6NIAiwG9xIunwV
941M521a/8SLZvK1+d4vKxwsb9j14z8Vpd3XyYPDg/8fCsGISiPqRGeMqVUu47VC
N4eMO2Qanv1rYE5l0ChC/kcnB/rRbitM/+CG2d9+XA0M3gIf8zRCGdIwPpuvBvuk
FHJ8GL02AfLYso/rsX9F
=Ek1B
-----END PGP SIGNATURE-----
--ZfOjI3PrQbgiZnxM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120303124805.GA4725>