Deleted Added
full compact
if_epvar.h (121249) if_epvar.h (121492)
1/*
2 * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met: 1. Redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer. 2. The name
8 * of the author may not be used to endorse or promote products derived from

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

14 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
15 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
16 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
17 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
18 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
19 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
20 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21 *
1/*
2 * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met: 1. Redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer. 2. The name
8 * of the author may not be used to endorse or promote products derived from

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

14 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
15 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
16 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
17 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
18 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
19 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
20 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21 *
22 * $FreeBSD: head/sys/dev/ep/if_epvar.h 121249 2003-10-19 17:38:04Z imp $
22 * $FreeBSD: head/sys/dev/ep/if_epvar.h 121492 2003-10-25 04:09:49Z imp $
23 */
24
25struct ep_board {
26 u_short prod_id; /* product ID */
27 int cmd_off; /* command offset (bit shift) */
28 int mii_trans; /* activate MII transiever */
29 u_short res_cfg; /* resource configuration */
30};
31
32/*
33 * Ethernet software status per interface.
34 */
35struct ep_softc {
36 struct arpcom arpcom; /* Ethernet common part */
37 struct ifmedia ifmedia; /* media info */
38
39 device_t dev;
40
23 */
24
25struct ep_board {
26 u_short prod_id; /* product ID */
27 int cmd_off; /* command offset (bit shift) */
28 int mii_trans; /* activate MII transiever */
29 u_short res_cfg; /* resource configuration */
30};
31
32/*
33 * Ethernet software status per interface.
34 */
35struct ep_softc {
36 struct arpcom arpcom; /* Ethernet common part */
37 struct ifmedia ifmedia; /* media info */
38
39 device_t dev;
40
41 struct mtx sc_mtx;
41 struct resource *iobase;
42 struct resource *irq;
43
44 bus_space_handle_t bsh;
45 bus_space_tag_t bst;
46 void *ep_intrhand;
47
48 u_short ep_connectors; /* Connectors on this card. */

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

76void ep_free(device_t);
77int ep_detach(device_t);
78void ep_get_media(struct ep_softc *);
79int ep_attach(struct ep_softc *);
80void ep_intr(void *);
81int get_e(struct ep_softc *, u_int16_t, u_int16_t *);
82int ep_get_macaddr(struct ep_softc *, u_char *);
83
42 struct resource *iobase;
43 struct resource *irq;
44
45 bus_space_handle_t bsh;
46 bus_space_tag_t bst;
47 void *ep_intrhand;
48
49 u_short ep_connectors; /* Connectors on this card. */

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

77void ep_free(device_t);
78int ep_detach(device_t);
79void ep_get_media(struct ep_softc *);
80int ep_attach(struct ep_softc *);
81void ep_intr(void *);
82int get_e(struct ep_softc *, u_int16_t, u_int16_t *);
83int ep_get_macaddr(struct ep_softc *, u_char *);
84
84#define EP_READ_1(sc, off) (bus_space_read_1((sc)->bst, (sc)->bsh, off))
85#define EP_READ_2(sc, off) (bus_space_read_2((sc)->bst, (sc)->bsh, off))
86#define EP_WRITE_1(sc, off, val) \
85#define CSR_READ_1(sc, off) (bus_space_read_1((sc)->bst, (sc)->bsh, off))
86#define CSR_READ_2(sc, off) (bus_space_read_2((sc)->bst, (sc)->bsh, off))
87#define CSR_WRITE_1(sc, off, val) \
87 bus_space_write_1(sc->bst, sc->bsh, off, val)
88 bus_space_write_1(sc->bst, sc->bsh, off, val)
88#define EP_WRITE_2(sc, off, val) \
89#define CSR_WRITE_2(sc, off, val) \
89 bus_space_write_2(sc->bst, sc->bsh, off, val)
90 bus_space_write_2(sc->bst, sc->bsh, off, val)
90#define EP_WRITE_MULTI_1(sc, off, addr, count) \
91#define CSR_WRITE_MULTI_1(sc, off, addr, count) \
91 bus_space_write_multi_1(sc->bst, sc->bsh, off, addr, count)
92 bus_space_write_multi_1(sc->bst, sc->bsh, off, addr, count)
92#define EP_WRITE_MULTI_2(sc, off, addr, count) \
93#define CSR_WRITE_MULTI_2(sc, off, addr, count) \
93 bus_space_write_multi_2(sc->bst, sc->bsh, off, addr, count)
94 bus_space_write_multi_2(sc->bst, sc->bsh, off, addr, count)
94#define EP_WRITE_MULTI_4(sc, off, addr, count) \
95#define CSR_WRITE_MULTI_4(sc, off, addr, count) \
95 bus_space_write_multi_4(sc->bst, sc->bsh, off, addr, count)
96 bus_space_write_multi_4(sc->bst, sc->bsh, off, addr, count)
96#define EP_READ_MULTI_1(sc, off, addr, count) \
97#define CSR_READ_MULTI_1(sc, off, addr, count) \
97 bus_space_read_multi_1(sc->bst, sc->bsh, off, addr, count)
98 bus_space_read_multi_1(sc->bst, sc->bsh, off, addr, count)
98#define EP_READ_MULTI_2(sc, off, addr, count) \
99#define CSR_READ_MULTI_2(sc, off, addr, count) \
99 bus_space_read_multi_2(sc->bst, sc->bsh, off, addr, count)
100 bus_space_read_multi_2(sc->bst, sc->bsh, off, addr, count)
100#define EP_READ_MULTI_4(sc, off, addr, count) \
101#define CSR_READ_MULTI_4(sc, off, addr, count) \
101 bus_space_read_multi_4(sc->bst, sc->bsh, off, addr, count)
102 bus_space_read_multi_4(sc->bst, sc->bsh, off, addr, count)
103
104#define EP_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
105#define EP_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)