Date: Sat, 25 Oct 2008 17:22:38 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 151904 for review Message-ID: <200810251722.m9PHMc26093487@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151904 Change 151904 by hselasky@hselasky_laptop001 on 2008/10/25 17:22:02 Fine grain USB kernel options. Affected files ... .. //depot/projects/usb/src/sys/arm/conf/KB920X#14 edit .. //depot/projects/usb/src/sys/conf/files#37 edit Differences ... ==== //depot/projects/usb/src/sys/arm/conf/KB920X#14 (text) ==== @@ -99,14 +99,21 @@ # USB support device at91rm9200 device usb2_core -device usb2_controller # EHCI/OHCI/UHCI/AT91DCI +device usb2_controller +device usb2_controller_at91dci +device usb2_controller_ohci device usb2_storage # USB mass storage support +device usb2_storage_mass +device usb2_storage_fs device usb2_ethernet # USB ethernet support +device usb2_ethernet_cdce device usb2_wlan # USB wireless LAN support device usb2_serial # USB serial support +device usb2_serial_modem device usb2_quirk # USB quirks device usb2_template # Device Side Mode USB templates -device usb2_image # USB Scanner support +device usb2_image # USB Image support +device usb2_scanner # USB Ethernet, requires miibus device miibus ==== //depot/projects/usb/src/sys/conf/files#37 (text+ko) ==== @@ -1337,26 +1337,26 @@ # # 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/at91dci.c optional usb2_core usb2_controller usb2_controller_at91dci +dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_at91dci at91rm9200 +dev/usb2/controller/musb2_otg.c optional usb2_core usb2_controller usb2_controller_musb +dev/usb2/controller/musb2_otg_atmelarm.c optional usb2_core usb2_controller usb2_controller_musb at91rm9200 +dev/usb2/controller/ehci2.c optional usb2_core usb2_controller usb2_controller_ehci +dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller usb2_controller_ehci pci +dev/usb2/controller/ohci2.c optional usb2_core usb2_controller usb2_controller_ohci +dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller usb2_controller_ohci at91rm9200 +dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller usb2_controller_ohci pci +dev/usb2/controller/uhci2.c optional usb2_core usb2_controller usb2_controller_uhci +dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller usb2_controller_uhci pci dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller # # 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/ata-usb2.c optional usb2_core usb2_storage usb2_storage_ata +dev/usb2/storage/umass2.c optional usb2_core usb2_storage usb2_storage_mass +dev/usb2/storage/urio2.c optional usb2_core usb2_storage usb2_storage_rio dev/usb2/storage/usb2_storage.c optional usb2_core usb2_storage -dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage +dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage usb2_storage_fs # # USB2 NDIS driver # @@ -1391,60 +1391,60 @@ # # 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/if_aue2.c optional usb2_core usb2_ethernet usb2_ethernet_aue +dev/usb2/ethernet/if_axe2.c optional usb2_core usb2_ethernet usb2_ethernet_axe +dev/usb2/ethernet/if_cdce2.c optional usb2_core usb2_ethernet usb2_ethernet_cdce +dev/usb2/ethernet/if_cue2.c optional usb2_core usb2_ethernet usb2_ethernet_cue +dev/usb2/ethernet/if_kue2.c optional usb2_core usb2_ethernet usb2_ethernet_kue +dev/usb2/ethernet/if_rue2.c optional usb2_core usb2_ethernet usb2_ethernet_rue +dev/usb2/ethernet/if_udav2.c optional usb2_core usb2_ethernet usb2_ethernet_udav 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/if_rum2.c optional usb2_core usb2_wlan usb2_wlan_rum +dev/usb2/wlan/if_ural2.c optional usb2_core usb2_wlan usb2_wlan_ral +dev/usb2/wlan/if_zyd2.c optional usb2_core usb2_wlan usb2_wlan_zyd 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/uark2.c optional usb2_core usb2_serial usb2_serial_ark +dev/usb2/serial/ubsa2.c optional usb2_core usb2_serial usb2_serial_bsa +dev/usb2/serial/ubser2.c optional usb2_core usb2_serial usb2_serial_bser +dev/usb2/serial/uchcom2.c optional usb2_core usb2_serial usb2_serial_chcom +dev/usb2/serial/ucycom2.c optional usb2_core usb2_serial usb2_serial_cycom +dev/usb2/serial/ufoma2.c optional usb2_core usb2_serial usb2_serial_foma +dev/usb2/serial/uftdi2.c optional usb2_core usb2_serial usb2_serial_ftdi +dev/usb2/serial/ugensa2.c optional usb2_core usb2_serial usb2_serial_gensa +dev/usb2/serial/uipaq2.c optional usb2_core usb2_serial usb2_serial_ipaq +dev/usb2/serial/ulpt2.c optional usb2_core usb2_serial usb2_serial_lpt +dev/usb2/serial/umct2.c optional usb2_core usb2_serial usb2_serial_mct +dev/usb2/serial/umodem2.c optional usb2_core usb2_serial usb2_serial_modem +dev/usb2/serial/umoscom2.c optional usb2_core usb2_serial usb2_serial_moscom +dev/usb2/serial/uplcom2.c optional usb2_core usb2_serial usb2_serial_plcom 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 +dev/usb2/serial/uvisor2.c optional usb2_core usb2_serial usb2_serial_visor +dev/usb2/serial/uvscom2.c optional usb2_core usb2_serial usb2_serial_vscom # # 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 +dev/usb2/bluetooth/ng_ubt2.c optional usb2_core usb2_bluetooth usb2_bluetooth_ng +dev/usb2/bluetooth/ubtbcmfw2.c optional usb2_core usb2_bluetooth usb2_bluetooth_fw # # 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 +dev/usb2/misc/ufm2.c optional usb2_core usb2_misc usb2_misc_fm +dev/usb2/misc/udbp2.c optional usb2_core usb2_misc usb2_misc_dbp # # 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/uhid2.c optional usb2_core usb2_input usb2_input_hid +dev/usb2/input/ukbd2.c optional usb2_core usb2_input usb2_input_kbd +dev/usb2/input/ums2.c optional usb2_core usb2_input usb2_input_ums dev/usb2/input/usb2_input.c optional usb2_core usb2_input # # USB2 quirks @@ -1461,7 +1461,7 @@ # USB2 image drivers # dev/usb2/image/usb2_image.c optional usb2_core usb2_image -dev/usb2/image/uscanner2.c optional usb2_core usb2_image +dev/usb2/image/uscanner2.c optional usb2_core usb2_image usb2_scanner # # USB2 sound and MIDI drivers #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810251722.m9PHMc26093487>