Deleted Added
sdiff udiff text old ( 286410 ) new ( 286437 )
full compact
if_ndisvar.h (286410) if_ndisvar.h (286437)
1/*-
2 * Copyright (c) 2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/dev/if_ndis/if_ndisvar.h 286410 2015-08-07 11:43:14Z glebius $
32 * $FreeBSD: head/sys/dev/if_ndis/if_ndisvar.h 286437 2015-08-08 01:10:17Z adrian $
33 */
34
35#define NDIS_DEFAULT_NODENAME "FreeBSD NDIS node"
36#define NDIS_NODENAME_LEN 32
37
38/* For setting/getting OIDs from userspace. */
39
40struct ndis_oid_data {

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

147#define NDISUSB_TASK_TSTART 0
148#define NDISUSB_TASK_IRPCANCEL 1
149#define NDISUSB_TASK_VENDOR 2
150 void *nt_ctx;
151 list_entry nt_tasklist;
152};
153
154struct ndis_softc {
33 */
34
35#define NDIS_DEFAULT_NODENAME "FreeBSD NDIS node"
36#define NDIS_NODENAME_LEN 32
37
38/* For setting/getting OIDs from userspace. */
39
40struct ndis_oid_data {

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

147#define NDISUSB_TASK_TSTART 0
148#define NDISUSB_TASK_IRPCANCEL 1
149#define NDISUSB_TASK_VENDOR 2
150 void *nt_ctx;
151 list_entry nt_tasklist;
152};
153
154struct ndis_softc {
155 u_int ndis_80211:1,
156 ndis_link:1,
157 ndis_running:1;
158 union {
159 struct { /* Ethernet */
160 struct ifnet *ifp;
161 struct ifmedia ifmedia;
162 int ndis_if_flags;
163 };
164 struct { /* Wireless */
165 struct ieee80211com ndis_ic;
166 struct callout ndis_scan_callout;
167 int (*ndis_newstate)(struct ieee80211com *,
168 enum ieee80211_state, int);
169 };
170 };
155 struct ifnet *ifp;
156 struct ifmedia ifmedia; /* media info */
171 u_long ndis_hwassist;
172 uint32_t ndis_v4tx;
173 uint32_t ndis_v4rx;
174 bus_space_handle_t ndis_bhandle;
175 bus_space_tag_t ndis_btag;
176 void *ndis_intrhand;
177 struct resource *ndis_irq;
178 struct resource *ndis_res;

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

189 int ndis_rescnt;
190 struct mtx ndis_mtx;
191 uint8_t ndis_irql;
192 device_t ndis_dev;
193 int ndis_unit;
194 ndis_miniport_block *ndis_block;
195 ndis_miniport_characteristics *ndis_chars;
196 interface_type ndis_type;
157 u_long ndis_hwassist;
158 uint32_t ndis_v4tx;
159 uint32_t ndis_v4rx;
160 bus_space_handle_t ndis_bhandle;
161 bus_space_tag_t ndis_btag;
162 void *ndis_intrhand;
163 struct resource *ndis_irq;
164 struct resource *ndis_res;

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

175 int ndis_rescnt;
176 struct mtx ndis_mtx;
177 uint8_t ndis_irql;
178 device_t ndis_dev;
179 int ndis_unit;
180 ndis_miniport_block *ndis_block;
181 ndis_miniport_characteristics *ndis_chars;
182 interface_type ndis_type;
183 struct callout ndis_scan_callout;
197 struct callout ndis_stat_callout;
198 int ndis_maxpkts;
199 ndis_oid *ndis_oids;
200 int ndis_oidcnt;
201 int ndis_txidx;
202 int ndis_txpending;
203 ndis_packet **ndis_txarray;
204 ndis_handle ndis_txpool;
205 int ndis_sc;
206 ndis_cfg *ndis_regvals;
207 struct nch ndis_cfglist_head;
184 struct callout ndis_stat_callout;
185 int ndis_maxpkts;
186 ndis_oid *ndis_oids;
187 int ndis_oidcnt;
188 int ndis_txidx;
189 int ndis_txpending;
190 ndis_packet **ndis_txarray;
191 ndis_handle ndis_txpool;
192 int ndis_sc;
193 ndis_cfg *ndis_regvals;
194 struct nch ndis_cfglist_head;
195 int ndis_80211;
196 int ndis_link;
208 uint32_t ndis_sts;
209 uint32_t ndis_filter;
197 uint32_t ndis_sts;
198 uint32_t ndis_filter;
199 int ndis_if_flags;
210 int ndis_skip;
200 int ndis_skip;
201
211 int ndis_devidx;
212 interface_type ndis_iftype;
213 driver_object *ndis_dobj;
214 io_workitem *ndis_tickitem;
215 io_workitem *ndis_startitem;
216 io_workitem *ndis_resetitem;
217 io_workitem *ndis_inputitem;
218 kdpc ndis_rxdpc;
219 bus_dma_tag_t ndis_parent_tag;
220 list_entry ndis_shlist;
221 bus_dma_tag_t ndis_mtag;
222 bus_dma_tag_t ndis_ttag;
223 bus_dmamap_t *ndis_mmaps;
224 bus_dmamap_t *ndis_tmaps;
225 int ndis_mmapcnt;
226 struct ndis_evt ndis_evt[NDIS_EVENTS];
227 int ndis_evtpidx;
228 int ndis_evtcidx;
202 int ndis_devidx;
203 interface_type ndis_iftype;
204 driver_object *ndis_dobj;
205 io_workitem *ndis_tickitem;
206 io_workitem *ndis_startitem;
207 io_workitem *ndis_resetitem;
208 io_workitem *ndis_inputitem;
209 kdpc ndis_rxdpc;
210 bus_dma_tag_t ndis_parent_tag;
211 list_entry ndis_shlist;
212 bus_dma_tag_t ndis_mtag;
213 bus_dma_tag_t ndis_ttag;
214 bus_dmamap_t *ndis_mmaps;
215 bus_dmamap_t *ndis_tmaps;
216 int ndis_mmapcnt;
217 struct ndis_evt ndis_evt[NDIS_EVENTS];
218 int ndis_evtpidx;
219 int ndis_evtcidx;
229 struct mbufq ndis_rxqueue;
220 struct ifqueue ndis_rxqueue;
230 kspin_lock ndis_rxlock;
231
221 kspin_lock ndis_rxlock;
222
223 int (*ndis_newstate)(struct ieee80211com *,
224 enum ieee80211_state, int);
232 int ndis_tx_timer;
233 int ndis_hang_timer;
234
235 struct usb_device *ndisusb_dev;
236 struct mtx ndisusb_mtx;
237 struct ndisusb_ep ndisusb_dread_ep;
238 struct ndisusb_ep ndisusb_dwrite_ep;
239#define NDISUSB_GET_ENDPT(addr) \

--- 21 unchanged lines hidden --- 		225 int ndis_tx_timer;
226 int ndis_hang_timer;
227
228 struct usb_device *ndisusb_dev;
229 struct mtx ndisusb_mtx;
230 struct ndisusb_ep ndisusb_dread_ep;
231 struct ndisusb_ep ndisusb_dwrite_ep;
232#define NDISUSB_GET_ENDPT(addr) \

--- 21 unchanged lines hidden ---