svn commit: r299596 - in head/sys: dev/sfxge/common modules/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Fri May 13 06:54:18 2016
New Revision: 299596
URL: https://svnweb.freebsd.org/changeset/base/299596

Log:
  sfxge(4): move ef10_ev_* to ef10_ev.c
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Added:
  head/sys/dev/sfxge/common/ef10_ev.c
     - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_ev.c
Deleted:
  head/sys/dev/sfxge/common/hunt_ev.c
Modified:
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_ev.c (from r299592, head/sys/dev/sfxge/common/hunt_ev.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_ev.c	Fri May 13 06:26:42 2016	(r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_ev.c	Fri May 13 06:54:18 2016	(r299596)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include "mcdi_mon.h"
 #endif
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 #if EFSYS_OPT_QSTATS
 #define	EFX_EV_QSTAT_INCR(_eep, _stat)					\
@@ -985,4 +985,4 @@ ef10_ev_rxlabel_fini(
 	eersp->eers_rx_mask = 0;
 }
 
-#endif	/* EFSYS_OPT_HUNTINGTON */
+#endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 13 06:47:47 2016	(r299595)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 06:54:18 2016	(r299596)
@@ -29,9 +29,10 @@ SRCS+=	siena_mac.c siena_mcdi.c siena_ni
 SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
+SRCS+=	ef10_ev.c
 SRCS+=	ef10_impl.h
 
-SRCS+=	hunt_ev.c hunt_intr.c hunt_mac.c hunt_mcdi.c hunt_nic.c
+SRCS+=	hunt_intr.c hunt_mac.c hunt_mcdi.c hunt_nic.c
 SRCS+=	hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
 SRCS+=	hunt_filter.c
 SRCS+=	hunt_impl.h