Deleted Added
full compact
if_fxpvar.h (58715) if_fxpvar.h (65983)
1/*
2 * Copyright (c) 1995, David Greenman
3 * All rights reserved.
4 *
5 * Modifications to support NetBSD:
6 * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 13 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
1/*
2 * Copyright (c) 1995, David Greenman
3 * All rights reserved.
4 *
5 * Modifications to support NetBSD:
6 * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 13 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * $FreeBSD: head/sys/dev/fxp/if_fxpvar.h 58715 2000-03-28 04:41:42Z dg $
30 * $FreeBSD: head/sys/dev/fxp/if_fxpvar.h 65983 2000-09-17 13:26:25Z cp $
31 */
32
33/*
34 * Misc. defintions for the Intel EtherExpress Pro/100B PCI Fast
35 * Ethernet driver
36 */
37/*
38 * NOTE: Elements are ordered for optimal cacheline behavior, and NOT

--- 4 unchanged lines hidden (view full) ---

43 struct device sc_dev; /* generic device structures */
44 void *sc_ih; /* interrupt handler cookie */
45 struct ethercom sc_ethercom; /* ethernet common part */
46#else
47 struct arpcom arpcom; /* per-interface network data */
48 struct resource *mem; /* resource descriptor for registers */
49 struct resource *irq; /* resource descriptor for interrupt */
50 void *ih; /* interrupt handler cookie */
31 */
32
33/*
34 * Misc. defintions for the Intel EtherExpress Pro/100B PCI Fast
35 * Ethernet driver
36 */
37/*
38 * NOTE: Elements are ordered for optimal cacheline behavior, and NOT

--- 4 unchanged lines hidden (view full) ---

43 struct device sc_dev; /* generic device structures */
44 void *sc_ih; /* interrupt handler cookie */
45 struct ethercom sc_ethercom; /* ethernet common part */
46#else
47 struct arpcom arpcom; /* per-interface network data */
48 struct resource *mem; /* resource descriptor for registers */
49 struct resource *irq; /* resource descriptor for interrupt */
50 void *ih; /* interrupt handler cookie */
51 struct mtx sc_mtx;
51#endif /* __NetBSD__ */
52 bus_space_tag_t sc_st; /* bus space tag */
53 bus_space_handle_t sc_sh; /* bus space handle */
54 struct mbuf *rfa_headm; /* first mbuf in receive frame area */
55 struct mbuf *rfa_tailm; /* last mbuf in receive frame area */
56 struct fxp_cb_tx *cbl_first; /* first active TxCB in list */
57 int tx_queued; /* # of active TxCB's */
58 int need_mcsetup; /* multicast filter needs programming */

--- 28 unchanged lines hidden (view full) ---

87/* Deal with slight differences in software interfaces. */
88#if defined(__NetBSD__)
89#define sc_if sc_ethercom.ec_if
90#define FXP_FORMAT "%s"
91#define FXP_ARGS(sc) (sc)->sc_dev.dv_xname
92#define FXP_INTR_TYPE int
93#define FXP_IOCTLCMD_TYPE u_long
94#define FXP_BPFTAP_ARG(ifp) (ifp)->if_bpf
52#endif /* __NetBSD__ */
53 bus_space_tag_t sc_st; /* bus space tag */
54 bus_space_handle_t sc_sh; /* bus space handle */
55 struct mbuf *rfa_headm; /* first mbuf in receive frame area */
56 struct mbuf *rfa_tailm; /* last mbuf in receive frame area */
57 struct fxp_cb_tx *cbl_first; /* first active TxCB in list */
58 int tx_queued; /* # of active TxCB's */
59 int need_mcsetup; /* multicast filter needs programming */

--- 28 unchanged lines hidden (view full) ---

88/* Deal with slight differences in software interfaces. */
89#if defined(__NetBSD__)
90#define sc_if sc_ethercom.ec_if
91#define FXP_FORMAT "%s"
92#define FXP_ARGS(sc) (sc)->sc_dev.dv_xname
93#define FXP_INTR_TYPE int
94#define FXP_IOCTLCMD_TYPE u_long
95#define FXP_BPFTAP_ARG(ifp) (ifp)->if_bpf
96#define FXP_SPLVAR(x) int x;
97#define FXP_LOCK(sc, x) x = splimp()
98#define FXP_UNLOCK(sc, x) splx(x)
95#else /* __FreeBSD__ */
96#define sc_if arpcom.ac_if
97#define FXP_FORMAT "fxp%d"
98#define FXP_ARGS(sc) (sc)->arpcom.ac_if.if_unit
99#define FXP_INTR_TYPE void
100#define FXP_IOCTLCMD_TYPE u_long
101#define FXP_BPFTAP_ARG(ifp) ifp
99#else /* __FreeBSD__ */
100#define sc_if arpcom.ac_if
101#define FXP_FORMAT "fxp%d"
102#define FXP_ARGS(sc) (sc)->arpcom.ac_if.if_unit
103#define FXP_INTR_TYPE void
104#define FXP_IOCTLCMD_TYPE u_long
105#define FXP_BPFTAP_ARG(ifp) ifp
106#define FXP_SPLVAR(s)
107#define FXP_LOCK(_sc, x) mtx_enter(&(_sc)->sc_mtx, MTX_DEF)
108#define FXP_UNLOCK(_sc, x) mtx_exit(&(_sc)->sc_mtx, MTX_DEF)
102#endif /* __NetBSD__ */
109#endif /* __NetBSD__ */