| if_iwnvar.h (220633) | if_iwnvar.h (220667) |
|---|---|
| 1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 220633 2011-04-14 17:19:33Z bschmidt $ */ | 1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 220667 2011-04-15 20:17:52Z 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 --- 245 unchanged lines hidden (view full) --- 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; 262 | 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 --- 245 unchanged lines hidden (view full) --- 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; 262 |
| 263 struct callout calib_to; |
|
| 263 int calib_cnt; 264 struct iwn_calib_state calib; | 264 int calib_cnt; 265 struct iwn_calib_state calib; |
| 266 struct callout watchdog_to; |
|
| 265 u_int calib_init; 266 u_int calib_runtime; 267#define IWN_CALIB_XTAL (1 << IWN_CALIB_IDX_XTAL) 268#define IWN_CALIB_DC (1 << IWN_CALIB_IDX_DC) 269#define IWN_CALIB_LO (1 << IWN_CALIB_IDX_LO) 270#define IWN_CALIB_TX_IQ (1 << IWN_CALIB_IDX_TX_IQ) 271#define IWN_CALIB_TX_IQ_PERIODIC (1 << IWN_CALIB_IDX_TX_IQ_PERIODIC) 272#define IWN_CALIB_BASE_BAND (1 << IWN_CALIB_IDX_BASE_BAND) --- 34 unchanged lines hidden (view full) --- 307 int32_t temp_off; 308 uint32_t int_mask; 309 uint8_t ntxchains; 310 uint8_t nrxchains; 311 uint8_t txchainmask; 312 uint8_t rxchainmask; 313 uint8_t chainmask; 314 | 267 u_int calib_init; 268 u_int calib_runtime; 269#define IWN_CALIB_XTAL (1 << IWN_CALIB_IDX_XTAL) 270#define IWN_CALIB_DC (1 << IWN_CALIB_IDX_DC) 271#define IWN_CALIB_LO (1 << IWN_CALIB_IDX_LO) 272#define IWN_CALIB_TX_IQ (1 << IWN_CALIB_IDX_TX_IQ) 273#define IWN_CALIB_TX_IQ_PERIODIC (1 << IWN_CALIB_IDX_TX_IQ_PERIODIC) 274#define IWN_CALIB_BASE_BAND (1 << IWN_CALIB_IDX_BASE_BAND) --- 34 unchanged lines hidden (view full) --- 309 int32_t temp_off; 310 uint32_t int_mask; 311 uint8_t ntxchains; 312 uint8_t nrxchains; 313 uint8_t txchainmask; 314 uint8_t rxchainmask; 315 uint8_t chainmask; 316 |
| 315 struct callout sc_timer_to; | |
| 316 int sc_tx_timer; 317 318 struct iwn_rx_radiotap_header sc_rxtap; 319 struct iwn_tx_radiotap_header sc_txtap; 320}; 321 322#define IWN_LOCK_INIT(_sc) \ 323 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \ 324 MTX_NETWORK_LOCK, MTX_DEF) 325#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) 326#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) 327#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) 328#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) | 317 int sc_tx_timer; 318 319 struct iwn_rx_radiotap_header sc_rxtap; 320 struct iwn_tx_radiotap_header sc_txtap; 321}; 322 323#define IWN_LOCK_INIT(_sc) \ 324 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \ 325 MTX_NETWORK_LOCK, MTX_DEF) 326#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) 327#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) 328#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) 329#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) |