| if_iwnvar.h (220674) | if_iwnvar.h (220723) |
|---|---|
| 1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 220674 2011-04-15 20:31:02Z bschmidt $ */ | 1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 220723 2011-04-16 14:36:43Z bschmidt $ */ |
| 2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */ 3 4/*- 5 * Copyright (c) 2007, 2008 6 * Damien Bergamini <damien.bergamini@free.fr> 7 * Copyright (c) 2008 Sam Leffler, Errno Consulting 8 * 9 * Permission to use, copy, modify, and distribute this software for any --- 186 unchanged lines hidden (view full) --- 196 uint8_t iv_ridx; 197 198 int (*iv_newstate)(struct ieee80211vap *, 199 enum ieee80211_state, int); 200}; 201#define IWN_VAP(_vap) ((struct iwn_vap *)(_vap)) 202 203struct iwn_softc { | 2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */ 3 4/*- 5 * Copyright (c) 2007, 2008 6 * Damien Bergamini <damien.bergamini@free.fr> 7 * Copyright (c) 2008 Sam Leffler, Errno Consulting 8 * 9 * Permission to use, copy, modify, and distribute this software for any --- 186 unchanged lines hidden (view full) --- 196 uint8_t iv_ridx; 197 198 int (*iv_newstate)(struct ieee80211vap *, 199 enum ieee80211_state, int); 200}; 201#define IWN_VAP(_vap) ((struct iwn_vap *)(_vap)) 202 203struct iwn_softc { |
| 204 device_t sc_dev; 205 |
|
| 204 struct ifnet *sc_ifp; 205 int sc_debug; 206 207 /* Locks */ 208 struct mtx sc_mtx; 209 | 206 struct ifnet *sc_ifp; 207 int sc_debug; 208 209 /* Locks */ 210 struct mtx sc_mtx; 211 |
| 210 /* Bus */ 211 device_t sc_dev; 212 int mem_rid; 213 int irq_rid; 214 struct resource *mem; 215 struct resource *irq; 216 | |
| 217 u_int sc_flags; 218#define IWN_FLAG_HAS_OTPROM (1 << 1) 219#define IWN_FLAG_CALIB_DONE (1 << 2) 220#define IWN_FLAG_USE_ICT (1 << 3) 221#define IWN_FLAG_INTERNAL_PA (1 << 4) 222 223 uint8_t hw_type; 224 const struct iwn_hal *sc_hal; --- 19 unchanged lines hidden (view full) --- 244 struct iwn_dma_info ict_dma; 245 uint32_t *ict; 246 int ict_cur; 247 248 /* TX/RX rings. */ 249 struct iwn_tx_ring txq[IWN5000_NTXQUEUES]; 250 struct iwn_rx_ring rxq; 251 | 212 u_int sc_flags; 213#define IWN_FLAG_HAS_OTPROM (1 << 1) 214#define IWN_FLAG_CALIB_DONE (1 << 2) 215#define IWN_FLAG_USE_ICT (1 << 3) 216#define IWN_FLAG_INTERNAL_PA (1 << 4) 217 218 uint8_t hw_type; 219 const struct iwn_hal *sc_hal; --- 19 unchanged lines hidden (view full) --- 239 struct iwn_dma_info ict_dma; 240 uint32_t *ict; 241 int ict_cur; 242 243 /* TX/RX rings. */ 244 struct iwn_tx_ring txq[IWN5000_NTXQUEUES]; 245 struct iwn_rx_ring rxq; 246 |
| 247 int mem_rid; 248 struct resource *mem; |
|
| 252 bus_space_tag_t sc_st; 253 bus_space_handle_t sc_sh; | 249 bus_space_tag_t sc_st; 250 bus_space_handle_t sc_sh; |
| 251 int irq_rid; 252 struct resource *irq; |
|
| 254 void *sc_ih; 255 bus_size_t sc_sz; 256 int sc_cap_off; /* PCIe Capabilities. */ 257 258 /* Tasks used by the driver */ 259 struct task sc_reinit_task; 260 struct task sc_radioon_task; 261 struct task sc_radiooff_task; --- 55 unchanged lines hidden --- | 253 void *sc_ih; 254 bus_size_t sc_sz; 255 int sc_cap_off; /* PCIe Capabilities. */ 256 257 /* Tasks used by the driver */ 258 struct task sc_reinit_task; 259 struct task sc_radioon_task; 260 struct task sc_radiooff_task; --- 55 unchanged lines hidden --- |