Deleted Added
full compact
if_epvar.h (139749) if_epvar.h (140523)
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 139749 2005-01-06 01:43:34Z imp $
22 * $FreeBSD: head/sys/dev/ep/if_epvar.h 140523 2005-01-20 19:39:33Z 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};

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

74};
75
76int ep_alloc(device_t);
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 *);
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};

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

74};
75
76int ep_alloc(device_t);
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 *);
82int get_e(struct ep_softc *, uint16_t, uint16_t *);
83int ep_get_macaddr(struct ep_softc *, u_char *);
84
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) \
88 bus_space_write_1(sc->bst, sc->bsh, off, val)
89#define CSR_WRITE_2(sc, off, val) \
90 bus_space_write_2(sc->bst, sc->bsh, off, val)

--- 21 unchanged lines hidden ---
83int ep_get_macaddr(struct ep_softc *, u_char *);
84
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) \
88 bus_space_write_1(sc->bst, sc->bsh, off, val)
89#define CSR_WRITE_2(sc, off, val) \
90 bus_space_write_2(sc->bst, sc->bsh, off, val)

--- 21 unchanged lines hidden ---