PERFORCE change 144583 for review

Hans Petter Selasky hselasky at FreeBSD.org
Thu Jul 3 23:58:58 UTC 2008 

http://perforce.freebsd.org/chv.cgi?CH=144583

Change 144583 by hselasky at hselasky_laptop001 on 2008/07/03 23:58:39

	
	Hook in USB2 modules and drivers into the default
	build. Make USB2 default for KB920X based boards.

Affected files ...

.. //depot/projects/usb/src/sys/arm/conf/KB920X#10 edit
.. //depot/projects/usb/src/sys/conf/files#30 edit
.. //depot/projects/usb/src/sys/modules/Makefile#17 edit

Differences ...

==== //depot/projects/usb/src/sys/arm/conf/KB920X#10 (text) ====

@@ -92,42 +92,31 @@
 device		icee
 
 device		bpf
+
+device		sound			# sound support
+
 # USB support
-device          ohci            # OHCI localbus->USB interface
-device          usb             # USB Bus (required)
-#device         udbp            # USB Double Bulk Pipe devices
-device          ugen            # Generic
-device          uhid            # "Human Interface Devices"
-device          ulpt            # Printer
-device          umass           # Disks/Mass storage - Requires scbus and da
-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		at91rm9200
+device		usb2_core
+device		usb2_controller		# EHCI/OHCI/UHCI/AT91DCI
+device		usb2_storage		# UMASS
+device		usb2_ethernet
+device		usb2_wlan
+device		usb2_serial
+device		usb2_quirk		# USB quirks
+device		usb2_template		# Device Side Mode USB templates
+device		usb2_image		# Scanner support
+device		usb2_sound		# USB sound and MIDI
+
 # 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
-# usb serial
-device          ucom
-device          uark
-device          ubsa
-device          ubser
-device          uftdi
-device          uipaq
-device          uplcom
-device          uvisor
-device          uvscom
+device				miibus
+
 # SCSI peripherals
 device          scbus           # SCSI bus (required for SCSI)
 device          da              # Direct Access (disks)
 device          cd              # CD
 device          pass            # Passthrough device (direct SCSI access)
+
 # Wireless NIC cards
 device          wlan            # 802.11 support
 device          wlan_wep        # 802.11 WEP support

==== //depot/projects/usb/src/sys/conf/files#30 (text+ko) ====

@@ -1317,6 +1317,145 @@
 dev/usb/uslcom.c		optional uslcom
 dev/usb/uvisor.c		optional uvisor
 dev/usb/uvscom.c		optional uvscom
+#
+# USB2 controller drivers
+#
+dev/usb2/controller/at91dci.c		optional usb2_core usb2_controller
+dev/usb2/controller/at91dci_atmelarm.c	optional usb2_core usb2_controller at91rm9200
+dev/usb2/controller/ehci2.c		optional usb2_core usb2_controller
+dev/usb2/controller/ehci2_pci.c		optional usb2_core usb2_controller pci
+dev/usb2/controller/ohci2.c		optional usb2_core usb2_controller
+dev/usb2/controller/ohci2_atmelarm.c	optional usb2_core usb2_controller at91rm9200
+dev/usb2/controller/ohci2_pci.c		optional usb2_core usb2_controller pci
+dev/usb2/controller/uhci2.c		optional usb2_core usb2_controller
+dev/usb2/controller/uhci2_pci.c		optional usb2_core usb2_controller pci
+dev/usb2/controller/usb2_controller.c	optional usb2_core usb2_controller
+dev/usb2/controller/uss820dci.c		optional usb2_core usb2_controller
+dev/usb2/controller/uss820dci_pccard.c	optional usb2_core usb2_controller pccard
+#
+# USB2 storage drivers
+#
+# NOTE: ata-usb conflicts with umass
+# dev/usb2/storage/ata-usb2.c		optional usb2_core usb2_storage
+#
+dev/usb2/storage/umass2.c		optional usb2_core usb2_storage
+dev/usb2/storage/urio2.c		optional usb2_core usb2_storage
+dev/usb2/storage/usb2_storage.c		optional usb2_core usb2_storage
+dev/usb2/storage/ustorage2_fs.c		optional usb2_core usb2_storage
+#
+# USB2 NDIS driver
+#
+dev/usb2/ndis/if_ndis_usb2.c		optional usb2_core usb2_ndis
+dev/usb2/ndis/usb2_ndis.c		optional usb2_core usb2_ndis
+#
+# USB2 core
+#
+dev/usb2/core/usb2_busdma.c		optional usb2_core
+dev/usb2/core/usb2_compat_linux.c	optional usb2_core
+dev/usb2/core/usb2_config_td.c		optional usb2_core
+dev/usb2/core/usb2_core.c		optional usb2_core
+dev/usb2/core/usb2_debug.c		optional usb2_core
+dev/usb2/core/usb2_dev.c		optional usb2_core
+dev/usb2/core/usb2_device.c		optional usb2_core
+dev/usb2/core/usb2_dynamic.c		optional usb2_core
+dev/usb2/core/usb2_error.c		optional usb2_core
+dev/usb2/core/usb2_generic.c		optional usb2_core
+dev/usb2/core/usb2_handle_request.c	optional usb2_core
+dev/usb2/core/usb2_hub.c		optional usb2_core
+dev/usb2/core/usb2_if.m			optional usb2_core
+dev/usb2/core/usb2_lookup.c		optional usb2_core
+dev/usb2/core/usb2_mbuf.c		optional usb2_core
+dev/usb2/core/usb2_msctest.c		optional usb2_core
+dev/usb2/core/usb2_parse.c		optional usb2_core
+dev/usb2/core/usb2_process.c		optional usb2_core
+dev/usb2/core/usb2_request.c		optional usb2_core
+dev/usb2/core/usb2_sw_transfer.c	optional usb2_core
+dev/usb2/core/usb2_transfer.c		optional usb2_core
+dev/usb2/core/usb2_util.c		optional usb2_core
+#
+# USB2 ethernet drivers
+#
+dev/usb2/ethernet/if_aue2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_axe2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_cdce2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_cue2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_kue2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_rue2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/if_udav2.c		optional usb2_core usb2_ethernet
+dev/usb2/ethernet/usb2_ethernet.c	optional usb2_core usb2_ethernet
+#
+# USB2 WLAN drivers
+#
+dev/usb2/wlan/if_rum2.c		optional usb2_core usb2_wlan
+dev/usb2/wlan/if_ural2.c	optional usb2_core usb2_wlan
+dev/usb2/wlan/if_zyd2.c		optional usb2_core usb2_wlan
+dev/usb2/wlan/usb2_wlan.c	optional usb2_core usb2_wlan
+#
+# USB2 serial and parallel port drivers
+#
+dev/usb2/serial/uark2.c		optional usb2_core usb2_serial
+dev/usb2/serial/ubsa2.c		optional usb2_core usb2_serial
+dev/usb2/serial/ubser2.c	optional usb2_core usb2_serial
+dev/usb2/serial/uchcom2.c	optional usb2_core usb2_serial
+dev/usb2/serial/ucycom2.c	optional usb2_core usb2_serial
+dev/usb2/serial/ufoma2.c	optional usb2_core usb2_serial
+dev/usb2/serial/uftdi2.c	optional usb2_core usb2_serial
+dev/usb2/serial/ugensa2.c	optional usb2_core usb2_serial
+dev/usb2/serial/uipaq2.c	optional usb2_core usb2_serial
+dev/usb2/serial/ulpt2.c		optional usb2_core usb2_serial
+dev/usb2/serial/umct2.c		optional usb2_core usb2_serial
+dev/usb2/serial/umodem2.c	optional usb2_core usb2_serial
+dev/usb2/serial/umoscom2.c	optional usb2_core usb2_serial
+dev/usb2/serial/uplcom2.c	optional usb2_core usb2_serial
+dev/usb2/serial/usb2_serial.c	optional usb2_core usb2_serial
+dev/usb2/serial/uvisor2.c	optional usb2_core usb2_serial
+dev/usb2/serial/uvscom2.c	optional usb2_core usb2_serial
+#
+# USB2 bluetooth drivers
+#
+dev/usb2/bluetooth/usb2_bluetooth.c	optional usb2_core usb2_bluetooth
+dev/usb2/bluetooth/ng_ubt2.c		optional usb2_core usb2_bluetooth
+dev/usb2/bluetooth/ubtbcmfw2.c		optional usb2_core usb2_bluetooth
+
+#
+# USB2 misc drivers
+#
+dev/usb2/misc/usb2_misc.c	optional usb2_core usb2_misc
+dev/usb2/misc/ufm2.c		optional usb2_core usb2_misc
+dev/usb2/misc/udbp2.c		optional usb2_core usb2_misc
+#
+# USB2 input drivers
+#
+dev/usb2/input/uhid2.c		optional usb2_core usb2_input
+dev/usb2/input/ukbd2.c		optional usb2_core usb2_input
+dev/usb2/input/ums2.c		optional usb2_core usb2_input
+dev/usb2/input/usb2_hid.c	optional usb2_core usb2_input
+dev/usb2/input/usb2_input.c	optional usb2_core usb2_input
+#
+# USB2 quirks
+#
+dev/usb2/quirk/usb2_quirk.c	optional usb2_core usb2_quirk
+#
+# USB2 templates
+#
+dev/usb2/template/usb2_template.c	optional usb2_core usb2_template
+dev/usb2/template/usb2_template_cdce.c	optional usb2_core usb2_template
+dev/usb2/template/usb2_template_msc.c	optional usb2_core usb2_template
+dev/usb2/template/usb2_template_mtp.c	optional usb2_core usb2_template
+#
+# USB2 image drivers
+#
+dev/usb2/image/usb2_image.c	optional usb2_core usb2_image
+dev/usb2/image/uscanner2.c	optional usb2_core usb2_image
+#
+# USB2 sound and MIDI drivers
+#
+dev/usb2/sound/usb2_sound.c	optional usb2_core usb2_sound
+dev/usb2/sound/uaudio2.c	optional usb2_core usb2_sound
+dev/usb2/sound/uaudio2_pcm.c	optional usb2_core usb2_sound
+#
+# USB2 END
+#
 dev/utopia/idtphy.c		optional utopia
 dev/utopia/suni.c		optional utopia
 dev/utopia/utopia.c		optional utopia

==== //depot/projects/usb/src/sys/modules/Makefile#17 (text+ko) ====

@@ -301,6 +301,7 @@
 	ural \
 	urio \
 	usb \
+	usb2 \
 	uscanner \
 	uslcom \
 	utopia \

More information about the p4-projects mailing list