Deleted Added
full compact
rt2860var.h (286437) rt2860var.h (287197)
1/*-
2 * Copyright (c) 2007 Damien Bergamini <damien.bergamini@free.fr>
3 * Copyright (c) 2012 Bernhard Schmidt <bschmidt@FreeBSD.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 *
17 * $OpenBSD: rt2860var.h,v 1.20 2010/09/07 16:21:42 deraadt Exp $
1/*-
2 * Copyright (c) 2007 Damien Bergamini <damien.bergamini@free.fr>
3 * Copyright (c) 2012 Bernhard Schmidt <bschmidt@FreeBSD.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 *
17 * $OpenBSD: rt2860var.h,v 1.20 2010/09/07 16:21:42 deraadt Exp $
18 * $FreeBSD: head/sys/dev/ral/rt2860var.h 286437 2015-08-08 01:10:17Z adrian $
18 * $FreeBSD: head/sys/dev/ral/rt2860var.h 287197 2015-08-27 08:56:39Z glebius $
19 */
20
21#define RT2860_TX_RING_COUNT 64
22#define RT2860_RX_RING_COUNT 128
23#define RT2860_TX_POOL_COUNT (RT2860_TX_RING_COUNT * 2)
24
25#define RT2860_MAX_SCATTER ((RT2860_TX_RING_COUNT * 2) - 1)
26

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

110 struct ieee80211vap ral_vap;
111
112 int (*ral_newstate)(struct ieee80211vap *,
113 enum ieee80211_state, int);
114};
115#define RT2860_VAP(vap) ((struct rt2860_vap *)(vap))
116
117struct rt2860_softc {
19 */
20
21#define RT2860_TX_RING_COUNT 64
22#define RT2860_RX_RING_COUNT 128
23#define RT2860_TX_POOL_COUNT (RT2860_TX_RING_COUNT * 2)
24
25#define RT2860_MAX_SCATTER ((RT2860_TX_RING_COUNT * 2) - 1)
26

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

110 struct ieee80211vap ral_vap;
111
112 int (*ral_newstate)(struct ieee80211vap *,
113 enum ieee80211_state, int);
114};
115#define RT2860_VAP(vap) ((struct rt2860_vap *)(vap))
116
117struct rt2860_softc {
118 struct ifnet *sc_ifp;
118 struct ieee80211com sc_ic;
119 struct mbufq sc_snd;
120 struct mtx sc_mtx;
119 device_t sc_dev;
120 bus_space_tag_t sc_st;
121 bus_space_handle_t sc_sh;
122
121 device_t sc_dev;
122 bus_space_tag_t sc_st;
123 bus_space_handle_t sc_sh;
124
123 struct mtx sc_mtx;
124
125 struct callout watchdog_ch;
126
127 int sc_invalid;
128 int sc_debug;
129/*
130 * The same in both up to here
131 * ------------------------------------------------
132 */
133
134 uint16_t (*sc_srom_read)(struct rt2860_softc *,
135 uint16_t);
136 void (*sc_node_free)(struct ieee80211_node *);
137
138 int sc_flags;
139#define RT2860_ENABLED (1 << 0)
140#define RT2860_ADVANCED_PS (1 << 1)
141#define RT2860_PCIE (1 << 2)
125 struct callout watchdog_ch;
126
127 int sc_invalid;
128 int sc_debug;
129/*
130 * The same in both up to here
131 * ------------------------------------------------
132 */
133
134 uint16_t (*sc_srom_read)(struct rt2860_softc *,
135 uint16_t);
136 void (*sc_node_free)(struct ieee80211_node *);
137
138 int sc_flags;
139#define RT2860_ENABLED (1 << 0)
140#define RT2860_ADVANCED_PS (1 << 1)
141#define RT2860_PCIE (1 << 2)
142#define RT2860_RUNNNING (1 << 3)
142
143 struct ieee80211_node *wcid2ni[RT2860_WCID_MAX];
144
145 struct rt2860_tx_ring txq[6];
146 struct rt2860_rx_ring rxq;
147
148 SLIST_HEAD(, rt2860_tx_data) data_pool;
149 struct rt2860_tx_data data[RT2860_TX_POOL_COUNT];

--- 61 unchanged lines hidden ---
143
144 struct ieee80211_node *wcid2ni[RT2860_WCID_MAX];
145
146 struct rt2860_tx_ring txq[6];
147 struct rt2860_rx_ring rxq;
148
149 SLIST_HEAD(, rt2860_tx_data) data_pool;
150 struct rt2860_tx_data data[RT2860_TX_POOL_COUNT];

--- 61 unchanged lines hidden ---