Deleted Added
full compact
if_iwnvar.h (178676) if_iwnvar.h (191746)
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 178676 2008-04-29 21:36:17Z sam $ */
1/* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 191746 2009-05-02 15:14:18Z thompsa $ */
2/*-
3 * Copyright (c) 2007
4 * Damien Bergamini <damien.bergamini@free.fr>
5 * Copyright (c) 2008 Sam Leffler, Errno Consulting
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

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

175 struct iwn_tx_ring txq[IWN_NTXQUEUES];
176 struct iwn_rx_ring rxq;
177
178 bus_space_tag_t sc_st;
179 bus_space_handle_t sc_sh;
180 void *sc_ih;
181 bus_size_t sc_sz;
182
2/*-
3 * Copyright (c) 2007
4 * Damien Bergamini <damien.bergamini@free.fr>
5 * Copyright (c) 2008 Sam Leffler, Errno Consulting
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

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

175 struct iwn_tx_ring txq[IWN_NTXQUEUES];
176 struct iwn_rx_ring rxq;
177
178 bus_space_tag_t sc_st;
179 bus_space_handle_t sc_sh;
180 void *sc_ih;
181 bus_size_t sc_sz;
182
183 /* command queue related variables */
184#define IWN_SCAN_START (1<<0)
185#define IWN_SCAN_CURCHAN (1<<1)
186#define IWN_SCAN_STOP (1<<2)
187#define IWN_SET_CHAN (1<<3)
188#define IWN_AUTH (1<<4)
189#define IWN_SCAN_NEXT (1<<5)
190#define IWN_RUN (1<<6)
191#define IWN_RADIO_ENABLE (1<<7)
192#define IWN_RADIO_DISABLE (1<<8)
193#define IWN_REINIT (1<<9)
194#define IWN_CMD_MAXOPS 10
195 /* command queuing request type */
196#define IWN_QUEUE_NORMAL 0
197#define IWN_QUEUE_CLEAR 1
198 int sc_cmd[IWN_CMD_MAXOPS];
199 int sc_cmd_arg[IWN_CMD_MAXOPS];
200 int sc_cmd_cur; /* current queued scan task */
201 int sc_cmd_next; /* last queued scan task */
202 struct mtx sc_cmdlock;
203
204 /* Task queues used to control the driver */
205 struct taskqueue *sc_tq; /* Main command task queue */
206
207 /* Tasks used by the driver */
183 /* Tasks used by the driver */
208 struct task sc_ops_task; /* deferred ops */
209 struct task sc_bmiss_task; /* beacon miss */
184 struct task sc_reinit_task;
185 struct task sc_radioon_task;
186 struct task sc_radiooff_task;
210
211 /* Thermal calibration */
212 int calib_cnt;
213 struct iwn_calib_state calib;
214
215 struct iwn_rx_stat last_rx_stat;
216 int last_rx_valid;
217 struct iwn_ucode_info ucode_info;

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

229
230#define IWN_LOCK_INIT(_sc) \
231 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
232 MTX_NETWORK_LOCK, MTX_DEF)
233#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
234#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
235#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
236#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)
187
188 /* Thermal calibration */
189 int calib_cnt;
190 struct iwn_calib_state calib;
191
192 struct iwn_rx_stat last_rx_stat;
193 int last_rx_valid;
194 struct iwn_ucode_info ucode_info;

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

206
207#define IWN_LOCK_INIT(_sc) \
208 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
209 MTX_NETWORK_LOCK, MTX_DEF)
210#define IWN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
211#define IWN_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
212#define IWN_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
213#define IWN_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)
237#define IWN_CMD_LOCK_INIT(_sc) \
238 mtx_init(&(_sc)->sc_cmdlock, device_get_nameunit((_sc)->sc_dev), \
239 NULL, MTX_DEF);
240#define IWN_CMD_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_cmdlock)
241#define IWN_CMD_LOCK(_sc) mtx_lock(&(_sc)->sc_cmdlock)
242#define IWN_CMD_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_cmdlock)