From owner-p4-projects@FreeBSD.ORG Sun Feb 1 15:04:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16DA31065670; Sun, 1 Feb 2009 15:04:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA7671065673 for ; Sun, 1 Feb 2009 15:04:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7AAF8FC14 for ; Sun, 1 Feb 2009 15:04:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n11F41PI098646 for ; Sun, 1 Feb 2009 15:04:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n11F41fV098644 for perforce@freebsd.org; Sun, 1 Feb 2009 15:04:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 1 Feb 2009 15:04:01 GMT Message-Id: <200902011504.n11F41fV098644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2009 15:04:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=156995 Change 156995 by hselasky@hselasky_laptop001 on 2009/02/01 15:03:41 Turn around dependencies in config file so that defining any USB device will automatically get the USB device group module built aswell. Suggested by Sam Leffler. Before example: device usb2_ethernet device usb2_ethernet_axe After example: device usb2_ethernet_axe Affected files ... .. //depot/projects/usb/src/sys/conf/files#48 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#48 (text+ko) ==== @@ -1535,28 +1535,33 @@ # # USB2 controller drivers # -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/uss820dci.c optional usb2_core usb2_controller usb2_controller_uss820dci -dev/usb2/controller/uss820dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_uss820dci at91rm9200 -dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller +dev/usb2/controller/at91dci.c optional usb2_core usb2_controller_at91dci +dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller_at91dci at91rm9200 +dev/usb2/controller/musb2_otg.c optional usb2_core usb2_controller_musb +dev/usb2/controller/musb2_otg_atmelarm.c optional usb2_core usb2_controller_musb at91rm9200 +dev/usb2/controller/ehci2.c optional usb2_core usb2_controller_ehci +dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller_ehci pci +dev/usb2/controller/ohci2.c optional usb2_core usb2_controller_ohci +dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller_ohci at91rm9200 +dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller_ohci pci +dev/usb2/controller/uhci2.c optional usb2_core usb2_controller_uhci +dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller_uhci pci +dev/usb2/controller/uss820dci.c optional usb2_core usb2_controller_uss820dci +dev/usb2/controller/uss820dci_atmelarm.c optional usb2_core usb2_controller_uss820dci at91rm9200 +dev/usb2/controller/usb2_controller.c optional usb2_core \ +(usb2_controller | usb2_controller_at91dci | usb2_controller_musb | \ + usb2_controller_ehci | usb2_controller_ohci | usb2_controller_uhci | \ + usb2_controller_uss820dci) # # USB2 storage drivers # -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 usb2_storage_fs +dev/usb2/storage/ata-usb2.c optional usb2_core usb2_storage_ata +dev/usb2/storage/umass2.c optional usb2_core usb2_storage_mass +dev/usb2/storage/urio2.c optional usb2_core usb2_storage_rio +dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage_fs +dev/usb2/storage/usb2_storage.c optional usb2_core \ +(usb2_storage | usb2_storage_ata | usb2_storage_mass | \ + usb2_storage_rio | usb2_storage_fs) # # USB2 NDIS driver # @@ -1591,63 +1596,74 @@ # # USB2 ethernet drivers # -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_dav -dev/usb2/ethernet/usb2_ethernet.c optional usb2_core usb2_ethernet +dev/usb2/ethernet/if_aue2.c optional usb2_core usb2_ethernet_aue +dev/usb2/ethernet/if_axe2.c optional usb2_core usb2_ethernet_axe +dev/usb2/ethernet/if_cdce2.c optional usb2_core usb2_ethernet_cdce +dev/usb2/ethernet/if_cue2.c optional usb2_core usb2_ethernet_cue +dev/usb2/ethernet/if_kue2.c optional usb2_core usb2_ethernet_kue +dev/usb2/ethernet/if_rue2.c optional usb2_core usb2_ethernet_rue +dev/usb2/ethernet/if_udav2.c optional usb2_core usb2_ethernet_dav +dev/usb2/ethernet/usb2_ethernet.c optional usb2_core \ +(usb2_ethernet | usb2_ethernet_aue | usb2_ethernet_axe | \ + usb2_ethernet_cdce | usb2_ethernet_cue | usb2_ethernet_kue | \ + usb2_ethernet_rue | usb2_ethernet_dav) # # USB2 WLAN drivers # -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 +dev/usb2/wlan/if_rum2.c optional usb2_core usb2_wlan_rum +dev/usb2/wlan/if_ural2.c optional usb2_core usb2_wlan_ral +dev/usb2/wlan/if_zyd2.c optional usb2_core usb2_wlan_zyd +dev/usb2/wlan/usb2_wlan.c optional usb2_core \ +(usb2_wlan | usb2_wlan_rum | usb2_wlan_ral | usb2_wlan_zyd) # # USB2 serial and parallel port drivers # -dev/usb2/serial/u3g2.c optional usb2_core usb2_serial usb2_serial_3g -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 usb2_serial_visor -dev/usb2/serial/uvscom2.c optional usb2_core usb2_serial usb2_serial_vscom -dev/usb2/serial/u3g2.c optional usb2_core usb2_serial usb2_serial_3g +dev/usb2/serial/u3g2.c optional usb2_core usb2_serial_3g +dev/usb2/serial/uark2.c optional usb2_core usb2_serial_ark +dev/usb2/serial/ubsa2.c optional usb2_core usb2_serial_bsa +dev/usb2/serial/ubser2.c optional usb2_core usb2_serial_bser +dev/usb2/serial/uchcom2.c optional usb2_core usb2_serial_chcom +dev/usb2/serial/ucycom2.c optional usb2_core usb2_serial_cycom +dev/usb2/serial/ufoma2.c optional usb2_core usb2_serial_foma +dev/usb2/serial/uftdi2.c optional usb2_core usb2_serial_ftdi +dev/usb2/serial/ugensa2.c optional usb2_core usb2_serial_gensa +dev/usb2/serial/uipaq2.c optional usb2_core usb2_serial_ipaq +dev/usb2/serial/ulpt2.c optional usb2_core usb2_serial_lpt +dev/usb2/serial/umct2.c optional usb2_core usb2_serial_mct +dev/usb2/serial/umodem2.c optional usb2_core usb2_serial_modem +dev/usb2/serial/umoscom2.c optional usb2_core usb2_serial_moscom +dev/usb2/serial/uplcom2.c optional usb2_core usb2_serial_plcom +dev/usb2/serial/uvisor2.c optional usb2_core usb2_serial_visor +dev/usb2/serial/uvscom2.c optional usb2_core usb2_serial_vscom +dev/usb2/serial/usb2_serial.c optional usb2_core \ +(usb2_serial | usb2_serial_3g | usb2_serial_ark | usb2_serial_bsa | \ + usb2_serial_bser | usb2_serial_chcom | usb2_serial_cycom | \ + usb2_serial_foma | usb2_serial_ftdi | usb2_serial_gensa | \ + usb2_serial_ipaq | usb2_serial_lpt | usb2_serial_mct | \ + usb2_serial_modem | usb2_serial_moscom | usb2_serial_plcom | \ + usb2_serial_visor | 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 usb2_bluetooth_ng -dev/usb2/bluetooth/ubtbcmfw2.c optional usb2_core usb2_bluetooth usb2_bluetooth_fw - +dev/usb2/bluetooth/ng_ubt2.c optional usb2_core usb2_bluetooth_ng +dev/usb2/bluetooth/ubtbcmfw2.c optional usb2_core usb2_bluetooth_fw +dev/usb2/bluetooth/usb2_bluetooth.c optional usb2_core \ +(usb2_bluetooth | usb2_bluetooth_ng | 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 usb2_misc_fm -dev/usb2/misc/udbp2.c optional usb2_core usb2_misc usb2_misc_dbp +dev/usb2/misc/ufm2.c optional usb2_core usb2_misc_fm +dev/usb2/misc/udbp2.c optional usb2_core usb2_misc_dbp +dev/usb2/misc/usb2_misc.c optional usb2_core \ +(usb2_misc | usb2_misc_fm | usb2_misc_dbp) # # USB2 input drivers # -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_ms -dev/usb2/input/usb2_input.c optional usb2_core usb2_input +dev/usb2/input/uhid2.c optional usb2_core usb2_input_hid +dev/usb2/input/ukbd2.c optional usb2_core usb2_input_kbd +dev/usb2/input/ums2.c optional usb2_core usb2_input_ms +dev/usb2/input/usb2_input.c optional usb2_core \ +(usb2_input | usb2_input_hid | usb2_input_kbd | usb2_input_ms) # # USB2 quirks # @@ -1662,8 +1678,9 @@ # # 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_scanner +dev/usb2/image/uscanner2.c optional usb2_core usb2_scanner +dev/usb2/image/usb2_image.c optional usb2_core \ +(usb2_image | usb2_scanner) # # USB2 sound and MIDI drivers #