Deleted Added
full compact
if_gemvar.h (139749) if_gemvar.h (147256)
1/*-
2 * Copyright (C) 2001 Eduardo Horvath.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp
27 *
1/*-
2 * Copyright (C) 2001 Eduardo Horvath.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp
27 *
28 * $FreeBSD: head/sys/dev/gem/if_gemvar.h 139749 2005-01-06 01:43:34Z imp $
28 * $FreeBSD: head/sys/dev/gem/if_gemvar.h 147256 2005-06-10 16:49:24Z brooks $
29 */
30
31#ifndef _IF_GEMVAR_H
32#define _IF_GEMVAR_H
33
34
35#include <sys/queue.h>
36#include <sys/callout.h>

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

118 bus_dmamap_t rxs_dmamap; /* our DMA map */
119 bus_addr_t rxs_paddr; /* physical address of the segment */
120};
121
122/*
123 * Software state per device.
124 */
125struct gem_softc {
29 */
30
31#ifndef _IF_GEMVAR_H
32#define _IF_GEMVAR_H
33
34
35#include <sys/queue.h>
36#include <sys/callout.h>

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

118 bus_dmamap_t rxs_dmamap; /* our DMA map */
119 bus_addr_t rxs_paddr; /* physical address of the segment */
120};
121
122/*
123 * Software state per device.
124 */
125struct gem_softc {
126 struct arpcom sc_arpcom; /* arp common data */
126 struct ifnet *sc_ifp;
127 device_t sc_miibus;
128 struct mii_data *sc_mii; /* MII media control */
129 device_t sc_dev; /* generic device information */
127 device_t sc_miibus;
128 struct mii_data *sc_mii; /* MII media control */
129 device_t sc_dev; /* generic device information */
130 u_char sc_enaddr[6];
130 struct callout sc_tick_ch; /* tick callout */
131 struct callout sc_rx_ch; /* delayed rx callout */
132
133 /* The following bus handles are to be provided by the bus front-end */
134 bus_space_tag_t sc_bustag; /* bus tag */
135 bus_dma_tag_t sc_pdmatag; /* parent bus dma tag */
136 bus_dma_tag_t sc_rdmatag; /* RX bus dma tag */
137 bus_dma_tag_t sc_tdmatag; /* TX bus dma tag */

--- 101 unchanged lines hidden ---
131 struct callout sc_tick_ch; /* tick callout */
132 struct callout sc_rx_ch; /* delayed rx callout */
133
134 /* The following bus handles are to be provided by the bus front-end */
135 bus_space_tag_t sc_bustag; /* bus tag */
136 bus_dma_tag_t sc_pdmatag; /* parent bus dma tag */
137 bus_dma_tag_t sc_rdmatag; /* RX bus dma tag */
138 bus_dma_tag_t sc_tdmatag; /* TX bus dma tag */

--- 101 unchanged lines hidden ---