Switch over GENERIC kernels to USB2 by default.

Tested by:	make universe

8 files changed, 490 insertions, 110 deletions

diff --git a/UPDATING b/UPDATING
index c67b73e..68579fe 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090215:
+	The GENERIC kernels for all architectures now default to the new USB2
+	stack. No kernel config options or code have been removed so if a
+	problem arises please report it and optionally revert to the old USB
+	stack. If you are loading USB kernel modules or have a custom kernel
+	that includes GENERIC then ensure that usb names are also changed over,
+	eg uftdi -> usb2_serial_ftdi
+
 20090203:
 	The ichsmb(4) driver has been changed to require SMBus slave
 	addresses be left-justified (xxxxxxx0b) rather than right-justified.
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index c3a8f49..132324b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -281,40 +281,96 @@ device		firmware	# firmware assist module
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
+# USB core support
+device          usb2_core
+# USB controller support
+device		usb2_controller
+device		usb2_controller_ehci
+device		usb2_controller_ohci
+device		usb2_controller_uhci
+# USB mass storage support
+device		usb2_storage
+device		usb2_storage_mass
+# USB ethernet support, requires miibus
+device		usb2_ethernet
+device		usb2_ethernet_aue
+device		usb2_ethernet_axe
+device		usb2_ethernet_cdce
+device		usb2_ethernet_cue
+device		usb2_ethernet_kue
+device		usb2_ethernet_rue
+device		usb2_ethernet_dav
+# USB wireless LAN support
+device		usb2_wlan
+device		usb2_wlan_rum
+device		usb2_wlan_ral
+device		usb2_wlan_zyd
+# USB serial device support
+device		usb2_serial
+device		usb2_serial_ark
+device		usb2_serial_bsa
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi
+device		usb2_serial_gensa
+device		usb2_serial_ipaq
+device		usb2_serial_lpt
+device		usb2_serial_mct
+device		usb2_serial_modem
+device		usb2_serial_moscom
+device		usb2_serial_plcom
+device		usb2_serial_visor
+device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+device		usb2_image
+device		usb2_scanner
+
+# USB support (deprecated)
+#device		uhci		# UHCI PCI->USB interface
+#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		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		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
+#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		ural		# Ralink Technology RT2500USB wireless NICs
+#device		rum		# Ralink Technology RT2501USB wireless NICs
+#device		urio		# Diamond Rio 500 MP3 player
+#device		uscanner	# Scanners
 # USB Serial devices
-device		ucom		# Generic com ttys
-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
+#device		ucom		# Generic com ttys
+#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
+#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
 
 # FireWire support
 device		firewire	# FireWire bus code
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 33c8858..474f280 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -294,42 +294,98 @@ device		firmware	# firmware assist module
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
+# USB core support
+device          usb2_core
+# USB controller support
+device		usb2_controller
+device		usb2_controller_ehci
+device		usb2_controller_ohci
+device		usb2_controller_uhci
+# USB mass storage support
+device		usb2_storage
+device		usb2_storage_mass
+# USB ethernet support, requires miibus
+device		usb2_ethernet
+device		usb2_ethernet_aue
+device		usb2_ethernet_axe
+device		usb2_ethernet_cdce
+device		usb2_ethernet_cue
+device		usb2_ethernet_kue
+device		usb2_ethernet_rue
+device		usb2_ethernet_dav
+# USB wireless LAN support
+device		usb2_wlan
+device		usb2_wlan_rum
+device		usb2_wlan_ral
+device		usb2_wlan_zyd
+# USB serial device support
+device		usb2_serial
+device		usb2_serial_ark
+device		usb2_serial_bsa
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi
+device		usb2_serial_gensa
+device		usb2_serial_ipaq
+device		usb2_serial_lpt
+device		usb2_serial_mct
+device		usb2_serial_modem
+device		usb2_serial_moscom
+device		usb2_serial_plcom
+device		usb2_serial_visor
+device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+device		usb2_image
+device		usb2_scanner
+
+# USB support (deprecated)
+#device		uhci		# UHCI PCI->USB interface
+#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		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		ural		# Ralink Technology RT2500USB wireless NICs
-device		rum		# Ralink Technology RT2501USB wireless NICs
-device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
+#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		ural		# Ralink Technology RT2500USB wireless NICs
+#device		rum		# Ralink Technology RT2501USB wireless NICs
+#device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
+#device		urio		# Diamond Rio 500 MP3 player
+#device		uscanner	# Scanners
 # USB Serial devices
-device		ucom		# Generic com ttys
-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
+#device		ucom		# Generic com ttys
+#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
+#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
 
 # FireWire support
 device		firewire	# FireWire bus code
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 37d76fe..6fdbde7 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -70,7 +70,8 @@ device		firewire	# FireWire bus code
 device		miibus		# MII bus support (Ethernet)
 device		pci		# PCI bus support
 device		scbus		# SCSI bus (required for SCSI)
-device		usb		# USB Bus (required for USB)
+#device		usb		# USB Bus (required for USB)
+device          usb2_core	# USB Bus (required for USB)
 
 # ATA and ATAPI devices
 device		ata		# ATA controller
@@ -107,16 +108,56 @@ device		amr		# AMI MegaRAID
 device		ida		# Compaq Smart RAID
 device		mlx		# Mylex DAC960 family
 
+# USB controller support
+device		usb2_controller
+device		usb2_controller_ehci
+device		usb2_controller_ohci
+device		usb2_controller_uhci
+# USB mass storage support
+device		usb2_storage
+device		usb2_storage_mass
+# USB serial device support
+device		usb2_serial
+device		usb2_serial_ark
+device		usb2_serial_bsa
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi
+device		usb2_serial_gensa
+device		usb2_serial_ipaq
+device		usb2_serial_lpt
+device		usb2_serial_mct
+device		usb2_serial_modem
+device		usb2_serial_moscom
+device		usb2_serial_plcom
+device		usb2_serial_visor
+device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+#device		usb2_image
+#device		usb2_scanner
+
 # USB host controllers and peripherals
-device		ehci		# EHCI host controller
-device		ohci		# OHCI PCI->USB interface
-device		ugen		# Generic device
-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
+#device		ehci		# EHCI host controller
+#device		ohci		# OHCI PCI->USB interface
+#device		ugen		# Generic device
+#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
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
@@ -136,11 +177,21 @@ device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		xl		# 3Com 3c90x ("Boomerang", "Cyclone")
 
-# USB Ethernet
-device		aue		# ADMtek USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
+# USB ethernet support, requires miibus
+device		usb2_ethernet
+device		usb2_ethernet_aue
+device		usb2_ethernet_axe
+device		usb2_ethernet_cdce
+device		usb2_ethernet_cue
+device		usb2_ethernet_kue
+device		usb2_ethernet_rue
+device		usb2_ethernet_dav
+
+# USB Ethernet (deprecated)
+#device		aue		# ADMtek USB Ethernet
+#device		cdce		# Generic USB over Ethernet
+#device		cue		# CATC USB Ethernet
+#device		kue		# Kawasaki LSI USB Ethernet
 
 # FireWire support
 device		sbp		# SCSI over FireWire (need scbus & da)
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index d9dafa6..c2674d4 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -250,7 +250,63 @@ device		firmware	# firmware assist module
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
+# USB core support
+#device          usb2_core
+# USB controller support
+#device		usb2_controller
+#device		usb2_controller_ehci
+#device		usb2_controller_ohci
+#device		usb2_controller_uhci
+# USB mass storage support
+#device		usb2_storage
+#device		usb2_storage_mass
+# USB ethernet support, requires miibus
+#device		usb2_ethernet
+#device		usb2_ethernet_aue
+#device		usb2_ethernet_axe
+#device		usb2_ethernet_cdce
+#device		usb2_ethernet_cue
+#device		usb2_ethernet_kue
+#device		usb2_ethernet_rue
+#device		usb2_ethernet_dav
+# USB wireless LAN support
+#device		usb2_wlan
+#device		usb2_wlan_rum
+#device		usb2_wlan_ral
+#device		usb2_wlan_zyd
+# USB serial device support
+#device		usb2_serial
+#device		usb2_serial_ark
+#device		usb2_serial_bsa
+#device		usb2_serial_bser
+#device		usb2_serial_chcom
+#device		usb2_serial_cycom
+#device		usb2_serial_foma
+#device		usb2_serial_ftdi
+#device		usb2_serial_gensa
+#device		usb2_serial_ipaq
+#device		usb2_serial_lpt
+#device		usb2_serial_mct
+#device		usb2_serial_modem
+#device		usb2_serial_moscom
+#device		usb2_serial_plcom
+#device		usb2_serial_visor
+#device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+#device		usb2_input
+#device		usb2_input_hid
+#device		usb2_input_kbd
+#device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+#device		usb2_image
+#device		usb2_scanner
+
+# USB support (deprecated)
 #device		uhci		# UHCI PCI->USB interface
 #device		ohci		# OHCI PCI->USB interface
 #device		ehci		# EHCI PCI->USB interface (USB 2.0)
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 50574ab..addec55 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -128,26 +128,77 @@ device		faith		# IPv6-to-IPv4 relaying/(translation)
 # Note that 'bpf' is required for DHCP.
 device		bpf		#Berkeley packet filter
 
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface
-device		usb		# USB Bus (required)
-device		ugen		# Generic
-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
-device		uscanner	# Scanners
+# USB core support
+device          usb2_core
+# USB controller support
+device		usb2_controller
+device		usb2_controller_ehci
+device		usb2_controller_ohci
+device		usb2_controller_uhci
+# USB mass storage support
+device		usb2_storage
+device		usb2_storage_mass
+# USB ethernet support, requires miibus
+device		usb2_ethernet
+device		usb2_ethernet_aue
+device		usb2_ethernet_axe
+device		usb2_ethernet_cdce
+device		usb2_ethernet_cue
+device		usb2_ethernet_kue
+device		usb2_ethernet_rue
+device		usb2_ethernet_dav
+# USB serial device support
+device		usb2_serial
+device		usb2_serial_ark
+device		usb2_serial_bsa
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi
+device		usb2_serial_gensa
+device		usb2_serial_ipaq
+device		usb2_serial_lpt
+device		usb2_serial_mct
+device		usb2_serial_modem
+device		usb2_serial_moscom
+device		usb2_serial_plcom
+device		usb2_serial_visor
+device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+device		usb2_image
+device		usb2_scanner
+
+# USB support (deprecated)
+#device		uhci		# UHCI PCI->USB interface
+#device		ohci		# OHCI PCI->USB interface
+#device		ehci		# EHCI PCI->USB interface
+#device		usb		# USB Bus (required)
+#device		ugen		# Generic
+#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
+#device		uscanner	# Scanners
 # 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		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
 
 # FireWire support
 device		firewire	# FireWire bus code
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 5b9f433..124f98b 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -219,17 +219,68 @@ device		firmware	# firmware assist module
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
+# USB core support
+device          usb2_core
+# USB controller support
+device		usb2_controller
+#device		usb2_controller_ehci
+device		usb2_controller_ohci
+#device		usb2_controller_uhci
+# USB mass storage support
+#device		usb2_storage
+#device		usb2_storage_mass
+# USB ethernet support, requires miibus
+#device		usb2_ethernet
+#device		usb2_ethernet_aue
+#device		usb2_ethernet_axe
+#device		usb2_ethernet_cdce
+#device		usb2_ethernet_cue
+#device		usb2_ethernet_kue
+#device		usb2_ethernet_rue
+#device		usb2_ethernet_dav
+# USB serial device support
+#device		usb2_serial
+#device		usb2_serial_ark
+#device		usb2_serial_bsa
+#device		usb2_serial_bser
+#device		usb2_serial_chcom
+#device		usb2_serial_cycom
+#device		usb2_serial_foma
+#device		usb2_serial_ftdi
+#device		usb2_serial_gensa
+#device		usb2_serial_ipaq
+#device		usb2_serial_lpt
+#device		usb2_serial_mct
+#device		usb2_serial_modem
+#device		usb2_serial_moscom
+#device		usb2_serial_plcom
+#device		usb2_serial_visor
+#device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+#device		usb2_image
+#device		usb2_scanner
+
+# USB support (deprecated)
 #device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		usb		# USB Bus (required)
+#device		ohci		# OHCI PCI->USB interface
+#device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
 #device		ugen		# Generic
 #device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+#device		ukbd		# Keyboard
 #device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
+#device		ums		# Mouse
 #device		urio		# Diamond Rio 500 MP3 player
 #device		uscanner	# Scanners
 # USB Ethernet, requires mii
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index ef9cdb3..b17d934 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -180,17 +180,68 @@ device		faith		# IPv6-to-IPv4 relaying (translation)
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# USB support
+# USB core support
+device          usb2_core
+# USB controller support
+device		usb2_controller
+device		usb2_controller_ehci
+device		usb2_controller_ohci
+device		usb2_controller_uhci
+# USB mass storage support
+#device		usb2_storage
+#device		usb2_storage_mass
+# USB ethernet support, requires miibus
+#device		usb2_ethernet
+#device		usb2_ethernet_aue
+#device		usb2_ethernet_axe
+#device		usb2_ethernet_cdce
+#device		usb2_ethernet_cue
+#device		usb2_ethernet_kue
+#device		usb2_ethernet_rue
+#device		usb2_ethernet_dav
+# USB serial device support
+device		usb2_serial
+device		usb2_serial_ark
+device		usb2_serial_bsa
+device		usb2_serial_bser
+device		usb2_serial_chcom
+device		usb2_serial_cycom
+device		usb2_serial_foma
+device		usb2_serial_ftdi
+device		usb2_serial_gensa
+device		usb2_serial_ipaq
+device		usb2_serial_lpt
+device		usb2_serial_mct
+device		usb2_serial_modem
+device		usb2_serial_moscom
+device		usb2_serial_plcom
+device		usb2_serial_visor
+device		usb2_serial_vscom
+# USB bluetooth support
+#device		usb2_bluetooth
+#device		usb2_bluetooth_ng
+# USB input device support
+device		usb2_input
+device		usb2_input_hid
+#device		usb2_input_kbd
+device		usb2_input_ms
+# USB sound and MIDI device support
+#device		usb2_sound
+# USB scanner support
+#device		usb2_image
+#device		usb2_scanner
+
+# USB support (deprecated)
 #device		uhci		# UHCI PCI->USB interface
 #device		ohci		# OHCI PCI->USB interface
-device		usb		# USB Bus (required)
+#device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
+#device		ugen		# Generic
+#device		uhid		# "Human Interface Devices"
 #device		ukbd		# Keyboard
-device		ulpt		# Printer
+#device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
+#device		ums		# Mouse
 #device		urio		# Diamond Rio 500 MP3 player
 #device		uscanner	# Scanners
 # USB Ethernet, requires mii