Deleted Added
full compact
if_etvar.h (199548) if_etvar.h (199552)
1/*-
2 * Copyright (c) 2007 The DragonFly Project. All rights reserved.
3 *
4 * This code is derived from software contributed to The DragonFly Project
5 * by Sepherosa Ziehau <sepherosa@gmail.com>
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

27 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
29 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
31 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $DragonFly: src/sys/dev/netif/et/if_etvar.h,v 1.4 2007/10/23 14:28:42 sephe Exp $
1/*-
2 * Copyright (c) 2007 The DragonFly Project. All rights reserved.
3 *
4 * This code is derived from software contributed to The DragonFly Project
5 * by Sepherosa Ziehau <sepherosa@gmail.com>
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

27 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
29 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
31 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $DragonFly: src/sys/dev/netif/et/if_etvar.h,v 1.4 2007/10/23 14:28:42 sephe Exp $
35 * $FreeBSD: head/sys/dev/et/if_etvar.h 199548 2009-11-19 20:57:35Z yongari $
35 * $FreeBSD: head/sys/dev/et/if_etvar.h 199552 2009-11-19 21:45:06Z yongari $
36 */
37
38#ifndef _IF_ETVAR_H
39#define _IF_ETVAR_H
40
41/* DragonFly compatibility */
42#define EVL_ENCAPLEN ETHER_VLAN_ENCAP_LEN
43

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

233 bus_space_tag_t sc_mem_bt;
234 void *sc_irq_handle;
235 struct resource *sc_irq_res;
236 struct resource *sc_mem_res;
237
238 struct arpcom arpcom;
239 int sc_if_flags;
240 uint32_t sc_flags; /* ET_FLAG_ */
36 */
37
38#ifndef _IF_ETVAR_H
39#define _IF_ETVAR_H
40
41/* DragonFly compatibility */
42#define EVL_ENCAPLEN ETHER_VLAN_ENCAP_LEN
43

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

233 bus_space_tag_t sc_mem_bt;
234 void *sc_irq_handle;
235 struct resource *sc_irq_res;
236 struct resource *sc_mem_res;
237
238 struct arpcom arpcom;
239 int sc_if_flags;
240 uint32_t sc_flags; /* ET_FLAG_ */
241 int sc_expcap;
241
242 int sc_mem_rid;
243
244 int sc_irq_rid;
245
246 struct callout sc_tick;
247
248 int watchdog_timer;

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

272 int sc_tx_intr_nsegs;
273 uint32_t sc_timer;
274};
275
276#define ET_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
277#define ET_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
278#define ET_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
279
242
243 int sc_mem_rid;
244
245 int sc_irq_rid;
246
247 struct callout sc_tick;
248
249 int watchdog_timer;

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

273 int sc_tx_intr_nsegs;
274 uint32_t sc_timer;
275};
276
277#define ET_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
278#define ET_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
279#define ET_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
280
280#define ET_FLAG_TXRX_ENABLED 0x1
281#define ET_FLAG_JUMBO 0x2
281#define ET_FLAG_PCIE 0x0001
282#define ET_FLAG_MSI 0x0002
283#define ET_FLAG_TXRX_ENABLED 0x0100
284#define ET_FLAG_JUMBO 0x0200
282
283#endif /* !_IF_ETVAR_H */
285
286#endif /* !_IF_ETVAR_H */