Change over the usb kernel options to the new stack (retaining existing

naming). The old usb stack can be compiled in my prefixing the name with 'o'.

2 files changed, 29 insertions, 90 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a7e75b3..197de84 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -281,97 +281,38 @@ device		firmware	# firmware assist module
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
 
-# 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_slcom
-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)
+# 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)
 #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		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		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/amd64/conf/USB2 b/sys/amd64/conf/USB2
index f6477af..bc5a27e 100644
--- a/sys/amd64/conf/USB2
+++ b/sys/amd64/conf/USB2
@@ -13,7 +13,6 @@ nodevice	uhci
 nodevice	ohci
 nodevice	ehci
 nodevice	usb
-nodevice	ugen
 nodevice	uhid
 nodevice	ukbd
 nodevice	ulpt
@@ -25,7 +24,6 @@ nodevice	zyd
 nodevice	urio
 nodevice	uscanner
 # USB Serial devices
-nodevice	ucom
 nodevice	u3g
 nodevice	uark
 nodevice	ubsa