head	1.47;
access;
symbols
	RELENG_8_4:1.45.0.2
	RELENG_9_1_0_RELEASE:1.40.2.3.2.2
	RELENG_9_1:1.40.2.3.0.2
	RELENG_9_1_BP:1.40.2.3
	RELENG_8_3_0_RELEASE:1.27.2.9.2.1
	RELENG_8_3:1.27.2.9.0.2
	RELENG_8_3_BP:1.27.2.9
	RELENG_9_0_0_RELEASE:1.40.2.1.2.1
	RELENG_9_0:1.40.2.1.0.2
	RELENG_9_0_BP:1.40.2.1
	RELENG_9:1.40.0.2
	RELENG_9_BP:1.40
	RELENG_7_4_0_RELEASE:1.18.24.1
	RELENG_8_2_0_RELEASE:1.27.2.6.2.1
	RELENG_7_4:1.18.0.24
	RELENG_7_4_BP:1.18
	RELENG_8_2:1.27.2.6.0.2
	RELENG_8_2_BP:1.27.2.6
	RELENG_8_1_0_RELEASE:1.27.2.4.2.1
	RELENG_8_1:1.27.2.4.0.2
	RELENG_8_1_BP:1.27.2.4
	RELENG_7_3_0_RELEASE:1.18.22.1
	RELENG_7_3:1.18.0.22
	RELENG_7_3_BP:1.18
	RELENG_8_0_0_RELEASE:1.27.2.1.2.1
	RELENG_8_0:1.27.2.1.0.2
	RELENG_8_0_BP:1.27.2.1
	RELENG_8:1.27.0.2
	RELENG_8_BP:1.27
	RELENG_7_2_0_RELEASE:1.18.20.1
	RELENG_7_2:1.18.0.20
	RELENG_7_2_BP:1.18
	RELENG_7_1_0_RELEASE:1.18.18.1
	RELENG_6_4_0_RELEASE:1.18.16.1
	RELENG_7_1:1.18.0.18
	RELENG_7_1_BP:1.18
	RELENG_6_4:1.18.0.16
	RELENG_6_4_BP:1.18
	RELENG_7_0_0_RELEASE:1.18
	RELENG_6_3_0_RELEASE:1.18
	RELENG_7_0:1.18.0.14
	RELENG_7_0_BP:1.18
	RELENG_6_3:1.18.0.12
	RELENG_6_3_BP:1.18
	RELENG_7:1.18.0.10
	RELENG_7_BP:1.18
	RELENG_6_2_0_RELEASE:1.18
	RELENG_6_2:1.18.0.8
	RELENG_6_2_BP:1.18
	RELENG_5_5_0_RELEASE:1.15
	RELENG_5_5:1.15.0.8
	RELENG_5_5_BP:1.15
	RELENG_6_1_0_RELEASE:1.18
	RELENG_6_1:1.18.0.6
	RELENG_6_1_BP:1.18
	RELENG_6_0_0_RELEASE:1.18
	RELENG_6_0:1.18.0.4
	RELENG_6_0_BP:1.18
	RELENG_6:1.18.0.2
	RELENG_6_BP:1.18
	RELENG_5_4_0_RELEASE:1.15
	RELENG_5_4:1.15.0.6
	RELENG_5_4_BP:1.15
	RELENG_4_11_0_RELEASE:1.7.2.1
	RELENG_4_11:1.7.2.1.0.4
	RELENG_4_11_BP:1.7.2.1
	RELENG_5_3_0_RELEASE:1.15
	RELENG_5_3:1.15.0.4
	RELENG_5_3_BP:1.15
	RELENG_5:1.15.0.2
	RELENG_5_BP:1.15
	RELENG_4_10_0_RELEASE:1.7.2.1
	RELENG_4_10:1.7.2.1.0.2
	RELENG_4_10_BP:1.7.2.1
	RELENG_5_2_1_RELEASE:1.13
	RELENG_5_2_0_RELEASE:1.13
	RELENG_5_2:1.13.0.2
	RELENG_5_2_BP:1.13
	RELENG_4_9_0_RELEASE:1.7
	RELENG_4_9:1.7.0.16
	RELENG_4_9_BP:1.7
	RELENG_5_1_0_RELEASE:1.12
	RELENG_5_1:1.12.0.2
	RELENG_5_1_BP:1.12
	RELENG_4_8_0_RELEASE:1.7
	RELENG_4_8:1.7.0.14
	RELENG_4_8_BP:1.7
	RELENG_5_0_0_RELEASE:1.11
	RELENG_5_0:1.11.0.2
	RELENG_5_0_BP:1.11
	RELENG_4_7_0_RELEASE:1.7
	RELENG_4_7:1.7.0.12
	RELENG_4_7_BP:1.7
	RELENG_4_6_2_RELEASE:1.7
	RELENG_4_6_1_RELEASE:1.7
	RELENG_4_6_0_RELEASE:1.7
	RELENG_4_6:1.7.0.10
	RELENG_4_6_BP:1.7
	RELENG_4_5_0_RELEASE:1.7
	RELENG_4_5:1.7.0.8
	RELENG_4_5_BP:1.7
	RELENG_4_4_0_RELEASE:1.7
	RELENG_4_4:1.7.0.6
	RELENG_4_4_BP:1.7
	KSE_MILESTONE_2:1.10
	KSE_PRE_MILESTONE_2:1.10
	RELENG_4_3_0_RELEASE:1.7
	RELENG_4_3:1.7.0.4
	RELENG_4_3_BP:1.7
	RELENG_4_2_0_RELEASE:1.7
	RELENG_4_1_1_RELEASE:1.7
	PRE_SMPNG:1.9
	RELENG_4_1_0_RELEASE:1.7
	RELENG_4_0_0_RELEASE:1.7
	RELENG_4:1.7.0.2
	RELENG_4_BP:1.7;
locks; strict;
comment	@# @;


1.47
date	2013.07.17.00.26.21;	author svnexp;	state Exp;
branches;
next	1.46;

1.46
date	2013.06.09.00.34.39;	author svnexp;	state Exp;
branches;
next	1.45;

1.45
date	2013.02.02.00.30.54;	author svnexp;	state Exp;
branches
	1.45.2.1;
next	1.44;

1.44
date	2012.11.17.01.53.01;	author svnexp;	state Exp;
branches;
next	1.43;

1.43
date	2012.03.05.06.46.35;	author hselasky;	state Exp;
branches;
next	1.42;

1.42
date	2012.02.04.00.54.43;	author rmh;	state Exp;
branches;
next	1.41;

1.41
date	2011.12.14.00.28.54;	author hselasky;	state Exp;
branches;
next	1.40;

1.40
date	2011.07.08.10.58.56;	author hselasky;	state Exp;
branches
	1.40.2.1;
next	1.39;

1.39
date	2011.06.04.20.40.24;	author hselasky;	state Exp;
branches;
next	1.38;

1.38
date	2011.06.01.17.58.27;	author hselasky;	state Exp;
branches;
next	1.37;

1.37
date	2011.02.26.17.22.11;	author glebius;	state Exp;
branches;
next	1.36;

1.36
date	2011.02.16.08.33.30;	author hselasky;	state Exp;
branches;
next	1.35;

1.35
date	2010.10.13.21.36.42;	author hselasky;	state Exp;
branches;
next	1.34;

1.34
date	2010.10.04.23.22.03;	author hselasky;	state Exp;
branches;
next	1.33;

1.33
date	2010.08.23.06.13.29;	author imp;	state Exp;
branches;
next	1.32;

1.32
date	2010.01.28.22.24.54;	author thompsa;	state Exp;
branches;
next	1.31;

1.31
date	2010.01.13.03.16.31;	author thompsa;	state Exp;
branches;
next	1.30;

1.30
date	2009.11.09.15.59.09;	author rpaulo;	state Exp;
branches;
next	1.29;

1.29
date	2009.10.19.21.43.59;	author thompsa;	state Exp;
branches;
next	1.28;

1.28
date	2009.09.28.07.32.11;	author thompsa;	state Exp;
branches;
next	1.27;

1.27
date	2009.06.01.02.37.06;	author weongyo;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2009.05.27.16.43.40;	author thompsa;	state Exp;
branches;
next	1.25;

1.25
date	2009.05.12.02.08.56;	author weongyo;	state Exp;
branches;
next	1.24;

1.24
date	2009.04.06.12.43.40;	author weongyo;	state Exp;
branches;
next	1.23;

1.23
date	2009.03.19.20.33.26;	author thompsa;	state Exp;
branches;
next	1.22;

1.22
date	2009.02.23.18.32.59;	author thompsa;	state Exp;
branches;
next	1.21;

1.21
date	2009.02.23.18.16.17;	author thompsa;	state dead;
branches;
next	1.20;

1.20
date	2008.10.09.20.00.17;	author n_hibma;	state Exp;
branches;
next	1.19;

1.19
date	2008.08.30.16.24.01;	author imp;	state Exp;
branches;
next	1.18;

1.18
date	2005.06.04.10.58.39;	author schweikh;	state Exp;
branches
	1.18.2.1
	1.18.10.1
	1.18.16.1
	1.18.18.1
	1.18.20.1
	1.18.22.1
	1.18.24.1;
next	1.17;

1.17
date	2004.12.31.16.05.07;	author jhb;	state Exp;
branches;
next	1.16;

1.16
date	2004.12.29.08.49.51;	author imp;	state Exp;
branches;
next	1.15;

1.15
date	2004.07.12.21.59.06;	author imp;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	2004.06.27.12.33.19;	author imp;	state Exp;
branches;
next	1.13;

1.13
date	2003.07.15.22.42.37;	author jmg;	state Exp;
branches;
next	1.12;

1.12
date	2003.04.14.14.04.08;	author ticso;	state Exp;
branches;
next	1.11;

1.11
date	2002.01.11.15.49.01;	author ru;	state Exp;
branches;
next	1.10;

1.10
date	2001.01.06.14.00.38;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2000.05.27.01.14.29;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	2000.05.04.12.08.45;	author peter;	state Exp;
branches;
next	1.7;

1.7
date	2000.01.28.11.26.40;	author bde;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2000.01.23.13.56.58;	author n_hibma;	state Exp;
branches;
next	1.5;

1.5
date	2000.01.10.23.12.48;	author wpaul;	state Exp;
branches;
next	1.4;

1.4
date	2000.01.03.12.01.27;	author marcel;	state Exp;
branches;
next	1.3;

1.3
date	99.11.28.18.53.38;	author bde;	state Exp;
branches;
next	1.2;

1.2
date	99.11.22.06.36.25;	author green;	state Exp;
branches;
next	1.1;

1.1
date	99.11.22.03.46.33;	author n_hibma;	state Exp;
branches;
next	;

1.45.2.1
date	2013.02.02.00.30.54;	author svnexp;	state dead;
branches;
next	1.45.2.2;

1.45.2.2
date	2013.03.28.13.05.24;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.40.2.1.2.1;
next	1.40.2.2;

1.40.2.2
date	2011.12.31.14.22.02;	author hselasky;	state Exp;
branches;
next	1.40.2.3;

1.40.2.3
date	2012.02.19.07.44.38;	author rmh;	state Exp;
branches
	1.40.2.3.2.1;
next	1.40.2.4;

1.40.2.4
date	2012.11.17.11.37.19;	author svnexp;	state Exp;
branches;
next	1.40.2.5;

1.40.2.5
date	2014.02.05.09.01.46;	author svnexp;	state Exp;
branches;
next	1.40.2.6;

1.40.2.6
date	2014.02.17.23.02.35;	author svnexp;	state Exp;
branches;
next	1.40.2.7;

1.40.2.7
date	2014.02.23.14.02.36;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.40.2.1.2.2;

1.40.2.1.2.2
date	2012.11.17.08.37.15;	author svnexp;	state Exp;
branches;
next	;

1.40.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.40.2.3.2.2;

1.40.2.3.2.2
date	2012.11.17.08.48.06;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.27.2.1.2.1;
next	1.27.2.2;

1.27.2.2
date	2009.12.09.21.47.42;	author thompsa;	state Exp;
branches;
next	1.27.2.3;

1.27.2.3
date	2010.01.17.18.37.36;	author thompsa;	state Exp;
branches;
next	1.27.2.4;

1.27.2.4
date	2010.04.06.23.14.43;	author thompsa;	state Exp;
branches
	1.27.2.4.2.1;
next	1.27.2.5;

1.27.2.5
date	2010.11.27.19.35.12;	author thompsa;	state Exp;
branches;
next	1.27.2.6;

1.27.2.6
date	2010.11.27.19.40.51;	author thompsa;	state Exp;
branches
	1.27.2.6.2.1;
next	1.27.2.7;

1.27.2.7
date	2011.03.05.08.56.42;	author glebius;	state Exp;
branches;
next	1.27.2.8;

1.27.2.8
date	2011.06.06.20.58.15;	author hselasky;	state Exp;
branches;
next	1.27.2.9;

1.27.2.9
date	2012.01.03.09.15.54;	author hselasky;	state Exp;
branches
	1.27.2.9.2.1;
next	1.27.2.10;

1.27.2.10
date	2012.11.17.10.36.58;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.27.2.4.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.27.2.6.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.27.2.9.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.27.2.9.2.2;

1.27.2.9.2.2
date	2012.11.17.08.25.34;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1
date	2012.11.17.07.44.28;	author svnexp;	state Exp;
branches;
next	;

1.18.10.1
date	2012.11.17.08.06.59;	author svnexp;	state Exp;
branches;
next	;

1.18.16.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.18.18.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.18.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.18.22.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.18.24.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.18.24.2;

1.18.24.2
date	2012.11.17.08.17.28;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1
date	2006.07.09.19.49.28;	author markm;	state Exp;
branches;
next	;

1.7.2.1
date	2004.03.01.00.07.26;	author julian;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.07.26.37;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.47
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/253378
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#
# $FreeBSD: head/sys/modules/usb/Makefile 253378 2013-07-16 06:43:37Z rpaulo $
#
# 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.
#

.include <bsd.own.mk>

# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).

SUBDIR = usb
SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} ${_atmegadci} ${_avr32dci}
SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw} urtwn urtwnfw
SUBDIR += atp uhid ukbd ums udbp ufm uep
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
SUBDIR += uether aue axe cdce cue ${_kue} mos rue smsc udav uhso ipheth
SUBDIR += usfs umass urio
SUBDIR += quirk template

.if ${MK_SOURCELESS_UCODE} != "no"
_rum=		rum
_uath=		uath
_zyd=		zyd
_kue=		kue
.endif

.if ${MACHINE_CPUARCH} == "amd64"
_urtw=		urtw
.endif

.if ${MACHINE_CPUARCH} == "arm"
_at91dci=	at91dci
_atmegadci=	atmegadci
_dwc_otg=	dwc_otg
_musb=		musb
_uss820dci=	uss820dci
.endif

.if ${MACHINE_CPUARCH} == "i386"
_urtw=		urtw
.endif

.if ${MACHINE_CPUARCH} == "avr32"
_avr32dci=	avr32dci
.endif

.include <bsd.subdir.mk>
@


1.46
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251538
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: head/sys/modules/usb/Makefile 251538 2013-06-08 16:02:31Z rpaulo $
d35 1
a35 1
SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw} urtwn
@


1.45
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246195
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: head/sys/modules/usb/Makefile 246195 2013-02-01 07:19:19Z hselasky $
d35 1
a35 1
SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw}
@


1.45.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:24 +0000
@
text
@d1 70
@


1.45.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 55
#
# $FreeBSD: releng/8.4/sys/modules/usb/Makefile 229370 2012-01-03 09:15:54Z hselasky $
#
# 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.
#

SUBDIR = usb
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
SUBDIR += rum run uath upgt ural zyd ${_urtw}
SUBDIR += atp uhid ukbd ums udbp ufm uep
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth
SUBDIR += usfs umass urio
SUBDIR += quirk template

.if ${MACHINE_ARCH} == "amd64"
_urtw=		urtw
.endif

.if ${MACHINE_ARCH} == "arm"
_at91dci=	at91dci
_atmegadci=	atmegadci
.endif

.if ${MACHINE_ARCH} == "i386"
_urtw=		urtw
.endif

.if ${MACHINE_ARCH} == "avr32"
_avr32dci=	avr32dci
.endif

.include <bsd.subdir.mk>
@


1.44
log
@Switching exporter and resync
@
text
@d2 1
a2 1
# $FreeBSD: head/sys/modules/usb/Makefile 232540 2012-03-05 06:46:35Z hselasky $
d39 1
a39 1
SUBDIR += uether aue axe cdce cue ${_kue} mos rue udav uhso ipheth
@


1.43
log
@SVN rev 232540 on 2012-03-05 06:46:35Z by hselasky

Add DWC OTG module to ARM builds.

MFC after:	1 week
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.42
log
@SVN rev 230972 on 2012-02-04 00:54:43Z by rmh

Add MK_SOURCELESS build option. Setting MK_SOURCELESS to "no" will disable
kernel modules that include binary-only code.

More fine-grained control is provided via MK_SOURCELESS_HOST (for native code
that runs on host CPU) and MK_SOURCELESS_UCODE (for microcode).

Reviewed by:	julian, delphij, freebsd-arch
Approved by:	kib (mentor)
MFC after:	2 weeks
@
text
@d34 1
a34 1
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
d57 3
@


1.41
log
@SVN rev 228483 on 2011-12-14 00:28:54Z by hselasky

Implement better support for USB controller suspend and resume.

This patch should remove the need for kldunload of USB
controller drivers at suspend and kldload of USB controller
drivers at resume.

This patch also fixes some build issues in avr32dci.c

MFC after:	2 weeks
@
text
@d28 5
d35 1
a35 1
SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
d39 1
a39 1
SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
d43 7
@


1.40
log
@SVN rev 223864 on 2011-07-08 10:58:56Z by hselasky

Add new USB 3G driver.

Submitted by:	PseudoCylon <moonlightakkiy@@yahoo.ca>
MFC after:	14 days
@
text
@d29 1
a29 1
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
d51 4
@


1.40.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.40.2.2
log
@SVN rev 229096 on 2011-12-31 14:22:02Z by hselasky

MFC r229086, r228483 and r228640:
Implement better support for USB controller suspend and resume.
Fix some build issues in avr32dci.c
@
text
@d29 1
a29 1
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
a50 4
.if ${MACHINE_CPUARCH} == "avr32"
_avr32dci=	avr32dci
.endif

@


1.40.2.3
log
@SVN rev 231905 on 2012-02-19 07:44:38Z by rmh

MFC r230972,r230980,r231559,r231565: Add MK_SOURCELESS build option, and
associated fixes.

Approved by:	kib (mentor)
@
text
@a27 5
.include <bsd.own.mk>

# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).

d30 1
a30 1
SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw}
d34 1
a34 1
SUBDIR += uether aue axe cdce cue ${_kue} mos rue udav uhso ipheth
a37 7
.if ${MK_SOURCELESS_UCODE} != "no"
_rum=		rum
_uath=		uath
_zyd=		zyd
_kue=		kue
.endif

@


1.40.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/sys/modules/usb/Makefile 231905 2012-02-19 07:44:38Z rmh $
@


1.40.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/261510
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/sys/modules/usb/Makefile 261510 2014-02-05 08:42:59Z hselasky $
d36 1
a36 1
SUBDIR += atp uhid ukbd ums udbp ufm uep wsp
@


1.40.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/262138
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/sys/modules/usb/Makefile 262138 2014-02-17 22:43:07Z markj $
d39 1
a39 1
SUBDIR += uether aue axe axge cdce cue ${_kue} mos rue udav uhso ipheth
@


1.40.2.7
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/262362
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/sys/modules/usb/Makefile 262362 2014-02-23 13:20:08Z hselasky $
a39 1
SUBDIR += urndis
@


1.40.2.3.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.40.2.3.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/sys/modules/usb/Makefile 231905 2012-02-19 07:44:38Z rmh $
@


1.40.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.40.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/sys/modules/usb/Makefile 223864 2011-07-08 10:58:56Z hselasky $
@


1.39
log
@SVN rev 222696 on 2011-06-04 20:40:24Z by hselasky

Rename recently added USB serial driver.

Suggested by:	YongHyeon PYUN
MFC after:	7 days
@
text
@d30 1
a30 1
SUBDIR += rum run uath upgt ural zyd ${_urtw}
@


1.38
log
@SVN rev 222578 on 2011-06-01 17:58:27Z by hselasky

Add support for new USB serial driver.

Submitted by:	Lev Serebryakov, lev @@
MFC after:	14 days
@
text
@d33 1
a33 1
	  umct umcs7840 umodem umoscom uplcom uslcom uvisor uvscom
@


1.37
log
@SVN rev 219059 on 2011-02-26 17:22:11Z by glebius

Connect uep.ko to build

PR:		kern/155044
Submitted by:	Carl <k0802647 telus.net>
MFC after:	1 week
@
text
@d33 1
a33 1
	  umct umodem umoscom uplcom uslcom uvisor uvscom
@


1.36
log
@SVN rev 218729 on 2011-02-16 08:33:30Z by hselasky

Add support for new USB to ethernet controller:
Moschip MCS7730/MCS7830

Submitted by:	Rick van der Zwet <info@@rickvanderzwet.nl>
Approved by:	thompsa (mentor)
@
text
@d31 1
a31 1
SUBDIR += atp uhid ukbd ums udbp ufm
@


1.35
log
@SVN rev 213805 on 2010-10-13 21:36:42Z by hselasky

USB Network:
- Add new driver for iPhone tethering
- Supports the iPhone 3G/3GS/4G ethernet protocol

Approved by:    thompsa (mentor)
@
text
@d34 1
a34 1
SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth
@


1.34
log
@SVN rev 213437 on 2010-10-04 23:22:03Z by hselasky

Link the XHCI (USB 3.0 hardware driver) into the default kernel build.

Approved by:    thompsa (mentor)
@
text
@d34 1
a34 1
SUBDIR += uether aue axe cdce cue kue rue udav uhso
@


1.33
log
@SVN rev 211690 on 2010-08-23 06:13:29Z by imp

MFtbemd:

Use MACHINE_CPUARCH in preference to MACHINE_ARCH.  The former is the
source code location of the machine, the latter the binary output.  In
general, we want to use MACHINE_CPUARCH instead of MACHINE_ARCH unless
we're tesitng for a specific target.  The isn't even moot for
i386/amd64 where there's momemntum towards a MACHINE_CPUARCH == x86,
although a specific cleanup for that likely would be needed...
@
text
@d29 1
a29 1
SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci}
@


1.32
log
@SVN rev 203134 on 2010-01-28 22:24:54Z by thompsa

Add run(4), a driver for Ralink RT2700U/RT2800U/RT3000U USB 802.11agn devices.

This driver was written for OpenBSD by Damien Bergamini and ported over by
Akinori Furukoshi.
@
text
@d38 1
a38 1
.if ${MACHINE_ARCH} == "amd64"
d42 1
a42 1
.if ${MACHINE_ARCH} == "arm"
d47 1
a47 1
.if ${MACHINE_ARCH} == "i386"
@


1.31
log
@SVN rev 202181 on 2010-01-13 03:16:31Z by thompsa

Add a driver by Fredrik Lindberg for Option HSDPA USB devices. These differ
from standard 3G wireless units by supplying a raw IP/IPv6 endpoint rather than
using PPP over serial. uhsoctl(1) is used to initiate and close the WAN
connection.

Obtained from:	Fredrik Lindberg <fli@@shapeshifter.se>
@
text
@d30 1
a30 1
SUBDIR += rum uath upgt ural zyd ${_urtw}
@


1.30
log
@SVN rev 199086 on 2009-11-09 15:59:09Z by rpaulo

Driver for the Apple Touchpad present on MacBook (non-Pro & Pro).

Submitted by:	Rohit Grover <rgrover1 at gmail.com>
MFC after:	2 months
@
text
@d34 1
a34 1
SUBDIR += uether aue axe cdce cue kue rue udav
@


1.29
log
@SVN rev 198256 on 2009-10-19 21:43:59Z by thompsa

Remove the newly added uch341 driver, it will be merged into uchcom instead.

Suggested by:	takawata
Submitted by:	HPS
@
text
@d31 1
a31 1
SUBDIR += uhid ukbd ums udbp ufm
@


1.28
log
@SVN rev 197557 on 2009-09-28 07:32:11Z by thompsa

Add support for ChipHead 341 serial port adapter.

Submitted by:	Hans Petter Selasky
@
text
@d32 2
a33 2
SUBDIR += ucom u3g uark ubsa ubser uch341 uchcom ucycom ufoma uftdi ugensa \
	  uipaq ulpt umct umodem umoscom uplcom uslcom uvisor uvscom
@


1.27
log
@SVN rev 193195 on 2009-06-01 02:37:06Z by weongyo

connect urtw(4) to the amd64/i386 build that it's not tested on the big
endian machines yet.
@
text
@d32 2
a33 2
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
	  umct umodem umoscom uplcom uslcom uvisor uvscom
@


1.27.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.27.2.2
log
@SVN rev 200314 on 2009-12-09 21:47:42Z by thompsa

MFC r199086,199151,199680,199948,200241

 Driver for the Apple Touchpad present on MacBook (non-Pro & Pro).

Submitted by:	Rohit Grover <rgrover1 at gmail.com>
@
text
@d31 1
a31 1
SUBDIR += atp uhid ukbd ums udbp ufm
@


1.27.2.3
log
@SVN rev 202515 on 2010-01-17 18:37:36Z by thompsa

Hook up uhso to the build.
@
text
@d34 1
a34 1
SUBDIR += uether aue axe cdce cue kue rue udav uhso
@


1.27.2.4
log
@SVN rev 206289 on 2010-04-06 23:14:43Z by thompsa

MFC r203134

 Add run(4), a driver for Ralink RT2700U/RT2800U/RT3000U USB 802.11agn devices.

 This driver was written for OpenBSD by Damien Bergamini and ported over by
 Akinori Furukoshi.
@
text
@d30 1
a30 1
SUBDIR += rum run uath upgt ural zyd ${_urtw}
@


1.27.2.5
log
@SVN rev 215944 on 2010-11-27 19:35:12Z by thompsa

MFC r213379, r213426, r213426, r213427, r213432, r213435, r213437, r213439,
 r214804

  Merge the XHCI usb controller and supporting code.
@
text
@d29 1
a29 1
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci}
@


1.27.2.6
log
@SVN rev 215948 on 2010-11-27 19:40:51Z by thompsa

MFC r213805

 Add new driver for iPhone tethering, supports the iPhone 3G/3GS/4G ethernet
 protocol
@
text
@d34 1
a34 1
SUBDIR += uether aue axe cdce cue kue rue udav uhso ipheth
@


1.27.2.7
log
@SVN rev 219302 on 2011-03-05 08:56:42Z by glebius

MFHead 219059:
  Connect uep.ko to build

  PR:           kern/155044
  Submitted by: Carl <k0802647 telus.net>
@
text
@d31 1
a31 1
SUBDIR += atp uhid ukbd ums udbp ufm uep
@


1.27.2.8
log
@SVN rev 222777 on 2011-06-06 20:58:15Z by hselasky

MFC r222578 and r222696.
Add new USB serial device driver.
@
text
@d33 1
a33 1
	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
@


1.27.2.9
log
@SVN rev 229370 on 2012-01-03 09:15:54Z by hselasky

MFC r228483, r228640, r228709, r228711, r228723 and r229086:
 - Implement better support for USB controller suspend and resume.
 - Add code to wait for USB shutdown to be executed at system shutdown.
 - Add sysctl which can be used to skip this waiting.

NOTE: All USB controller drivers needs to be re-compiled after
this change due to changes in some USB controller only structures.
@
text
@d29 1
a29 1
SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
a50 4
.if ${MACHINE_ARCH} == "avr32"
_avr32dci=	avr32dci
.endif

@


1.27.2.10
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/sys/modules/usb/Makefile 229370 2012-01-03 09:15:54Z hselasky $
@


1.27.2.9.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.9.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/sys/modules/usb/Makefile 229370 2012-01-03 09:15:54Z hselasky $
@


1.27.2.6.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.27.2.4.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.26
log
@SVN rev 192909 on 2009-05-27 16:43:40Z by thompsa

Hook ubt and ubtbcmfw back up to the build.
@
text
@d30 1
a30 1
SUBDIR += rum uath upgt ural zyd
d38 4
d47 4
@


1.25
log
@SVN rev 192007 on 2009-05-12 02:08:56Z by weongyo

connect upgt(4) to the build.  It should work on all architectures.
@
text
@a28 1
#SUBDIR += ubt bluetooth_ng ubtfw
@


1.24
log
@SVN rev 190769 on 2009-04-06 12:43:40Z by weongyo

connect uath(4) to the build.  uath(4) should work on all architectures.
@
text
@d31 1
a31 1
SUBDIR += rum uath ural zyd
@


1.23
log
@SVN rev 190100 on 2009-03-19 20:33:26Z by thompsa

Remove the uscanner(4) driver, this follows the removal of the kernel scanner
driver in Linux 2.6. uscanner was just a simple wrapper around a fifo and
contained no logic, the default interface is now libusb (supported by sane).

Reviewed by:	HPS
@
text
@d31 1
a31 1
SUBDIR += rum ural zyd
@


1.22
log
@SVN rev 188943 on 2009-02-23 18:32:59Z by thompsa

Hook up new USB modules.
@
text
@d32 1
a32 1
SUBDIR += uhid ukbd ums udbp ufm uscanner
@


1.21
log
@SVN rev 188939 on 2009-02-23 18:16:17Z by thompsa

Move usb to a graveyard location under sys/legacy/dev, it is intended that the
new USB2 stack will fully replace this for 8.0.

Remove kernel modules, a subsequent commit will update conf/files. Unhook
usbdevs from the build.
@
text
@d1 26
a26 1
# $FreeBSD: src/sys/modules/usb/Makefile,v 1.20 2008/10/09 20:00:17 n_hibma Exp $
d28 10
a37 1
S=	${.CURDIR}/../..
d39 4
a42 1
.PATH: $S/dev/usb $S/pci
d44 1
a44 16
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 <bsd.kmod.mk>
@


1.20
log
@SVN rev 183730 on 2008-10-09 20:00:17Z by n_hibma

Obfuscated by other diffs while committing r183728:

Remove the files for the HCI interfaces from the usb module.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.19
log
@SVN rev 182481 on 2008-08-30 16:24:01Z by imp

opt_bus.h isn't needed here anymore.  It never was really needed,
since usb has no business including it like it did...
@
text
@a21 5
SRCS+=	uhci_pci.c uhci.c uhcireg.h uhcivar.h
SRCS+=	ohci_pci.c ohci.c ohcireg.h ohcivar.h
SRCS+=	ehci_pci.c ehci.c ehcireg.h ehcivar.h
SRCS+=	pci_if.h

@


1.18
log
@Release n_hibma's maintainership due to his ENOTIME.

Discussed with, okayed, authorized, requested by, on behalf of:	n_hibma (MAINTAINER)
@
text
@d25 1
a25 1
SRCS+=	opt_bus.h pci_if.h
@


1.18.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/usb/Makefile 146957 2005-06-04 10:58:39Z schweikh $
@


1.18.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/usb/Makefile 146957 2005-06-04 10:58:39Z schweikh $
@


1.18.24.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.18.24.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/usb/Makefile 146957 2005-06-04 10:58:39Z schweikh $
@


1.18.22.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.18.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.18.18.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.18.16.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.17
log
@Add usbdevs_data.h to the SRCS list since usb_subr.c needs it.  This forces
old usbdevs_data.h files to be updated as well as fixing the standalone
usb module build.
@
text
@d1 1
a1 3
# $FreeBSD$ 

MAINTAINER=	n_hibma@@freebsd.org
@


1.16
log
@We don't need to generate vnode_if.h anymore
@
text
@d19 1
a19 1
	usbdevs.h \
@


1.15
log
@Remove stray line with just a tab
Remove usbdevs_data.h, it isn't used by the module

Noticed by: Pawel Worach
@
text
@a10 1
	vnode_if.h \
@


1.15.2.1
log
@MFC: keep the maintainers consistent with HEAD.
@
text
@d3 2
@


1.14
log
@Add usbdevs.h and pccarddevs.h to the build list, as appropriate.  This is needed to build as part of world or in src/sys/modules.
@
text
@d20 1
a20 1
	usbdevs.h usbdevs_data.h \
d24 1
a24 1
	
@


1.13
log
@make usb bus_dma aware.

Reviewed by:	joe among others
@
text
@d23 1
a23 1
	usb_ethersubr.c
@


1.12
log
@add EHCI (USB 2.0) controller support.

Approved by:	joe
		gallatin (mentor)
Obtained from:  NetBSD
@
text
@d16 1
a16 1
	usb_mem.h \
@


1.11
log
@Drop <bsd.man.mk> support from <bsd.kmod.mk>.

Not objected to by:	-current
@
text
@d27 1
@


1.10
log
@Use a consistent style and one much closer to the rest of /usr/src
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/usb/Makefile,v 1.9 2000/05/27 01:14:29 peter Exp $ 
a27 2

NOMAN=
@


1.9
log
@Use .include <bsd.kmod.mk> to get to ../../*/conf/kmod.mk instead of
encoding the relative path.
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.8 2000/05/04 12:08:45 peter Exp $ 
d3 1
a3 2
MAINTAINER	 = n_hibma@@freebsd.org
S		 = ${.CURDIR}/../..
d5 1
a5 16
.PATH:		 $S/dev/usb $S/pci
KMOD		 = usb
SRCS		 = bus_if.h device_if.h usb_if.h usb_if.c \
		   vnode_if.h \
		   opt_usb.h \
		   hid.c hid.h usbhid.h \
		   uhub.c \
		   usb.c usb.h \
		   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
d7 1
a7 3
SRCS		+= uhci_pci.c uhci.c uhcireg.h uhcivar.h
SRCS		+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
SRCS		+= opt_bus.h pci_if.h
d9 21
a29 1
NOMAN		 =
@


1.8
log
@Pull in sys/conf/kmod.mk, rather than /usr/share/mk/bsd.kmod.mk.
This means that the kernel can be totally self contained now and is not
dependent on the last buildworld to update /usr/share/mk.  This might
also make it easier to build 5.x kernels on 4.0 boxes etc, assuming
gensetdefs and config(8) are updated.
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.7 2000/01/28 11:26:40 bde Exp $ 
d29 1
a29 1
.include "${.CURDIR}/../../conf/kmod.mk"
@


1.7
log
@Add ${DEBUG_FLAGS} to CFLAGS in bsd.kmod.mk, not in scattered module
makefiles.  Bad examples in fxp/Makefile keep getting copied to new
makefiles.
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.6 2000/01/23 13:56:58 n_hibma Exp $ 
d29 1
a29 1
.include <bsd.kmod.mk>
@


1.7.2.1
log
@After Far too long, MFC something resembling the -current version of the
USB code. This will allow teh addition of USB-2 support to 4.10 and
simplify debugging as they had diverged too much.

Submitted by:	joe@@freebsd.org
Obtained from:	NeBSD via -current
@
text
@d1 1
a1 1
# $FreeBSD$ 
d3 2
a4 1
MAINTAINER=	n_hibma@@freebsd.org
d6 16
a21 1
S=	${.CURDIR}/../..
d23 3
a25 1
.PATH: $S/dev/usb $S/pci
d27 1
a27 19
KMOD=	usb
SRCS=	bus_if.h device_if.h usb_if.h usb_if.c \
	vnode_if.h \
	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
	
SRCS+=	uhci_pci.c uhci.c uhcireg.h uhcivar.h
SRCS+=	ohci_pci.c ohci.c ohcireg.h ohcivar.h
SRCS+=	opt_bus.h pci_if.h
@


1.7.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/modules/usb/Makefile 126420 2004-03-01 00:07:26Z julian $ 
@


1.6
log
@Get rid of some debugging cruft.
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.5 2000/01/10 23:12:48 wpaul Exp $ 
a27 1
CFLAGS		+= ${DEBUG_FLAGS}
@


1.5
log
@Attempt to fix a problem with receiving packets on USB ethernet interfaces.
Packets are received inside USB bulk transfer callbacks, which run at
splusb() (actually splbio()). The packet input queues are meant to be
manipulated at splimp(). However the locking apparently breaks down under
certain circumstances and the input queues can get trampled.

There's a similar problem with if_ppp, which is driven by hardware/tty
interrupts from the serial driver, but which must also manipulate the
packet input queues at splimp(). The fix there is to use a netisr, and
that's the fix I used here. (I can hear you groaning back there. Hush up.)

The usb_ethersubr module maintains a single queue of its own. When a
packet is received in the USB callback routine, it's placed on this
queue with usb_ether_input(). This routine also schedules a soft net
interrupt with schednetisr(). The ISR routine then runs later, at
splnet, outside of the USB callback/interrupt context, and passes the
packet to ether_input(), hopefully in a safe manner.

The reason this is implemented as a separate module is that there are
a limited number of NETISRs that we can use, and snarfing one up for
each driver that needs it is wasteful (there will be three once I get
the CATC driver done). It also reduces code duplication to a certain
small extent. Unfortunately, it also needs to be linked in with the
usb.ko module in order for the USB ethernet drivers to share it.

Also removed some uneeded includes from if_aue.c and if_kue.c

Fix suggested by: peter
Not rejected as a hairbrained idea by: n_hibma
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.4 2000/01/03 12:01:27 marcel Exp $ 
d28 1
a28 9

opt_usb.h:
	echo > opt_usb.h
#	echo "#define USB_DEBUG 1" >> opt_usb.h
#	echo "#define UHCI_DEBUG 1" >> opt_usb.h
#	echo "#define OHCI_DEBUG 1" >> opt_usb.h

usb_devs.h:
	perl $S/kern/makedevlist.pl -h $S/dev/usb/usb.devs
@


1.4
log
@Remove -g compiler flag.
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.3 1999/11/28 18:53:38 bde Exp $ 
d20 2
a21 1
		   usbdi_util.c usbdi_util.h
@


1.3
log
@Removed special rules for building and cleaning device interface files
and empty options files.  The rules are now generated automatically in
bsd.kmod.mk.  Cleaned up related things ($S and ${CLEANFILES}).
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.2 1999/11/22 06:36:25 green Exp $ 
a26 1
CFLAGS		+= -g
@


1.2
log
@Make this compile (remove vnode_if.c from SRCS) and clean properly
(add opt_bus.h to CLEANFILES).
@
text
@d1 1
a1 1
#       $FreeBSD: src/sys/modules/usb/Makefile,v 1.1 1999/11/22 03:46:33 n_hibma Exp $ 
a27 5
CLEANFILES	+= bus_if.h device_if.h pci_if.h usb_if.h usb_if.c \
		   vnode_if.c vnode_if.h \
		   uhci_pci.o uhci.o \
		   ohci_pci.o ohci.o \
		   opt_usb.h opt_bus.h
a33 13
opt_bus.h:
	echo > opt_bus.h

bus_if.h:
	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
device_if.h:
	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
usb_if.h:
	perl $S/kern/makedevops.pl -h $S/dev/usb/usb_if.m
usb_if.c:
	perl $S/kern/makedevops.pl -c $S/dev/usb/usb_if.m
pci_if.h:
	perl $S/kern/makedevops.pl -h $S/pci/pci_if.m
@


1.1
log
@USB is loadable as a module as well.
@
text
@d1 1
a1 1
#       $FreeBSD$ 
d9 1
a9 1
		   vnode_if.c vnode_if.h \
d32 1
a32 1
		   opt_usb.h
@

