head	1.6;
access;
symbols
	RELENG_8_4:1.6.0.2
	RELENG_9_1_0_RELEASE:1.5.4.1.4.2
	RELENG_9_1:1.5.4.1.0.4
	RELENG_9_1_BP:1.5.4.1
	RELENG_8_3_0_RELEASE:1.5.2.1.8.1
	RELENG_8_3:1.5.2.1.0.8
	RELENG_8_3_BP:1.5.2.1
	RELENG_9_0_0_RELEASE:1.5.4.1.2.1
	RELENG_9_0:1.5.4.1.0.2
	RELENG_9_0_BP:1.5.4.1
	RELENG_9:1.5.0.4
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.4.12.1
	RELENG_8_2_0_RELEASE:1.5.2.1.6.1
	RELENG_7_4:1.4.0.12
	RELENG_7_4_BP:1.4
	RELENG_8_2:1.5.2.1.0.6
	RELENG_8_2_BP:1.5.2.1
	RELENG_8_1_0_RELEASE:1.5.2.1.4.1
	RELENG_8_1:1.5.2.1.0.4
	RELENG_8_1_BP:1.5.2.1
	RELENG_7_3_0_RELEASE:1.4.10.1
	RELENG_7_3:1.4.0.10
	RELENG_7_3_BP:1.4
	RELENG_8_0_0_RELEASE:1.5.2.1.2.1
	RELENG_8_0:1.5.2.1.0.2
	RELENG_8_0_BP:1.5.2.1
	RELENG_8:1.5.0.2
	RELENG_8_BP:1.5
	RELENG_7_2_0_RELEASE:1.4.8.1
	RELENG_7_2:1.4.0.8
	RELENG_7_2_BP:1.4
	RELENG_7_1_0_RELEASE:1.4.6.1
	RELENG_6_4_0_RELEASE:1.1.12.1.8.1
	RELENG_7_1:1.4.0.6
	RELENG_7_1_BP:1.4
	RELENG_6_4:1.1.12.1.0.8
	RELENG_6_4_BP:1.1.12.1
	RELENG_7_0_0_RELEASE:1.4
	RELENG_6_3_0_RELEASE:1.1.12.1
	RELENG_7_0:1.4.0.4
	RELENG_7_0_BP:1.4
	RELENG_6_3:1.1.12.1.0.6
	RELENG_6_3_BP:1.1.12.1
	RELENG_7:1.4.0.2
	RELENG_7_BP:1.4
	RELENG_6_2_0_RELEASE:1.1.12.1
	RELENG_6_2:1.1.12.1.0.4
	RELENG_6_2_BP:1.1.12.1
	RELENG_5_5_0_RELEASE:1.1
	RELENG_5_5:1.1.0.16
	RELENG_5_5_BP:1.1
	RELENG_6_1_0_RELEASE:1.1.12.1
	RELENG_6_1:1.1.12.1.0.2
	RELENG_6_1_BP:1.1.12.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.14
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.12
	RELENG_6_BP:1.1
	RELENG_5_4_0_RELEASE:1.1
	RELENG_5_4:1.1.0.10
	RELENG_5_4_BP:1.1
	RELENG_4_11_0_RELEASE:1.1.2.1
	RELENG_4_11:1.1.2.1.0.6
	RELENG_4_11_BP:1.1.2.1
	RELENG_5_3_0_RELEASE:1.1
	RELENG_5_3:1.1.0.8
	RELENG_5_3_BP:1.1
	RELENG_5:1.1.0.6
	RELENG_5_BP:1.1
	RELENG_4_10_0_RELEASE:1.1.2.1
	RELENG_4_10:1.1.2.1.0.4
	RELENG_4_10_BP:1.1.2.1
	RELENG_5_2_1_RELEASE:1.1
	RELENG_5_2_0_RELEASE:1.1
	RELENG_5_2:1.1.0.4
	RELENG_5_2_BP:1.1
	RELENG_4_9_0_RELEASE:1.1.2.1
	RELENG_4_9:1.1.2.1.0.2
	RELENG_4_9_BP:1.1.2.1
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.6
date	2012.11.17.01.52.59;	author svnexp;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2008.09.01.23.59.00;	author imp;	state Exp;
branches
	1.5.2.1
	1.5.4.1;
next	1.4;

1.4
date	2007.03.21.03.42.50;	author sam;	state Exp;
branches
	1.4.2.1
	1.4.6.1
	1.4.8.1
	1.4.10.1
	1.4.12.1;
next	1.3;

1.3
date	2005.10.14.23.30.15;	author yar;	state Exp;
branches;
next	1.2;

1.2
date	2005.09.27.18.10.38;	author mlaier;	state Exp;
branches;
next	1.1;

1.1
date	2003.07.21.21.47.47;	author sam;	state Exp;
branches
	1.1.2.1
	1.1.12.1;
next	;

1.6.2.1
date	2012.11.17.01.52.59;	author svnexp;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2013.03.28.13.05.23;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.5.2.1.2.1
	1.5.2.1.4.1
	1.5.2.1.6.1
	1.5.2.1.8.1;
next	1.5.2.2;

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

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

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

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

1.5.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.5.2.1.8.2;

1.5.2.1.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.5.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.5.4.1.2.1
	1.5.4.1.4.1;
next	1.5.4.2;

1.5.4.2
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	;

1.5.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.5.4.1.2.2;

1.5.4.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.5.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.5.4.1.4.2;

1.5.4.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.08.06.55;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.4.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.4.12.2;

1.4.12.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2003.07.22.17.58.29;	author sam;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.26.34;	author svnexp;	state Exp;
branches;
next	;

1.1.12.1
date	2006.02.10.00.38.06;	author yar;	state Exp;
branches
	1.1.12.1.8.1;
next	1.1.12.2;

1.1.12.2
date	2012.11.17.07.44.25;	author svnexp;	state Exp;
branches;
next	;

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


desc
@@


1.6
log
@Switching exporter and resync
@
text
@#-
# Copyright (c) 2003 Sam Leffler, Errno Consulting
# 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.
#
# $FreeBSD: head/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
#

.PATH:	${.CURDIR}/../../dev/safe
KMOD	= safe
SRCS	= safe.c opt_safe.h
SRCS   += device_if.h bus_if.h pci_if.h
SRCS   += opt_bus.h cryptodev_if.h

.if !defined(KERNBUILDDIR)
opt_safe.h:
	echo "#define SAFE_DEBUG 1" > ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.6.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:23 +0000
@
text
@d1 40
@


1.6.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 40
#-
# Copyright (c) 2003 Sam Leffler, Errno Consulting
# 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.
#
# $FreeBSD: releng/8.4/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
#

.PATH:	${.CURDIR}/../../dev/safe
KMOD	= safe
SRCS	= safe.c opt_safe.h
SRCS   += device_if.h bus_if.h pci_if.h
SRCS   += opt_bus.h cryptodev_if.h

.if !defined(KERNBUILDDIR)
opt_safe.h:
	echo "#define SAFE_DEBUG 1" > ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.5
log
@SVN rev 182668 on 2008-09-01 23:59:00Z by imp

Per email to arch@@ a little while ago (that was greeted with silence),
prefer the more common > ${.TARGET} over > opt_foo.h in modules
makefiles.
@
text
@d26 1
a26 1
# $FreeBSD$
@


1.5.4.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.5.4.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
@d26 1
a26 1
# $FreeBSD: stable/9/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.5.4.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.5.4.1.4.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: releng/9.1/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.5.4.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.5.4.1.2.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: releng/9.0/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.5.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.5.2.2
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
@d26 1
a26 1
# $FreeBSD: stable/8/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.5.2.1.8.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.5.2.1.8.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: releng/8.3/sys/modules/safe/Makefile 182668 2008-09-01 23:59:00Z imp $
@


1.5.2.1.6.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.5.2.1.4.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.5.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.4
log
@Overhaul driver/subsystem api's:
o make all crypto drivers have a device_t; pseudo drivers like the s/w
  crypto driver synthesize one
o change the api between the crypto subsystem and drivers to use kobj;
  cryptodev_if.m defines this api
o use the fact that all crypto drivers now have a device_t to add support
  for specifying which of several potential devices to use when doing
  crypto operations
o add new ioctls that allow user apps to select a specific crypto device
  to use (previous ioctls maintained for compatibility)
o overhaul crypto subsystem code to eliminate lots of cruft and hide
  implementation details from drivers
o bring in numerous fixes from Michale Richardson/hifn; mostly for
  795x parts
o add an optional mechanism for mmap'ing the hifn 795x public key h/w
  to user space for use by openssl (not enabled by default)
o update crypto test tools to use new ioctl's and add cmd line options
  to specify a device to use for tests

These changes will also enable much future work on improving the core
crypto subsystem; including proper load balancing and interposing code
between the core and drivers to dispatch small operations to the s/w
driver as appropriate.

These changes were instigated by the work of Michael Richardson.

Reviewed by:	pjd
Approved by:	re
@
text
@d37 1
a37 1
	echo "#define SAFE_DEBUG 1" > opt_safe.h
@


1.4.2.1
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: stable/7/sys/modules/safe/Makefile 167755 2007-03-21 03:42:51Z sam $
@


1.4.12.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.4.12.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: releng/7.4/sys/modules/safe/Makefile 167755 2007-03-21 03:42:51Z sam $
@


1.4.10.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.4.8.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.4.6.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.3
log
@Let modules use the kernel's opt_*.h files if built along with
the kernel by wrapping all targets for fake opt_*.h files in
.if defined(KERNBUILDDIR).  Thus, such fake files won't be
created at all if modules are built with the kernel.

Some modules undergo cleanup like removing unused or unneeded
options or .h files, without which they wouldn't build this way
or the other.

Reviewed by:	ru
Tested by:	no binary changes in modules built alone
Tested on:	i386 sparc64 amd64
@
text
@d33 1
a33 1
SRCS   += opt_bus.h crypto_if.h
@


1.2
log
@Remove bridge(4) from the tree.  if_bridge(4) is a full functional
replacement and has additional features which make it superior.

Discussed on:	-arch
Reviewed by:	thompsa
X-MFC-after:	never (RELENG_6 as transition period)
@
text
@d35 1
d38 1
@


1.1
log
@SafeNet crypto driver

Sponsored by:	Global Technology Associates, Inc.
MFC after:	1 day
@
text
@d33 1
a33 1
SRCS   += opt_bdg.h opt_bus.h crypto_if.h
@


1.1.12.1
log
@MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
@
text
@a34 1
.if !defined(KERNBUILDDIR)
a36 1
.endif
@


1.1.12.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: stable/6/sys/modules/safe/Makefile 155500 2006-02-10 00:38:08Z yar $
@


1.1.12.1.8.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.1.2.1
log
@MFC SafeNet crypto driver

Sponsored by:	Global Technology Associates, Inc.
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d26 1
a26 1
# $FreeBSD: stable/4/sys/modules/safe/Makefile 117894 2003-07-22 17:58:29Z sam $
@


