Deleted Added
full compact
if_mwlvar.h (286410) if_mwlvar.h (286437)
1/*-
2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
3 * Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

22 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
23 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
26 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGES.
29 *
1/*-
2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
3 * Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

22 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
23 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
26 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGES.
29 *
30 * $FreeBSD: head/sys/dev/mwl/if_mwlvar.h 286410 2015-08-07 11:43:14Z glebius $
30 * $FreeBSD: head/sys/dev/mwl/if_mwlvar.h 286437 2015-08-08 01:10:17Z adrian $
31 */
32
33/*
34 * Definitions for the Marvell 88W8363 Wireless LAN controller.
35 */
36#ifndef _DEV_MWL_MVVAR_H
37#define _DEV_MWL_MVVAR_H
38

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

239 int (*mv_newstate)(struct ieee80211vap *,
240 enum ieee80211_state, int);
241 int (*mv_set_tim)(struct ieee80211_node *, int);
242};
243#define MWL_VAP(vap) ((struct mwl_vap *)(vap))
244#define MWL_VAP_CONST(vap) ((const struct mwl_vap *)(vap))
245
246struct mwl_softc {
31 */
32
33/*
34 * Definitions for the Marvell 88W8363 Wireless LAN controller.
35 */
36#ifndef _DEV_MWL_MVVAR_H
37#define _DEV_MWL_MVVAR_H
38

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

239 int (*mv_newstate)(struct ieee80211vap *,
240 enum ieee80211_state, int);
241 int (*mv_set_tim)(struct ieee80211_node *, int);
242};
243#define MWL_VAP(vap) ((struct mwl_vap *)(vap))
244#define MWL_VAP_CONST(vap) ((const struct mwl_vap *)(vap))
245
246struct mwl_softc {
247 struct ieee80211com sc_ic;
248 struct mbufq sc_snd;
247 struct ifnet *sc_ifp; /* interface common */
249 struct mwl_stats sc_stats; /* interface statistics */
250 int sc_debug;
251 device_t sc_dev;
252 bus_dma_tag_t sc_dmat; /* bus DMA tag */
253 bus_space_handle_t sc_io0h; /* BAR 0 */
254 bus_space_tag_t sc_io0t;
255 bus_space_handle_t sc_io1h; /* BAR 1 */
256 bus_space_tag_t sc_io1t;
257 struct mtx sc_mtx; /* master lock (recursive) */
258 struct taskqueue *sc_tq; /* private task queue */
259 struct callout sc_watchdog;
260 int sc_tx_timer;
248 struct mwl_stats sc_stats; /* interface statistics */
249 int sc_debug;
250 device_t sc_dev;
251 bus_dma_tag_t sc_dmat; /* bus DMA tag */
252 bus_space_handle_t sc_io0h; /* BAR 0 */
253 bus_space_tag_t sc_io0t;
254 bus_space_handle_t sc_io1h; /* BAR 1 */
255 bus_space_tag_t sc_io1t;
256 struct mtx sc_mtx; /* master lock (recursive) */
257 struct taskqueue *sc_tq; /* private task queue */
258 struct callout sc_watchdog;
259 int sc_tx_timer;
261 unsigned int sc_running : 1,
262 sc_invalid : 1, /* disable hardware accesses */
260 unsigned int sc_invalid : 1, /* disable hardware accesses */
263 sc_recvsetup:1, /* recv setup */
264 sc_csapending:1,/* 11h channel switch pending */
265 sc_radarena : 1,/* radar detection enabled */
266 sc_rxblocked: 1;/* rx waiting for dma buffers */
267
268 struct mwl_hal *sc_mh; /* h/w access layer */
269 struct mwl_hal_vap *sc_hvap; /* hal vap handle */
270 struct mwl_hal_hwspec sc_hwspecs; /* h/w capabilities */

--- 93 unchanged lines hidden ---
261 sc_recvsetup:1, /* recv setup */
262 sc_csapending:1,/* 11h channel switch pending */
263 sc_radarena : 1,/* radar detection enabled */
264 sc_rxblocked: 1;/* rx waiting for dma buffers */
265
266 struct mwl_hal *sc_mh; /* h/w access layer */
267 struct mwl_hal_vap *sc_hvap; /* hal vap handle */
268 struct mwl_hal_hwspec sc_hwspecs; /* h/w capabilities */

--- 93 unchanged lines hidden ---