Deleted Added
full compact
if_iwnvar.h (257134) if_iwnvar.h (258035)
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 257134 2013-10-25 19:46:52Z adrian $ */
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 258035 2013-11-12 05:58:23Z adrian $ */
2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */
3
4/*-
5 * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>
6 * Copyright (c) 2011 Intel Corporation
7 * Copyright (c) 2007, 2008
8 * Damien Bergamini <damien.bergamini@free.fr>
9 * Copyright (c) 2008 Sam Leffler, Errno Consulting

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

311 struct task sc_radiooff_task;
312
313 struct callout calib_to;
314 int calib_cnt;
315 struct iwn_calib_state calib;
316 struct callout watchdog_to;
317 struct callout ct_kill_exit_to;
318 struct iwn_fw_info fw;
2/* $OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $ */
3
4/*-
5 * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>
6 * Copyright (c) 2011 Intel Corporation
7 * Copyright (c) 2007, 2008
8 * Damien Bergamini <damien.bergamini@free.fr>
9 * Copyright (c) 2008 Sam Leffler, Errno Consulting

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

311 struct task sc_radiooff_task;
312
313 struct callout calib_to;
314 int calib_cnt;
315 struct iwn_calib_state calib;
316 struct callout watchdog_to;
317 struct callout ct_kill_exit_to;
318 struct iwn_fw_info fw;
319 struct iwn_calib_info calibcmd[5];
319 struct iwn_calib_info calibcmd[IWN5000_PHY_CALIB_MAX_RESULT];
320 uint32_t errptr;
321
322 struct iwn_rx_stat last_rx_stat;
323 int last_rx_valid;
324 struct iwn_ucode_info ucode_info;
325 struct iwn_rxon rx_on[IWN_NUM_RXON_CTX];
326 struct iwn_rxon *rxon;
327 int ctx;

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

383 int desired_pwrsave_level;
384
385 /*
386 * The current power save level, this may differ from the
387 * configured value due to thermal throttling etc.
388 */
389 int current_pwrsave_level;
390
320 uint32_t errptr;
321
322 struct iwn_rx_stat last_rx_stat;
323 int last_rx_valid;
324 struct iwn_ucode_info ucode_info;
325 struct iwn_rxon rx_on[IWN_NUM_RXON_CTX];
326 struct iwn_rxon *rxon;
327 int ctx;

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

383 int desired_pwrsave_level;
384
385 /*
386 * The current power save level, this may differ from the
387 * configured value due to thermal throttling etc.
388 */
389 int current_pwrsave_level;
390
391 /* For specifique params */
392 struct iwn_base_params *base_params;
391 /* For specific params */
392 const struct iwn_base_params *base_params;
393};
394
395#define IWN_LOCK_INIT(_sc) \
396 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
397 MTX_NETWORK_LOCK, MTX_DEF)
398#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
399#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
400#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
401#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)
393};
394
395#define IWN_LOCK_INIT(_sc) \
396 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
397 MTX_NETWORK_LOCK, MTX_DEF)
398#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
399#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
400#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
401#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)