Deleted Added
full compact
if_gemvar.h (164931) if_gemvar.h (169269)
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 164931 2006-12-06 02:04:25Z marius $
28 * $FreeBSD: head/sys/dev/gem/if_gemvar.h 169269 2007-05-04 19:15:28Z phk $
29 */
30
31#ifndef _IF_GEMVAR_H
32#define _IF_GEMVAR_H
33
34
35#include <sys/queue.h>
36#include <sys/callout.h>

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

128 struct mii_data *sc_mii; /* MII media control */
129 device_t sc_dev; /* generic device information */
130 u_char sc_enaddr[6];
131 struct callout sc_tick_ch; /* tick callout */
132 struct callout sc_rx_ch; /* delayed rx callout */
133 int sc_wdog_timer; /* watchdog timer */
134
135 /* The following bus handles are to be provided by the bus front-end */
29 */
30
31#ifndef _IF_GEMVAR_H
32#define _IF_GEMVAR_H
33
34
35#include <sys/queue.h>
36#include <sys/callout.h>

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

128 struct mii_data *sc_mii; /* MII media control */
129 device_t sc_dev; /* generic device information */
130 u_char sc_enaddr[6];
131 struct callout sc_tick_ch; /* tick callout */
132 struct callout sc_rx_ch; /* delayed rx callout */
133 int sc_wdog_timer; /* watchdog timer */
134
135 /* The following bus handles are to be provided by the bus front-end */
136 bus_space_tag_t sc_bustag; /* bus tag */
136 void *sc_ih;
137 struct resource *sc_res[2];
137 bus_dma_tag_t sc_pdmatag; /* parent bus dma tag */
138 bus_dma_tag_t sc_rdmatag; /* RX bus dma tag */
139 bus_dma_tag_t sc_tdmatag; /* TX bus dma tag */
140 bus_dma_tag_t sc_cdmatag; /* control data bus dma tag */
141 bus_dmamap_t sc_dmamap; /* bus dma handle */
138 bus_dma_tag_t sc_pdmatag; /* parent bus dma tag */
139 bus_dma_tag_t sc_rdmatag; /* RX bus dma tag */
140 bus_dma_tag_t sc_tdmatag; /* TX bus dma tag */
141 bus_dma_tag_t sc_cdmatag; /* control data bus dma tag */
142 bus_dmamap_t sc_dmamap; /* bus dma handle */
142 bus_space_handle_t sc_h; /* bus space handle for all regs */
143
144 int sc_phys[2]; /* MII instance -> PHY map */
145
146 int sc_mif_config; /* Selected MII reg setting */
147
148 int sc_pci; /* XXXXX -- PCI buses are LE. */
149 u_int sc_variant; /* which GEM are we dealing with? */
150#define GEM_UNKNOWN 0 /* don't know */

--- 99 unchanged lines hidden ---
143
144 int sc_phys[2]; /* MII instance -> PHY map */
145
146 int sc_mif_config; /* Selected MII reg setting */
147
148 int sc_pci; /* XXXXX -- PCI buses are LE. */
149 u_int sc_variant; /* which GEM are we dealing with? */
150#define GEM_UNKNOWN 0 /* don't know */

--- 99 unchanged lines hidden ---