head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.4.2.1.4.2
	RELENG_9_1:1.4.2.1.0.4
	RELENG_9_1_BP:1.4.2.1
	RELENG_8_3_0_RELEASE:1.2.2.3.2.1
	RELENG_8_3:1.2.2.3.0.2
	RELENG_8_3_BP:1.2.2.3
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_8_2_0_RELEASE:1.2.2.2.4.1
	RELENG_8_2:1.2.2.2.0.4
	RELENG_8_2_BP:1.2.2.2
	RELENG_8_1_0_RELEASE:1.2.2.2.2.1
	RELENG_8_1:1.2.2.2.0.2
	RELENG_8_1_BP:1.2.2.2
	RELENG_8_0_0_RELEASE:1.2.2.1.2.1
	RELENG_8_0:1.2.2.1.0.2
	RELENG_8_0_BP:1.2.2.1
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.53.02;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2010.11.22.01.11.28;	author weongyo;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.04.29.22.51.18;	author thompsa;	state Exp;
branches;
next	1.2;

1.2
date	2009.04.06.00.32.54;	author thompsa;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2009.02.23.18.32.59;	author thompsa;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.01.53.02;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.05.25;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.11.37.19;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

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

1.4.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.1.4.2;

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

1.2.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2010.05.17.23.43.41;	author thompsa;	state Exp;
branches
	1.2.2.2.2.1
	1.2.2.2.4.1;
next	1.2.2.3;

1.2.2.3
date	2011.04.28.16.18.30;	author hselasky;	state Exp;
branches
	1.2.2.3.2.1;
next	1.2.2.4;

1.2.2.4
date	2012.11.17.10.36.59;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.2.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.3.2.2;

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


desc
@@


1.5
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/sys/modules/usb/usb/Makefile 215649 2010-11-22 01:11:28Z weongyo $
#
# 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}/../../..

.PATH: $S/dev/usb $S/dev/usb/controller

KMOD=	usb
SRCS=	bus_if.h device_if.h usb_if.h usb_if.c vnode_if.h \
	opt_usb.h opt_bus.h opt_ddb.h \
	usb_pf.h usbdevs.h usbdevs_data.h \
	usb_busdma.c usb_controller.c usb_compat_linux.c usb_core.c usb_debug.c \
	usb_dev.c usb_device.c usb_dynamic.c usb_error.c usb_generic.c \
	usb_handle_request.c usb_hid.c usb_hub.c usb_lookup.c usb_mbuf.c \
	usb_msctest.c usb_parse.c usb_pf.c usb_process.c usb_request.c \
	usb_transfer.c usb_util.c 

.include <bsd.kmod.mk>
@


1.5.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:25 +0000
@
text
@d1 42
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 42
#
# $FreeBSD: releng/8.4/sys/modules/usb/usb/Makefile 221174 2011-04-28 16:18:30Z 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.
#

S=     ${.CURDIR}/../../..

.PATH: $S/dev/usb $S/dev/usb/controller

KMOD=	usb
SRCS=	bus_if.h device_if.h usb_if.h usb_if.c vnode_if.h \
	opt_usb.h opt_bus.h opt_ddb.h \
	usb_pf.h usbdevs.h usbdevs_data.h \
	usb_busdma.c usb_controller.c usb_compat_linux.c usb_core.c usb_debug.c \
	usb_dev.c usb_device.c usb_dynamic.c usb_error.c usb_generic.c \
	usb_handle_request.c usb_hid.c usb_hub.c usb_lookup.c usb_mbuf.c \
	usb_msctest.c usb_parse.c usb_pf.c usb_process.c usb_request.c \
	usb_transfer.c usb_util.c 

.include <bsd.kmod.mk>
@


1.4
log
@SVN rev 215649 on 2010-11-22 01:11:28Z by weongyo

Adds a USB packet filter feature to the stack that it could capture
packets which go through each USB host controllers.  Its implementations
are almost based on BPF code and very similar with it except it's
little bit customized for USB packet only.  The userland program
usbdump(8) would be committed soon.

Discussed with:	hps, thompsa, yongari
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.4.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.4.2.2
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/usb/Makefile 215649 2010-11-22 01:11:28Z weongyo $
@


1.4.2.1.4.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.4.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/sys/modules/usb/usb/Makefile 215649 2010-11-22 01:11:28Z weongyo $
@


1.4.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.4.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/sys/modules/usb/usb/Makefile 215649 2010-11-22 01:11:28Z weongyo $
@


1.3
log
@SVN rev 207404 on 2010-04-29 22:51:18Z by thompsa

usb_controller.c requires opt_ddb.h
@
text
@d35 1
a35 1
	usbdevs.h usbdevs_data.h \
d39 1
a39 1
	usb_msctest.c usb_parse.c usb_process.c usb_request.c \
@


1.2
log
@SVN rev 190755 on 2009-04-06 00:32:54Z by thompsa

Remove usb_sw_transfer.[ch] which are now empty after r190735.
@
text
@d34 1
a34 1
	opt_usb.h opt_bus.h \
@


1.2.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.2.2.2
log
@SVN rev 208218 on 2010-05-17 23:43:41Z by thompsa

MFC r207404

 usb_controller.c requires opt_ddb.h
@
text
@d34 1
a34 1
	opt_usb.h opt_bus.h opt_ddb.h \
@


1.2.2.3
log
@SVN rev 221174 on 2011-04-28 16:18:30Z by hselasky

MFC r215649,r215764,r215802,r215804,r215810,r215812,r216091,r216267,r218165,r220301,r215651,r215803,r216138,r218010,r217558,r220312,r220314,r215846 and r216268.
Backport USB PF and usbdump from head to 8-stable.

Approved by:	thompsa
@
text
@d35 1
a35 1
	usb_pf.h usbdevs.h usbdevs_data.h \
d39 1
a39 1
	usb_msctest.c usb_parse.c usb_pf.c usb_process.c usb_request.c \
@


1.2.2.4
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/usb/Makefile 221174 2011-04-28 16:18:30Z hselasky $
@


1.2.2.3.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.2.2.3.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/sys/modules/usb/usb/Makefile 221174 2011-04-28 16:18:30Z hselasky $
@


1.2.2.2.4.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.2.2.2.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.2.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.1
log
@SVN rev 188943 on 2009-02-23 18:32:59Z by thompsa

Hook up new USB modules.
@
text
@d39 1
a39 1
	usb_msctest.c usb_parse.c usb_process.c usb_request.c usb_sw_transfer.c \
@

