head	1.21;
access;
symbols
	RELENG_8_4:1.20.0.2
	RELENG_9_1_0_RELEASE:1.18.2.2.2.2
	RELENG_9_1:1.18.2.2.0.2
	RELENG_9_1_BP:1.18.2.2
	RELENG_8_3_0_RELEASE:1.15.2.4.4.1
	RELENG_8_3:1.15.2.4.0.4
	RELENG_8_3_BP:1.15.2.4
	RELENG_9_0_0_RELEASE:1.18.2.1.2.1
	RELENG_9_0:1.18.2.1.0.2
	RELENG_9_0_BP:1.18.2.1
	RELENG_9:1.18.0.2
	RELENG_9_BP:1.18
	RELENG_7_4_0_RELEASE:1.9.2.5.2.1
	RELENG_8_2_0_RELEASE:1.15.2.4.2.1
	RELENG_7_4:1.9.2.5.0.2
	RELENG_7_4_BP:1.9.2.5
	RELENG_8_2:1.15.2.4.0.2
	RELENG_8_2_BP:1.15.2.4
	RELENG_8_1_0_RELEASE:1.15.2.2.2.1
	RELENG_8_1:1.15.2.2.0.2
	RELENG_8_1_BP:1.15.2.2
	RELENG_7_3_0_RELEASE:1.9.2.2.6.1
	RELENG_7_3:1.9.2.2.0.6
	RELENG_7_3_BP:1.9.2.2
	RELENG_8_0_0_RELEASE:1.15.2.1.2.1
	RELENG_8_0:1.15.2.1.0.2
	RELENG_8_0_BP:1.15.2.1
	RELENG_8:1.15.0.2
	RELENG_8_BP:1.15
	RELENG_7_2_0_RELEASE:1.9.2.2.4.1
	RELENG_7_2:1.9.2.2.0.4
	RELENG_7_2_BP:1.9.2.2
	RELENG_7_1_0_RELEASE:1.9.2.2.2.1
	RELENG_6_4_0_RELEASE:1.4.6.1.4.1
	RELENG_7_1:1.9.2.2.0.2
	RELENG_7_1_BP:1.9.2.2
	RELENG_6_4:1.4.6.1.0.4
	RELENG_6_4_BP:1.4.6.1
	RELENG_7_0_0_RELEASE:1.9
	RELENG_6_3_0_RELEASE:1.4.6.1
	RELENG_7_0:1.9.0.4
	RELENG_7_0_BP:1.9
	RELENG_6_3:1.4.6.1.0.2
	RELENG_6_3_BP:1.4.6.1
	RELENG_7:1.9.0.2
	RELENG_7_BP:1.9
	RELENG_6_2_0_RELEASE:1.4
	RELENG_6_2:1.4.0.12
	RELENG_6_2_BP:1.4
	RELENG_5_5_0_RELEASE:1.4.2.1
	RELENG_5_5:1.4.2.1.0.4
	RELENG_5_5_BP:1.4.2.1
	RELENG_6_1_0_RELEASE:1.4
	RELENG_6_1:1.4.0.10
	RELENG_6_1_BP:1.4
	RELENG_6_0_0_RELEASE:1.4
	RELENG_6_0:1.4.0.8
	RELENG_6_0_BP:1.4
	RELENG_6:1.4.0.6
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.4.2.1
	RELENG_5_4:1.4.2.1.0.2
	RELENG_5_4_BP:1.4.2.1
	RELENG_4_11_0_RELEASE:1.1.2.3
	RELENG_4_11:1.1.2.3.0.10
	RELENG_4_11_BP:1.1.2.3
	RELENG_5_3_0_RELEASE:1.4
	RELENG_5_3:1.4.0.4
	RELENG_5_3_BP:1.4
	RELENG_5:1.4.0.2
	RELENG_5_BP:1.4
	RELENG_4_10_0_RELEASE:1.1.2.3
	RELENG_4_10:1.1.2.3.0.8
	RELENG_4_10_BP:1.1.2.3
	RELENG_5_2_1_RELEASE:1.3
	RELENG_5_2_0_RELEASE:1.3
	RELENG_5_2:1.3.0.6
	RELENG_5_2_BP:1.3
	RELENG_4_9_0_RELEASE:1.1.2.3
	RELENG_4_9:1.1.2.3.0.6
	RELENG_4_9_BP:1.1.2.3
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.4
	RELENG_5_1_BP:1.3
	RELENG_4_8_0_RELEASE:1.1.2.3
	RELENG_4_8:1.1.2.3.0.4
	RELENG_4_8_BP:1.1.2.3
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.2
	RELENG_5_0_BP:1.3
	RELENG_4_7_0_RELEASE:1.1.2.3
	RELENG_4_7:1.1.2.3.0.2
	RELENG_4_7_BP:1.1.2.3
	RELENG_4_6_2_RELEASE:1.1.2.2
	RELENG_4_6_1_RELEASE:1.1.2.2
	RELENG_4_6_0_RELEASE:1.1.2.2
	RELENG_4_6:1.1.2.2.0.2
	RELENG_4_6_BP:1.1.2.2
	RELENG_4_5_0_RELEASE:1.1.2.1
	RELENG_4_5:1.1.2.1.0.2
	RELENG_4_5_BP:1.1.2.1
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.21
date	2013.07.13.00.48.44;	author svnexp;	state Exp;
branches;
next	1.20;

1.20
date	2012.11.17.01.52.55;	author svnexp;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2012.07.06.20.14.27;	author kib;	state Exp;
branches;
next	1.18;

1.18
date	2010.08.16.17.48.55;	author yongari;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2010.07.01.21.03.30;	author jfv;	state Exp;
branches;
next	1.16;

1.16
date	2010.03.29.23.36.34;	author jfv;	state Exp;
branches;
next	1.15;

1.15
date	2008.11.12.21.32.49;	author bz;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	2008.07.30.22.05.06;	author jfv;	state Exp;
branches;
next	1.13;

1.13
date	2008.04.25.21.19.41;	author jfv;	state Exp;
branches;
next	1.12;

1.12
date	2008.04.02.22.00.36;	author jfv;	state Exp;
branches;
next	1.11;

1.11
date	2008.03.27.20.38.03;	author antoine;	state Exp;
branches;
next	1.10;

1.10
date	2008.02.29.21.50.11;	author jfv;	state Exp;
branches;
next	1.9;

1.9
date	2007.05.07.09.55.25;	author le;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2007.05.04.13.34.33;	author rwatson;	state Exp;
branches;
next	1.7;

1.7
date	2007.05.04.07.21.01;	author jfv;	state Exp;
branches;
next	1.6;

1.6
date	2007.05.04.00.00.12;	author jfv;	state Exp;
branches;
next	1.5;

1.5
date	2005.09.27.18.10.34;	author mlaier;	state Exp;
branches;
next	1.4;

1.4
date	2004.06.09.08.27.05;	author obrien;	state Exp;
branches
	1.4.2.1
	1.4.6.1;
next	1.3;

1.3
date	2002.10.27.17.06.03;	author mux;	state Exp;
branches;
next	1.2;

1.2
date	2002.06.03.22.30.51;	author pdeuskar;	state Exp;
branches;
next	1.1;

1.1
date	2001.12.02.07.37.13;	author pdeuskar;	state Exp;
branches
	1.1.2.1;
next	;

1.20.2.1
date	2012.11.17.01.52.55;	author svnexp;	state dead;
branches;
next	1.20.2.2;

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

1.18.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.18.2.1.2.1;
next	1.18.2.2;

1.18.2.2
date	2012.07.08.20.35.56;	author jfv;	state Exp;
branches
	1.18.2.2.2.1;
next	1.18.2.3;

1.18.2.3
date	2012.11.17.11.37.16;	author svnexp;	state Exp;
branches;
next	1.18.2.4;

1.18.2.4
date	2013.07.16.00.02.30;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.18.2.1.2.2;

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

1.18.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.18.2.2.2.2;

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

1.15.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.15.2.1.2.1;
next	1.15.2.2;

1.15.2.2
date	2010.04.05.21.43.22;	author jfv;	state Exp;
branches
	1.15.2.2.2.1;
next	1.15.2.3;

1.15.2.3
date	2010.08.12.20.18.06;	author jfv;	state Exp;
branches;
next	1.15.2.4;

1.15.2.4
date	2010.09.27.17.37.25;	author yongari;	state Exp;
branches
	1.15.2.4.2.1
	1.15.2.4.4.1;
next	1.15.2.5;

1.15.2.5
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	1.15.2.6;

1.15.2.6
date	2013.02.28.01.22.21;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.15.2.4.4.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.15.2.4.4.2;

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

1.9.2.1
date	2008.05.02.23.43.23;	author jfv;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	2008.08.11.18.45.51;	author jfv;	state Exp;
branches
	1.9.2.2.2.1
	1.9.2.2.4.1
	1.9.2.2.6.1;
next	1.9.2.3;

1.9.2.3
date	2010.05.14.22.39.51;	author jfv;	state Exp;
branches;
next	1.9.2.4;

1.9.2.4
date	2010.09.27.17.38.30;	author yongari;	state Exp;
branches;
next	1.9.2.5;

1.9.2.5
date	2010.11.27.01.09.54;	author jfv;	state Exp;
branches
	1.9.2.5.2.1;
next	1.9.2.6;

1.9.2.6
date	2012.11.17.08.06.46;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.9.2.5.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.9.2.5.2.2;

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

1.4.2.1
date	2005.03.23.13.30.21;	author glebius;	state Exp;
branches;
next	;

1.4.6.1
date	2007.10.05.22.49.08;	author jfv;	state Exp;
branches
	1.4.6.1.4.1;
next	1.4.6.2;

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

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

1.1.2.1
date	2001.12.15.01.41.00;	author pdeuskar;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2002.02.22.17.31.33;	author pdeuskar;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2002.06.18.21.00.56;	author pdeuskar;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.07.26.31;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.21
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/253303
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/sys/modules/em/Makefile 253303 2013-07-12 22:36:26Z jfv $

.include <bsd.own.mk>

.PATH:  ${.CURDIR}/../../dev/e1000
KMOD    = if_em
SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
SRCS    += $(CORE_SRC) $(LEGACY_SRC)
SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
CORE_SRC = if_em.c e1000_osdep.c
# This is the Legacy, pre-PCIE source, it can be
# undefined when using modular driver if not needed
LEGACY_SRC    += if_lem.c
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c \
		e1000_manage.c e1000_vf.c e1000_mbx.c e1000_i210.c
PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c

CFLAGS += -I${.CURDIR}/../../dev/e1000

# DEVICE_POLLING for a non-interrupt-driven method
#CFLAGS  += -DDEVICE_POLLING

.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	@@echo "#define INET 1" > ${.TARGET}
.endif

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	@@echo "#define INET6 1" > ${.TARGET}
.endif
.endif

.include <bsd.kmod.mk>
@


1.20
log
@Switching exporter and resync
@
text
@d1 4
a4 1
# $FreeBSD: head/sys/modules/em/Makefile 238181 2012-07-06 20:14:27Z kib $
d7 1
a7 1
SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
d24 12
@


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


1.20.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 21
# $FreeBSD: releng/8.4/sys/modules/em/Makefile 247430 2013-02-28 00:22:04Z jfv $
.PATH:  ${.CURDIR}/../../dev/e1000
KMOD    = if_em
SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
SRCS    += $(CORE_SRC) $(LEGACY_SRC)
SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
CORE_SRC = if_em.c e1000_osdep.c
# This is the Legacy, pre-PCIE source, it can be
# undefined when using modular driver if not needed
LEGACY_SRC    += if_lem.c
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c \
		e1000_manage.c e1000_vf.c e1000_mbx.c e1000_i210.c
PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c

CFLAGS += -I${.CURDIR}/../../dev/e1000

# DEVICE_POLLING for a non-interrupt-driven method
#CFLAGS  += -DDEVICE_POLLING

.include <bsd.kmod.mk>
@


1.19
log
@SVN rev 238181 on 2012-07-06 20:14:27Z by kib

Add a source file needed for module linking.

MFC after:   4 days
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.18
log
@SVN rev 211400 on 2010-08-16 17:48:55Z by yongari

Remove unnecessary clean target in em(4), igb(4) and ixgbe(4).
While here also remove man target in igb(4).

Reviewed by:	jfv
@
text
@d12 1
a12 1
		e1000_manage.c e1000_vf.c e1000_mbx.c
@


1.18.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.18.2.2
log
@SVN rev 238262 on 2012-07-08 20:35:56Z by jfv

MFC of the e1000 drivers: 236406,238148,238151,238181, and 238214

Approved by:re
@
text
@d12 1
a12 1
		e1000_manage.c e1000_vf.c e1000_mbx.c e1000_i210.c
@


1.18.2.3
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/em/Makefile 238262 2012-07-08 20:35:56Z jfv $
@


1.18.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/253374
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 4
# $FreeBSD: stable/9/sys/modules/em/Makefile 253374 2013-07-15 23:27:48Z jfv $

.include <bsd.own.mk>

d4 1
a4 1
SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
a20 12
.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	@@echo "#define INET 1" > ${.TARGET}
.endif

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	@@echo "#define INET6 1" > ${.TARGET}
.endif
.endif

@


1.18.2.2.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.18.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/em/Makefile 238262 2012-07-08 20:35:56Z jfv $
@


1.18.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.18.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/em/Makefile 211400 2010-08-16 17:48:55Z yongari $
@


1.17
log
@SVN rev 209637 on 2010-07-01 21:03:30Z by jfv

Add new source to the loadable em build, thought
it wasnt needed but it is.
@
text
@a20 6
clean:
	rm -f device_if.h bus_if.h pci_if.h setdef*
	rm -f *.o *.kld *.ko
	rm -f @@ machine
	rm -f ${CLEANFILES}

@


1.16
log
@SVN rev 205869 on 2010-03-29 23:36:34Z by jfv

Update to igb and em:

em revision 7.0.0:
	- Using driver devclass, seperate legacy (pre-pcie) code
	  into a seperate source file. This will at least help
	  protect against regression issues. It compiles along
	  with em, and is transparent to end use, devices in each
	  appear to be 'emX'. When using em in a modular form this
	  also allows the legacy stuff to be defined out.
	- Add tx and rx rings as in igb, in the 82574 this becomes
	  actual multiqueue for the first time (2 queues) while in
	  other PCIE adapters its just make code cleaner.
	- Add RX mbuf handling logic that matches igb, this will
	  eliminate packet drops due to temporary mbuf shortage.

igb revision 1.9.3:
	- Following the ixgbe code, use a new approach in what
	  was called 'get_buf', the routine now has been made
	  independent of rxeof, it now does the update to the
	  engine TDT register, this design allows temporary
	  mbuf resources to become non-critical, not requiring
	  a packet to be discarded, instead it just returns and
	  does not increment the tail pointer.
	- With the above change it was also unnecessary to keep
	  'spare' maps around, since we do not have the discard
	  issue.
	- Performance tweaks and improvements to the code also.

MFC in a week
@
text
@d11 2
a12 1
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
@


1.15
log
@SVN rev 184894 on 2008-11-12 21:32:49Z by bz

Add opt_inet.h which has been needed since r184717 introducing
checks for #ifdef INET.

MFC after:	54 days
@
text
@d5 9
a13 5
SRCS    += if_em.c $(SHARED_SRCS)
SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c
SHARED_SRCS += e1000_82575.c 
d15 1
a15 1
CFLAGS+= -I${.CURDIR}/../../dev/e1000
d17 1
a17 1
# DEVICE_POLLING gives you Legacy interrupt handling
@


1.15.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.15.2.2
log
@SVN rev 206215 on 2010-04-05 21:43:22Z by jfv

Add missing module Makefile for ixgbe and em MFCs
@
text
@d5 5
a9 9
SRCS    += $(CORE_SRC) $(LEGACY_SRC)
SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
CORE_SRC = if_em.c e1000_osdep.c
# This is the Legacy, pre-PCIE source, it can be
# undefined when using modular driver if not needed
LEGACY_SRC    += if_lem.c
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c
d11 1
a11 1
CFLAGS += -I${.CURDIR}/../../dev/e1000
d13 1
a13 1
# DEVICE_POLLING for a non-interrupt-driven method
@


1.15.2.3
log
@SVN rev 211241 on 2010-08-12 20:18:06Z by jfv

MFC of e1000 changes

Many bug fixes, major new feature: the igb vf driver.
@
text
@d11 1
a11 2
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c \
		e1000_manage.c e1000_vf.c e1000_mbx.c
@


1.15.2.4
log
@SVN rev 213211 on 2010-09-27 17:37:25Z by yongari

MFC r211400:
  Remove unnecessary clean target in em(4), igb(4) and ixgbe(4).
  While here also remove man target in igb(4).

  Reviewed by:	jfv
@
text
@d21 6
@


1.15.2.5
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/em/Makefile 213211 2010-09-27 17:37:25Z yongari $
@


1.15.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247430
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/em/Makefile 247430 2013-02-28 00:22:04Z jfv $
d12 1
a12 1
		e1000_manage.c e1000_vf.c e1000_mbx.c e1000_i210.c
@


1.15.2.4.4.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.15.2.4.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/em/Makefile 213211 2010-09-27 17:37:25Z yongari $
@


1.15.2.4.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.15.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.15.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.14
log
@SVN rev 181029 on 2008-07-30 22:05:06Z by jfv

Change to build module with new directory tree

MFC after:ASAP
@
text
@d4 1
a4 1
SRCS    = device_if.h bus_if.h pci_if.h
@


1.13
log
@This delta has a few important items:

PR 122839 is fixed in both em and in igb

Second, the issue on building modules since the static kernel
build changes is now resolved. I was not able to get the fancier
directory hierarchy working, but this works, both em and igb
build as modules now.

Third, there is now support in em for two new NICs, Hartwell
(or 82574) is a low cost PCIE dual port adapter that has MSIX,
for this release it uses 3 vectors only, RX, TX, and LINK. In
the next release I will add a second TX and RX queue. Also, there
is support here for ICH10, the followon to ICH9. Both of these are
early releases, general availability will follow soon.

Fourth: On Hartwell and ICH10 we now have IEEE 1588 PTP support,
I have implemented this in a provisional way so that early adopters
may try and comment on the functionality. The IOCTL structure may
change. This feature is off by default, you need to edit the Makefile
and add the EM_TIMESYNC define to get the code.

Enjoy all!!
@
text
@d2 1
a2 1
.PATH:  ${.CURDIR}/../../dev/em
d9 1
d11 1
a11 1
CFLAGS+= -DNO_82575_SUPPORT -I${.CURDIR}/../../dev/em
d13 1
a13 8
# Uncomment this to disable Fast interrupt handling.
# and enable legacy interrupt handling
#CFLAGS  += -DEM_LEGACY_IRQ

# This option enables IEEE 1588 Precision Time Protocol
#CFLAGS += -DEM_TIMESYNC

# DEVICE_POLLING for a non-interrupt-driven method
@


1.12
log
@This update primarily addresses the ability to have both the em
and the igb driver static in the kernel. But it also reflects
some other bug fixes in my development stream at Intel.
PR 122373 is also fixed in this code.
@
text
@d10 1
a10 1
CFLAGS+= -I${.CURDIR}/../../dev/em
d12 8
a19 1
# DEVICE_POLLING gives you Legacy interrupt handling
@


1.11
log
@Remove option headers that do not exist and are not used
from the Makefiles in sys/modules.
(opt_devfs.h, opt_bdg.h, opt_emu10kx.h and opt_uslcom.h)

Approved by:	rwatson (mentor)
@
text
@d8 1
a8 1
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c 
@


1.10
log
@This change introduces a split to the Intel E1000 driver, now rather than
just em, there is an igb driver (this follows behavior with our Linux drivers).
All adapters up to the 82575 are supported in em, and new client/desktop support
will continue to be in that adapter.

The igb driver is for new server NICs like the 82575 and its followons.
Advanced features for virtualization and performance will be in this driver.

Also, both drivers now have shared code that is up to the latest we have
released. Some stylistic changes as well.

Enjoy :)
@
text
@d4 1
a4 1
SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
d16 1
a16 1
	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
@


1.9
log
@Fix kldloading if_em by compiling missing source file.
@
text
@d8 1
a8 1
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
@


1.9.2.1
log
@MFC of the new em/igb from HEAD
@
text
@d8 1
a8 1
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c
d10 1
a10 1
CFLAGS+= -DNO_82575_SUPPORT -I${.CURDIR}/../../dev/em
d12 1
a12 5
# Uncomment this to disable Fast interrupt handling.
# and enable legacy interrupt handling
#CFLAGS  += -DEM_LEGACY_IRQ

# DEVICE_POLLING gives you non-interrupt handling
@


1.9.2.2
log
@SVN rev 181599 on 2008-08-11 18:45:51Z by jfv

MFC of the new em/igb driver reorg, sources for both drivers
now reside in dev/e1000 so static kernel build works correctly
but loadable modules still build in independent directories as
before.
@
text
@d2 1
a2 1
.PATH:  ${.CURDIR}/../../dev/e1000
d4 1
a4 1
SRCS    = device_if.h bus_if.h pci_if.h
a8 1
SHARED_SRCS += e1000_82575.c 
d10 1
a10 1
CFLAGS+= -I${.CURDIR}/../../dev/e1000
d12 5
a16 1
# DEVICE_POLLING gives you Legacy interrupt handling
d20 1
a20 1
	rm -f device_if.h bus_if.h pci_if.h setdef*
@


1.9.2.3
log
@SVN rev 208105 on 2010-05-14 22:39:51Z by jfv

MFC the new em/lem/igb drivers for stable/7
@
text
@d4 6
a9 10
SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
SRCS    += $(CORE_SRC) $(LEGACY_SRC)
SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
CORE_SRC = if_em.c e1000_osdep.c
# This is the Legacy, pre-PCIE source, it can be
# undefined when using modular driver if not needed
LEGACY_SRC    += if_lem.c
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c
d11 1
a11 1
CFLAGS += -I${.CURDIR}/../../dev/e1000
d13 1
a13 1
# DEVICE_POLLING for a non-interrupt-driven method
@


1.9.2.4
log
@SVN rev 213213 on 2010-09-27 17:38:30Z by yongari

MFC r211400:
  Remove unnecessary clean target in em(4), igb(4) and ixgbe(4).
  While here also remove man target in igb(4).

  Reviewed by:	jfv
@
text
@d20 6
@


1.9.2.5
log
@SVN rev 215922 on 2010-11-27 01:09:54Z by jfv

MFC: r214646, r215781, r215789, 215808
     Brings 7.4 e1000 drivers to the same level as 8.2
@
text
@d11 1
a11 2
COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c \
		e1000_manage.c e1000_vf.c e1000_mbx.c
@


1.9.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/em/Makefile 215922 2010-11-27 01:09:54Z jfv $
@


1.9.2.5.2.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.9.2.5.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/em/Makefile 215922 2010-11-27 01:09:54Z jfv $
@


1.9.2.2.6.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.9.2.2.4.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.9.2.2.2.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.8
log
@Place a '#' at the front of the line holding a $FreeBSD$ ID tag.  While
it actually compiles without this, it's still a good idea.
@
text
@d8 1
a8 1
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c
@


1.7
log
@Absolute pathname in the Makefile was broken, this
version should work correctly.
@
text
@d1 1
a1 1
$FreeBSD$
@


1.6
log
@Merge in the new driver (6.5.0) of Intel. This has a new
shared code infrastructure that is family specific and
modular. There is also support for our latest gigabit
nic, the 82575 that is MSI/X and multiqueue capable.

The new shared code changes some interfaces to the core
code but testing at Intel has been going on for months,
it is fairly stable.

I have attempted to be careful in retaining any fixes that
CURRENT had and we did not, I apologize in advance if any
thing gets clobbered, I'm sure I'll hear about it :)

Approved by pdeuskar
@
text
@d10 1
a10 3
# NOTE: this absolute path is somewhat of a hack, but necessary for
# the new shared code
CFLAGS  += -I/usr/src/sys/dev/em
@


1.5
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
@d1 8
a8 1
#$FreeBSD$
d10 3
a12 1
.PATH: ${.CURDIR}/../../dev/em
d14 8
a21 3
KMOD=	if_em
SRCS=	if_em.c if_em_hw.c
SRCS+=	device_if.h bus_if.h pci_if.h
@


1.4
log
@style.Makefile(5)
@
text
@d7 1
a7 1
SRCS+=	device_if.h bus_if.h pci_if.h opt_bdg.h
@


1.4.6.1
log
@MFC of Intel driver version 6.6.6
This adds our new modular shared code, support for MSI/MSIX, hardware
support for newer adapters, and a variety of bug fixes.
@
text
@d1 1
a1 8
# $FreeBSD$
.PATH:  ${.CURDIR}/../../dev/em
KMOD    = if_em
SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
SRCS    += if_em.c $(SHARED_SRCS)
SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
d3 1
a3 1
CFLAGS+= -I${.CURDIR}/../../dev/em
d5 3
a7 8
# DEVICE_POLLING gives you Legacy interrupt handling
#CFLAGS  += -DDEVICE_POLLING

clean:
	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
	rm -f *.o *.kld *.ko
	rm -f @@ machine
	rm -f ${CLEANFILES}
@


1.4.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/em/Makefile 172455 2007-10-05 22:49:08Z jfv $
@


1.4.6.1.4.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.4.2.1
log
@Since em(4) is very popular and does not use miibus(4) add special hack
under #ifdef DEV_CARP, which calls carp_carpdev_state() when link goes
up or down.

Approved by:	re (kensmith)
@
text
@d7 1
a7 1
SRCS+=	device_if.h bus_if.h pci_if.h opt_bdg.h opt_carp.h
@


1.3
log
@Don't roll our own clean target, the default one
works better.
@
text
@d2 6
a7 4
.PATH:  ${.CURDIR}/../../dev/em
KMOD    = if_em
SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
SRCS    += if_em.c if_em_hw.c
@


1.2
log
@Added support for 82545EM and 82546EB based adapters.
Added Vlan support.

MFC after:	1 week
@
text
@a6 5
clean:
	rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
	rm -f *.o *.kld *.ko
	rm -f @@ machine

@


1.1
log
@This is the first commit of the Intel gigabit driver for
PRO/1000 cards.

Submitted by:Prafulla Deuskar
Reviewed by: Paul Saab
MFC after:1 week
@
text
@d1 5
a5 6
# $FreeBSD$

.PATH:	${.CURDIR}/../../dev/em
KMOD	= if_em
SRCS	= device_if.h bus_if.h pci_if.h opt_bdg.h
SRCS    += if_em.c if_em_fxhw.c if_em_phy.c
@


1.1.2.1
log
@MFC: Intel Gigabit driver (em) for PRO/1000 series of cards
@
text
@d1 2
a2 1
#$FreeBSD$
@


1.1.2.2
log
@MFC:
- Added support for receive in multiple
    descriptors. This simplifies code for jumbo frames.
- Cleaned up coding conventions to make code more unix-like.
- Cleaned up code in if_em_fxhw.c and if_em_phy.c.
    Added relevant comments.
@
text
@d1 1
a1 2
# $FreeBSD$

@


1.1.2.3
log
@Added support for 82545EM and 82546EB based adapters.
Added Vlan support.
Added new reference and removed reference to unneeded files
from conf files.
@
text
@d1 6
a6 5
#$FreeBSD$
.PATH:  ${.CURDIR}/../../dev/em
KMOD    = if_em
SRCS    = device_if.h bus_if.h pci_if.h opt_bdg.h
SRCS    += if_em.c if_em_hw.c
@


1.1.2.4
log
@Switch importer
@
text
@d1 1
a1 1
#$FreeBSD: stable/4/sys/modules/em/Makefile 98400 2002-06-18 21:00:56Z pdeuskar $
@


