From owner-svn-src-all@FreeBSD.ORG Mon Mar 5 06:46:36 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78A45106564A; Mon, 5 Mar 2012 06:46:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 58F688FC0C; Mon, 5 Mar 2012 06:46:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q256kaHN071331; Mon, 5 Mar 2012 06:46:36 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q256kajW071328; Mon, 5 Mar 2012 06:46:36 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201203050646.q256kajW071328@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 5 Mar 2012 06:46:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232540 - in head/sys/modules/usb: . dwc_otg X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2012 06:46:36 -0000 Author: hselasky Date: Mon Mar 5 06:46:35 2012 New Revision: 232540 URL: http://svn.freebsd.org/changeset/base/232540 Log: Add DWC OTG module to ARM builds. MFC after: 1 week Added: head/sys/modules/usb/dwc_otg/ head/sys/modules/usb/dwc_otg/Makefile (contents, props changed) Modified: head/sys/modules/usb/Makefile Modified: head/sys/modules/usb/Makefile ============================================================================== --- head/sys/modules/usb/Makefile Mon Mar 5 06:41:44 2012 (r232539) +++ head/sys/modules/usb/Makefile Mon Mar 5 06:46:35 2012 (r232540) @@ -31,7 +31,7 @@ # MK_SOURCELESS_UCODE option (see below). SUBDIR = usb -SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci} +SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} ${_atmegadci} ${_avr32dci} SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw} SUBDIR += atp uhid ukbd ums udbp ufm uep SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ @@ -54,6 +54,9 @@ _urtw= urtw .if ${MACHINE_CPUARCH} == "arm" _at91dci= at91dci _atmegadci= atmegadci +_dwc_otg= dwc_otg +_musb= musb +_uss820dci= uss820dci .endif .if ${MACHINE_CPUARCH} == "i386" Added: head/sys/modules/usb/dwc_otg/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/usb/dwc_otg/Makefile Mon Mar 5 06:46:35 2012 (r232540) @@ -0,0 +1,42 @@ +# +# $FreeBSD$ +# +# Copyright (c) 2012 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}/../../.. + +.PATH: $S/dev/usb/controller + +KMOD= dwc_otg +SRCS= bus_if.h device_if.h usb_if.h \ + opt_bus.h opt_usb.h \ + dwc_otg.c \ + pci_if.h + +.if defined(HAS_ATMELARM) +SRCS+= dwc_otg_atmelarm.c +.endif + +.include