head	1.17;
access;
symbols
	RELENG_8_4:1.17.0.2
	RELENG_9_1_0_RELEASE:1.16.4.1.4.2
	RELENG_9_1:1.16.4.1.0.4
	RELENG_9_1_BP:1.16.4.1
	RELENG_8_3_0_RELEASE:1.16.2.1.8.1
	RELENG_8_3:1.16.2.1.0.8
	RELENG_8_3_BP:1.16.2.1
	RELENG_9_0_0_RELEASE:1.16.4.1.2.1
	RELENG_9_0:1.16.4.1.0.2
	RELENG_9_0_BP:1.16.4.1
	RELENG_9:1.16.0.4
	RELENG_9_BP:1.16
	RELENG_7_4_0_RELEASE:1.15.12.1
	RELENG_8_2_0_RELEASE:1.16.2.1.6.1
	RELENG_7_4:1.15.0.12
	RELENG_7_4_BP:1.15
	RELENG_8_2:1.16.2.1.0.6
	RELENG_8_2_BP:1.16.2.1
	RELENG_8_1_0_RELEASE:1.16.2.1.4.1
	RELENG_8_1:1.16.2.1.0.4
	RELENG_8_1_BP:1.16.2.1
	RELENG_7_3_0_RELEASE:1.15.10.1
	RELENG_7_3:1.15.0.10
	RELENG_7_3_BP:1.15
	RELENG_8_0_0_RELEASE:1.16.2.1.2.1
	RELENG_8_0:1.16.2.1.0.2
	RELENG_8_0_BP:1.16.2.1
	RELENG_8:1.16.0.2
	RELENG_8_BP:1.16
	RELENG_7_2_0_RELEASE:1.15.8.1
	RELENG_7_2:1.15.0.8
	RELENG_7_2_BP:1.15
	RELENG_7_1_0_RELEASE:1.15.6.1
	RELENG_6_4_0_RELEASE:1.14.12.1
	RELENG_7_1:1.15.0.6
	RELENG_7_1_BP:1.15
	RELENG_6_4:1.14.0.12
	RELENG_6_4_BP:1.14
	RELENG_7_0_0_RELEASE:1.15
	RELENG_6_3_0_RELEASE:1.14
	RELENG_7_0:1.15.0.4
	RELENG_7_0_BP:1.15
	RELENG_6_3:1.14.0.10
	RELENG_6_3_BP:1.14
	RELENG_7:1.15.0.2
	RELENG_7_BP:1.15
	RELENG_6_2_0_RELEASE:1.14
	RELENG_6_2:1.14.0.8
	RELENG_6_2_BP:1.14
	RELENG_5_5_0_RELEASE:1.12
	RELENG_5_5:1.12.0.8
	RELENG_5_5_BP:1.12
	RELENG_6_1_0_RELEASE:1.14
	RELENG_6_1:1.14.0.6
	RELENG_6_1_BP:1.14
	RELENG_6_0_0_RELEASE:1.14
	RELENG_6_0:1.14.0.4
	RELENG_6_0_BP:1.14
	RELENG_6:1.14.0.2
	RELENG_6_BP:1.14
	RELENG_5_4_0_RELEASE:1.12
	RELENG_5_4:1.12.0.6
	RELENG_5_4_BP:1.12
	RELENG_5_3_0_RELEASE:1.12
	RELENG_5_3:1.12.0.4
	RELENG_5_3_BP:1.12
	RELENG_5:1.12.0.2
	RELENG_5_BP:1.12
	RELENG_5_2_1_RELEASE:1.6
	RELENG_5_2_0_RELEASE:1.6
	RELENG_5_2:1.6.0.6
	RELENG_5_2_BP:1.6
	RELENG_5_1_0_RELEASE:1.6
	RELENG_5_1:1.6.0.4
	RELENG_5_1_BP:1.6
	RELENG_5_0_0_RELEASE:1.6
	RELENG_5_0:1.6.0.2
	RELENG_5_0_BP:1.6
	KSE_MILESTONE_2:1.3
	KSE_PRE_MILESTONE_2:1.3;
locks; strict;
comment	@# @;


1.17
date	2012.11.17.01.52.55;	author svnexp;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2009.06.05.18.44.36;	author jkim;	state Exp;
branches
	1.16.2.1
	1.16.4.1;
next	1.15;

1.15
date	2006.05.30.09.38.54;	author ru;	state Exp;
branches
	1.15.2.1
	1.15.6.1
	1.15.8.1
	1.15.10.1
	1.15.12.1;
next	1.14;

1.14
date	2005.05.10.12.02.15;	author nyan;	state Exp;
branches
	1.14.2.1
	1.14.12.1;
next	1.13;

1.13
date	2004.09.04.06.37.57;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2004.07.16.18.37.00;	author njl;	state Exp;
branches;
next	1.11;

1.11
date	2004.07.15.16.44.14;	author njl;	state Exp;
branches;
next	1.10;

1.10
date	2004.07.08.13.56.17;	author nyan;	state Exp;
branches;
next	1.9;

1.9
date	2004.07.07.22.35.27;	author imp;	state Exp;
branches;
next	1.8;

1.8
date	2004.05.26.00.53.03;	author imp;	state Exp;
branches;
next	1.7;

1.7
date	2004.05.17.10.48.42;	author roam;	state Exp;
branches;
next	1.6;

1.6
date	2002.11.06.13.46.58;	author nyan;	state Exp;
branches;
next	1.5;

1.5
date	2002.01.11.15.48.39;	author ru;	state Exp;
branches;
next	1.4;

1.4
date	2001.09.16.12.40.20;	author nyan;	state Exp;
branches;
next	1.3;

1.3
date	2001.06.29.15.23.31;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2001.06.29.10.01.24;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2001.06.29.07.36.29;	author joerg;	state Exp;
branches;
next	;

1.17.2.1
date	2012.11.17.01.52.55;	author svnexp;	state dead;
branches;
next	1.17.2.2;

1.17.2.2
date	2013.03.28.13.05.19;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.16.2.1.2.1
	1.16.2.1.4.1
	1.16.2.1.6.1
	1.16.2.1.8.1;
next	1.16.2.2;

1.16.2.2
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.16.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.16.2.1.8.2;

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

1.16.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.16.4.1.2.1
	1.16.4.1.4.1;
next	1.16.4.2;

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

1.16.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.16.4.1.2.2;

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

1.16.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.16.4.1.4.2;

1.16.4.1.4.2
date	2012.11.17.08.48.04;	author svnexp;	state Exp;
branches;
next	;

1.15.2.1
date	2012.11.17.08.06.47;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.15.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.15.12.2;

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

1.14.2.1
date	2012.11.17.07.44.17;	author svnexp;	state Exp;
branches;
next	;

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


desc
@@


1.17
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $

KMOD=	fdc

.if ${MACHINE} == "pc98"
.PATH:  ${.CURDIR}/../../pc98/cbus
SRCS=	fdc.c fdc_cbus.c
.else
.PATH:  ${.CURDIR}/../../dev/fdc
SRCS=	fdc.c fdc_isa.c fdc_pccard.c
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
SRCS+=	opt_acpi.h acpi_if.h fdc_acpi.c
.endif
.endif

SRCS+=	opt_fdc.h bus_if.h card_if.h device_if.h \
	isa_if.h pccarddevs.h

FDC_DEBUG?=	0	# 0/1

.if ${FDC_DEBUG} > 0
	echo "#define FDC_DEBUG 1" >> ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


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


1.17.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 25
# $FreeBSD: releng/8.4/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $

KMOD=	fdc

.if ${MACHINE} == "pc98"
.PATH:  ${.CURDIR}/../../pc98/cbus
SRCS=	fdc.c fdc_cbus.c
.else
.PATH:  ${.CURDIR}/../../dev/fdc
SRCS=	fdc.c fdc_isa.c fdc_pccard.c
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
SRCS+=	opt_acpi.h acpi_if.h fdc_acpi.c
.endif
.endif

SRCS+=	opt_fdc.h bus_if.h card_if.h device_if.h \
	isa_if.h pccarddevs.h

FDC_DEBUG?=	0	# 0/1

.if ${FDC_DEBUG} > 0
	echo "#define FDC_DEBUG 1" >> ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.16
log
@SVN rev 193530 on 2009-06-05 18:44:36Z by jkim

Import ACPICA 20090521.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.16.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.16.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
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
@


1.16.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.16.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
@


1.16.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.16.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
@


1.16.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.16.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
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
@


1.16.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.16.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/fdc/Makefile 193530 2009-06-05 18:44:36Z jkim $
@


1.16.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.16.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.16.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.15
log
@Dike out WARNS from kernel module makefiles.  Kernels and modules
use a different mechanism for setting warning flags, and using
WARNS here only has null or negative effects.

Submitted by:	bde (I think it means "submitted")
@
text
@a11 1
CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica
@


1.15.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/fdc/Makefile 159066 2006-05-30 09:38:54Z ru $
@


1.15.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.15.12.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/fdc/Makefile 159066 2006-05-30 09:38:54Z ru $
@


1.15.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.15.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.15.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.14
log
@Change a directory layout for pc98.
  - Move MD files into <arch>/<arch>.
  - Move bus dependent files into <arch>/<bus>.
Rename some files to more suitable names.

Repo-copied by:	peter
Discussed with:	imp
@
text
@a3 1
WARNS?=	2
@


1.14.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/fdc/Makefile 146049 2005-05-10 12:02:18Z nyan $
@


1.14.12.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.13
log
@Let kmod.mk touch opt_*.h files as needed.

Inspired by:	imp's email
@
text
@d7 2
a8 2
.PATH:  ${.CURDIR}/../../pc98/pc98
SRCS=	fd.c fdc_cbus.c
@


1.12
log
@Fix the alpha (and others) module build by only building fdc_acpi.c on
i386 and amd64.  The only other ACPI machine (ia64) doesn't support
floppy drives.  Tested by:  make MACHINE={pc98,i386,amd64,alpha,sparc64}
@
text
@a22 2
opt_fdc.h:
	touch ${.TARGET}
@


1.11
log
@Add fdc_acpi to module build, bump WARNS to 2.
@
text
@a2 5
.if ${MACHINE} == "pc98"
.PATH:  ${.CURDIR}/../../pc98/pc98
.else
.PATH:  ${.CURDIR}/../../dev/fdc
.endif
d5 1
d7 1
d10 3
d14 2
a15 1
SRCS=	fdc.c fdc_acpi.c fdc_isa.c fdc_pccard.c
d17 2
a18 1
SRCS+=	opt_acpi.h opt_fdc.h acpi_if.h bus_if.h card_if.h device_if.h \
@


1.10
log
@- Merged from sys/dev/fdc/fdc.c revision 1.275.
- Break out the cbus front end from fd.c.
- Remove the pccard support because it was broken.
@
text
@d9 1
d13 2
a14 1
SRCS=	fdc.c fdc_isa.c fdc_pccard.c
d16 2
a17 1
SRCS+=	opt_fdc.h bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
@


1.9
log
@Break out the isa and pccard front ends from fdc.  This is the first
step in making this driver more attachment neutral.  Others plan on
adding acpi front ends.

Still need to cleanup the MI part of the driver because it isn't as
bus independent as it could be.
@
text
@d10 1
a10 1
SRCS=	fd.c
@


1.8
log
@Move to generating pccarddevs.h on the fly, both for the kernel and
the modules.

Also generate usbdevs.h automatically now, but a non-kernel file is
stopping that at the moment.
@
text
@a7 1

d12 1
a12 1
SRCS=	fdc.c
d14 1
a14 2
SRCS+=	opt_fdc.h card.h \
	bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
a16 4
FDC_PCCARD?=	1	# 0/1  whether pccard support (i. e. Y-E DATA PCMCIA
#			# fdc) is desired

CLEANFILES=	card.h
a21 6
.endif

card.h:
	touch ${.TARGET}
.if ${FDC_PCCARD} > 0
	echo "#define NCARD 1" >> ${.TARGET}
@


1.7
log
@Unbreak the fdc module build after the repocopy of sys/isa/fd.c to
sys/dev/fdc/fdc.c.
@
text
@d16 1
a16 1
	bus_if.h card_if.h device_if.h isa_if.h
@


1.6
log
@Move adding -DPC98 to CFLAGS from each modules to sys/modules/Makefile.inc.
@
text
@d6 1
a6 1
.PATH:  ${.CURDIR}/../../isa
d10 6
a15 2
SRCS=	fd.c \
	opt_fdc.h card.h \
@


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

Not objected to by:	-current
@
text
@a4 1
CFLAGS+= -DPC98
@


1.4
log
@Added pc98 support.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.3 2001/06/29 15:23:31 joerg Exp $
a13 1
NOMAN=
@


1.3
log
@Two more "oops"es here: i didn't mean to turn on fdc debugging by
default in the KLD, and to turn off pccard support, so reverse each of
the flags.  Also, the flags should be overridable by /etc/make.conf.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.2 2001/06/29 10:01:24 joerg Exp $
d3 4
d8 1
@


1.2
log
@Duh-oh!  When beautifying a comment right before my last commit, i
didn't realize that make considers a comment with just leading white
space only an ``unassociated shell command''.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/modules/fdc/Makefile,v 1.1 2001/06/29 07:36:29 joerg Exp $
d11 2
a12 2
FDC_DEBUG=	1	# 0/1
FDC_PCCARD=	0	# 0/1  whether pccard support (i. e. Y-E DATA PCMCIA
@


1.1
log
@First stab at fixing resource deallocation, and implementing fdc(4) as
a KLD.  Still doesn't work well except in the PCMCIA case (now if only
pccardd(8) could load and unload drivers dynamically...).  Mainly, it
tries to find fdc0 on the PCI bus for whatever obscure reasons, but i
need someone who understands driver(9) to fix this.  However, it's at least
already better than before, and i'm tired of maintaining too many private
changes in my tree, given the large patches bde submitted. :)

Idea of a KLD triggered by:	Michael Reifenberger <root@@nihil.plaut.de>
@
text
@d1 1
a1 1
# $FreeBSD$
d13 1
a13 1
			# fdc) is desired
@

