Deleted Added
full compact
if_fxpvar.h (29681) if_fxpvar.h (29974)
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 * $Id: if_fxpvar.h,v 1.1 1997/09/05 10:23:58 davidg Exp $
30 * $Id: if_fxpvar.h,v 1.2 1997/09/21 22:02:09 gibbs Exp $
31 */
32
33/*
34 * Misc. defintions for the Intel EtherExpress Pro/100B PCI Fast
35 * Ethernet driver
36 */
37
38struct fxp_softc {

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

54 struct mbuf *rfa_tailm; /* last mbuf in receive frame area */
55 struct fxp_stats *fxp_stats; /* Pointer to interface stats */
56 struct callout_handle stat_ch; /* Handle for canceling our stat timeout */
57 int tx_queued; /* # of active TxCB's */
58 int promisc_mode; /* promiscuous mode enabled */
59 int phy_primary_addr; /* address of primary PHY */
60 int phy_primary_device; /* device type of primary PHY */
61 int phy_10Mbps_only; /* PHY is 10Mbps-only device */
31 */
32
33/*
34 * Misc. defintions for the Intel EtherExpress Pro/100B PCI Fast
35 * Ethernet driver
36 */
37
38struct fxp_softc {

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

54 struct mbuf *rfa_tailm; /* last mbuf in receive frame area */
55 struct fxp_stats *fxp_stats; /* Pointer to interface stats */
56 struct callout_handle stat_ch; /* Handle for canceling our stat timeout */
57 int tx_queued; /* # of active TxCB's */
58 int promisc_mode; /* promiscuous mode enabled */
59 int phy_primary_addr; /* address of primary PHY */
60 int phy_primary_device; /* device type of primary PHY */
61 int phy_10Mbps_only; /* PHY is 10Mbps-only device */
62 int rx_idle_secs; /* # of seconds RX has been idle */
63 int need_mcsetup; /* multicast filter needs programming */
64 int all_mcasts; /* receive all multicasts */
65 struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */
62};
63
64/* Macros to ease CSR access. */
65#if defined(__NetBSD__)
66#define CSR_READ_1(sc, reg) \
67 bus_space_read_1((sc)->sc_st, (sc)->sc_sh, (reg))
68#define CSR_READ_2(sc, reg) \
69 bus_space_read_2((sc)->sc_st, (sc)->sc_sh, (reg))

--- 39 unchanged lines hidden ---
66};
67
68/* Macros to ease CSR access. */
69#if defined(__NetBSD__)
70#define CSR_READ_1(sc, reg) \
71 bus_space_read_1((sc)->sc_st, (sc)->sc_sh, (reg))
72#define CSR_READ_2(sc, reg) \
73 bus_space_read_2((sc)->sc_st, (sc)->sc_sh, (reg))

--- 39 unchanged lines hidden ---