head	1.12;
access;
symbols
	RELENG_8_4:1.12.0.2
	RELENG_9_1_0_RELEASE:1.11.16.1.4.2
	RELENG_9_1:1.11.16.1.0.4
	RELENG_9_1_BP:1.11.16.1
	RELENG_8_3_0_RELEASE:1.11.10.1.8.1
	RELENG_8_3:1.11.10.1.0.8
	RELENG_8_3_BP:1.11.10.1
	RELENG_9_0_0_RELEASE:1.11.16.1.2.1
	RELENG_9_0:1.11.16.1.0.2
	RELENG_9_0_BP:1.11.16.1
	RELENG_9:1.11.0.16
	RELENG_9_BP:1.11
	RELENG_7_4_0_RELEASE:1.11.14.1
	RELENG_8_2_0_RELEASE:1.11.10.1.6.1
	RELENG_7_4:1.11.0.14
	RELENG_7_4_BP:1.11
	RELENG_8_2:1.11.10.1.0.6
	RELENG_8_2_BP:1.11.10.1
	RELENG_8_1_0_RELEASE:1.11.10.1.4.1
	RELENG_8_1:1.11.10.1.0.4
	RELENG_8_1_BP:1.11.10.1
	RELENG_7_3_0_RELEASE:1.11.12.1
	RELENG_7_3:1.11.0.12
	RELENG_7_3_BP:1.11
	RELENG_8_0_0_RELEASE:1.11.10.1.2.1
	RELENG_8_0:1.11.10.1.0.2
	RELENG_8_0_BP:1.11.10.1
	RELENG_8:1.11.0.10
	RELENG_8_BP:1.11
	RELENG_7_2_0_RELEASE:1.11.8.1
	RELENG_7_2:1.11.0.8
	RELENG_7_2_BP:1.11
	RELENG_7_1_0_RELEASE:1.11.6.1
	RELENG_6_4_0_RELEASE:1.10.14.2.8.1
	RELENG_7_1:1.11.0.6
	RELENG_7_1_BP:1.11
	RELENG_6_4:1.10.14.2.0.8
	RELENG_6_4_BP:1.10.14.2
	RELENG_7_0_0_RELEASE:1.11
	RELENG_6_3_0_RELEASE:1.10.14.2
	RELENG_7_0:1.11.0.4
	RELENG_7_0_BP:1.11
	RELENG_6_3:1.10.14.2.0.6
	RELENG_6_3_BP:1.10.14.2
	RELENG_7:1.11.0.2
	RELENG_7_BP:1.11
	RELENG_6_2_0_RELEASE:1.10.14.2
	RELENG_6_2:1.10.14.2.0.4
	RELENG_6_2_BP:1.10.14.2
	RELENG_5_5_0_RELEASE:1.10
	RELENG_5_5:1.10.0.18
	RELENG_5_5_BP:1.10
	RELENG_6_1_0_RELEASE:1.10.14.2
	RELENG_6_1:1.10.14.2.0.2
	RELENG_6_1_BP:1.10.14.2
	RELENG_6_0_0_RELEASE:1.10
	RELENG_6_0:1.10.0.16
	RELENG_6_0_BP:1.10
	RELENG_6:1.10.0.14
	RELENG_6_BP:1.10
	RELENG_5_4_0_RELEASE:1.10
	RELENG_5_4:1.10.0.12
	RELENG_5_4_BP:1.10
	RELENG_4_11_0_RELEASE:1.3
	RELENG_4_11:1.3.0.20
	RELENG_4_11_BP:1.3
	RELENG_5_3_0_RELEASE:1.10
	RELENG_5_3:1.10.0.10
	RELENG_5_3_BP:1.10
	RELENG_5:1.10.0.8
	RELENG_5_BP:1.10
	RELENG_4_10_0_RELEASE:1.3
	RELENG_4_10:1.3.0.18
	RELENG_4_10_BP:1.3
	RELENG_5_2_1_RELEASE:1.10
	RELENG_5_2_0_RELEASE:1.10
	RELENG_5_2:1.10.0.6
	RELENG_5_2_BP:1.10
	RELENG_4_9_0_RELEASE:1.3
	RELENG_4_9:1.3.0.16
	RELENG_4_9_BP:1.3
	RELENG_5_1_0_RELEASE:1.10
	RELENG_5_1:1.10.0.4
	RELENG_5_1_BP:1.10
	RELENG_4_8_0_RELEASE:1.3
	RELENG_4_8:1.3.0.14
	RELENG_4_8_BP:1.3
	RELENG_5_0_0_RELEASE:1.10
	RELENG_5_0:1.10.0.2
	RELENG_5_0_BP:1.10
	RELENG_4_7_0_RELEASE:1.3
	RELENG_4_7:1.3.0.12
	RELENG_4_7_BP:1.3
	RELENG_4_6_2_RELEASE:1.3
	RELENG_4_6_1_RELEASE:1.3
	RELENG_4_6_0_RELEASE:1.3
	RELENG_4_6:1.3.0.10
	RELENG_4_6_BP:1.3
	RELENG_4_5_0_RELEASE:1.3
	RELENG_4_5:1.3.0.8
	RELENG_4_5_BP:1.3
	RELENG_4_4_0_RELEASE:1.3
	RELENG_4_4:1.3.0.6
	RELENG_4_4_BP:1.3
	KSE_MILESTONE_2:1.7
	KSE_PRE_MILESTONE_2:1.7
	RELENG_4_3_0_RELEASE:1.3
	RELENG_4_3:1.3.0.4
	RELENG_4_3_BP:1.3
	RELENG_4_2_0_RELEASE:1.3
	RELENG_4_1_1_RELEASE:1.3
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.3
	RELENG_4_0_0_RELEASE:1.3
	RELENG_4:1.3.0.2
	RELENG_4_BP:1.3;
locks; strict;
comment	@# @;


1.12
date	2012.11.17.01.52.53;	author svnexp;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	2005.12.29.01.43.46;	author imp;	state Exp;
branches
	1.11.2.1
	1.11.6.1
	1.11.8.1
	1.11.10.1
	1.11.12.1
	1.11.14.1
	1.11.16.1;
next	1.10;

1.10
date	2002.01.11.20.14.03;	author imp;	state Exp;
branches
	1.10.14.1;
next	1.9;

1.9
date	2002.01.11.15.48.37;	author ru;	state Exp;
branches;
next	1.8;

1.8
date	2002.01.11.01.19.25;	author msmith;	state Exp;
branches;
next	1.7;

1.7
date	2001.01.06.13.59.42;	author obrien;	state Exp;
branches;
next	1.6;

1.6
date	2000.11.28.00.05.16;	author jon;	state Exp;
branches;
next	1.5;

1.5
date	2000.05.27.01.13.38;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	2000.05.04.12.07.14;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	99.11.28.18.52.40;	author bde;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	99.11.19.06.31.24;	author imp;	state Exp;
branches;
next	1.1;

1.1
date	99.11.18.07.11.16;	author imp;	state Exp;
branches;
next	;

1.12.2.1
date	2012.11.17.01.52.53;	author svnexp;	state dead;
branches;
next	1.12.2.2;

1.12.2.2
date	2013.03.28.13.05.18;	author svnexp;	state Exp;
branches;
next	;

1.11.2.1
date	2012.11.17.08.06.45;	author svnexp;	state Exp;
branches;
next	;

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

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

1.11.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.11.10.1.2.1
	1.11.10.1.4.1
	1.11.10.1.6.1
	1.11.10.1.8.1;
next	1.11.10.2;

1.11.10.2
date	2012.11.17.10.36.55;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.11.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.11.10.1.8.2;

1.11.10.1.8.2
date	2012.11.17.08.25.32;	author svnexp;	state Exp;
branches;
next	;

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

1.11.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.11.14.2;

1.11.14.2
date	2012.11.17.08.17.26;	author svnexp;	state Exp;
branches;
next	;

1.11.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.11.16.1.2.1
	1.11.16.1.4.1;
next	1.11.16.2;

1.11.16.2
date	2012.11.17.11.37.16;	author svnexp;	state Exp;
branches;
next	;

1.11.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.11.16.1.2.2;

1.11.16.1.2.2
date	2012.11.17.08.37.13;	author svnexp;	state Exp;
branches;
next	;

1.11.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.11.16.1.4.2;

1.11.16.1.4.2
date	2012.11.17.08.48.03;	author svnexp;	state Exp;
branches;
next	;

1.10.14.1
date	2006.02.11.06.55.50;	author imp;	state Exp;
branches;
next	1.10.14.2;

1.10.14.2
date	2006.03.01.18.19.33;	author imp;	state Exp;
branches
	1.10.14.2.8.1;
next	1.10.14.3;

1.10.14.3
date	2012.11.17.07.44.16;	author svnexp;	state Exp;
branches;
next	;

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

1.3.2.1
date	2012.11.17.07.26.30;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.12
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $

.PATH: ${.CURDIR}/../../dev/cardbus

KMOD=	cardbus
SRCS=	cardbus.c cardbus_cis.c cardbus_device.c \
	device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h

.include <bsd.kmod.mk>
@


1.12.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:18 +0000
@
text
@d1 9
@


1.12.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 9
# $FreeBSD: releng/8.4/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $

.PATH: ${.CURDIR}/../../dev/cardbus

KMOD=	cardbus
SRCS=	cardbus.c cardbus_cis.c cardbus_device.c \
	device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h

.include <bsd.kmod.mk>
@


1.11
log
@Implement /dev/cardbus%d.cis, same thing as /dev/pccard%d.cis.  There
are some rough edges with this still, but it seems to work well enough
to commit.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.11.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.16.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.11.16.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
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.16.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.11.16.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.16.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.11.16.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.14.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.11.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.12.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.11.10.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.11.10.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
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.10.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.11.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/cardbus/Makefile 153811 2005-12-29 01:43:47Z imp $
@


1.11.10.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.11.10.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.11.10.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.11.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.11.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.10
log
@I don't think that these modules should export symbols at all.  All
intermodule communication is done via kobj calls.  If anything
currently depends on them, let it break so that we can fix it.  Maybe
we'll need to export some of the card_if.c or power_if.c symbols, but
I think those should be in the base kernel (since all *_if.c should be
in the base kernel for just these reasons).
@
text
@d6 1
a6 1
SRCS=	cardbus.c cardbus_cis.c \
@


1.10.14.1
log
@MFC: add cardbus_device.c.  This file was left out when the rest of the
changes were merged, resulting in load errors at boot time.

Approved by: re@@ (scottl)
@
text
@d6 1
a6 1
SRCS=	cardbus.c cardbus_cis.c cardbus_device.c \
@


1.10.14.2
log
@Back out latest cardbus MFC.  This breaks stuff in a lot of weird and
unknown ways.  Until that breakage is sorted out, be conservative.  I'm
not backing this out in current so I can track down the issues.

I'm also not backing out the pci parts of this commit because with the
old cardbus code they work perfectly as far as I've been able to test.
I'm leaving cardbus_device.c in place as well since I anticipate being
able to reconnect it when I resolve this issue in head and cvs rm +
cvs add on branches can be a pita...

Approved by: re@@ (scottl)
@
text
@d6 1
a6 1
SRCS=	cardbus.c cardbus_cis.c \
@


1.10.14.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/cardbus/Makefile 156165 2006-03-01 18:19:33Z imp $
@


1.10.14.2.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.9
log
@Drop <bsd.man.mk> support from <bsd.kmod.mk>.

Not objected to by:	-current
@
text
@a8 2
EXPORT_SYMS=	YES	# XXX evaluate

@


1.8
log
@Turn on unconditional symbol export for modules whose API is
not clear enough, will require additional analysis, or will
require some input from their maintainers.
@
text
@a7 1
NOMAN=
@


1.7
log
@Use a consistent style and one much closer to the rest of /usr/src
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.6 2000/11/28 00:05:16 jon Exp $
d9 2
@


1.6
log
@A bunch of newcard/cardbus changes that's been sitting in my tree for a while:

- Make pccbb/cardbus kld loadable and unloadable.
- Make pccbb/cardbus use the power interface from pccard instead of inventing its own.
- some other minor fixes
@
text
@d1 3
a3 1
# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.5 2000/05/27 01:13:38 peter Exp $
a4 1
.PATH:	${.CURDIR}/../../dev/cardbus
@


1.5
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/cardbus/Makefile,v 1.4 2000/05/04 12:07:14 peter Exp $
d3 4
a6 4
.PATH:  ${.CURDIR}/../../dev/cardbus
KMOD=   cardbus
SRCS=   cardbus.c \
	device_if.h bus_if.h
@


1.4
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/cardbus/Makefile,v 1.3 1999/11/28 18:52:40 bde Exp $
d9 1
a9 1
.include "${.CURDIR}/../../conf/kmod.mk"
@


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/cardbus/Makefile,v 1.2 1999/11/19 06:31:24 imp Exp $
d9 1
a9 1
.include <bsd.kmod.mk>
@


1.3.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/modules/cardbus/Makefile 53846 1999-11-28 18:53:47Z bde $
@


1.2
log
@Module name is cardbus, not pccard.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/cardbus/Makefile,v 1.1 1999/11/18 07:11:16 imp Exp $
a2 1
S	= ${.CURDIR}/../..
a6 1
CLEANFILES+= device_if.h bus_if.h
a7 6

device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m
	perl $S/kern/makedevops.pl -h $S/kern/device_if.m

bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m
	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
@


1.1
log
@Add modules for cardbus and the cardbus bridge driver.  Files needed
to build these to be committed next.

Again, not added to sys/modules/Makefile
@
text
@d1 1
a1 1
# $FreeBSD$
d5 1
a5 1
KMOD=   pccard
@

