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, 18 insertions, 72 deletions

diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 1021e16..b87f899 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -128,78 +128,25 @@ device		faith		# IPv6-to-IPv4 relaying/(translation)
 # 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 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
-#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 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		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/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index ce40856..122e483 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -70,7 +70,6 @@ device		scc
 device		tsec
 device		tun
 device		uart
-device		ugen
 #device		uhci
 device		umass
 device		usb