From owner-p4-projects@FreeBSD.ORG Wed Feb 25 22:53:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDC521065672; Wed, 25 Feb 2009 22:53:30 +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 99FED106566C for ; Wed, 25 Feb 2009 22:53:30 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60FDF8FC0C for ; Wed, 25 Feb 2009 22:53:30 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1PMrU7R049558 for ; Wed, 25 Feb 2009 22:53:30 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1PMrUMt049556 for perforce@freebsd.org; Wed, 25 Feb 2009 22:53:30 GMT (envelope-from zec@icir.org) Date: Wed, 25 Feb 2009 22:53:30 GMT Message-Id: <200902252253.n1PMrUMt049556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158301 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: Wed, 25 Feb 2009 22:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=158301 Change 158301 by zec@zec_tpx32 on 2009/02/25 22:53:23 More USB misintegrations... Affected files ... .. //depot/projects/vimage/src/sys/modules/usb/Makefile#5 edit Differences ... ==== //depot/projects/vimage/src/sys/modules/usb/Makefile#5 (text+ko) ==== @@ -1,22 +1,44 @@ -# $FreeBSD: src/sys/modules/usb/Makefile,v 1.20 2008/10/09 20:00:17 n_hibma Exp $ +# +# $FreeBSD: src/sys/modules/usb/Makefile,v 1.22 2009/02/23 18:32:59 thompsa Exp $ +# +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# -S= ${.CURDIR}/../.. +SUBDIR = usb +#SUBDIR += ubt bluetooth_ng ubtfw +SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci} +SUBDIR += rum ural zyd +SUBDIR += uhid ukbd ums udbp ufm uscanner +SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ + umct umodem umoscom uplcom uslcom uvisor uvscom +SUBDIR += uether aue axe cdce cue kue rue udav +SUBDIR += usfs umass urio +SUBDIR += quirk template -.PATH: $S/dev/usb $S/pci +.if ${MACHINE_ARCH} == "arm" +_at91dci= at91dci +_atmegadci= atmegadci +.endif -KMOD= usb -SRCS= bus_if.h device_if.h usb_if.h usb_if.c \ - opt_usb.h \ - hid.c hid.h usbhid.h \ - uhub.c \ - usb.c usb.h \ - usb_mem.c usb_mem.h \ - usb_port.h \ - usb_quirks.c usb_quirks.h \ - usb_subr.c \ - usbdevs.h usbdevs_data.h \ - usbdi.c usbdi.h usbdivar.h \ - usbdi_util.c usbdi_util.h \ - usb_ethersubr.c usbdevs.h - -.include +.include