1c1
< /* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 179037 2008-05-16 04:15:54Z thompsa $ */
---
> /* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 191746 2009-05-02 15:14:18Z thompsa $ */
147,149c147,148
< #define WPI_FLAG_SCANNING (1 << 1)
< #define WPI_FLAG_BUSY (1 << 2)
< #define WPI_FLAG_AUTH (1 << 3)
---
> #define WPI_FLAG_BUSY (1 << 1)
> #define WPI_FLAG_AUTH (1 << 2)
196,219d194
< /* command queue related variables */
< #define WPI_SCAN_START (1<<0)
< #define WPI_SCAN_CURCHAN (1<<1)
< #define WPI_SCAN_STOP (1<<2)
< #define WPI_SET_CHAN (1<<3)
< #define WPI_AUTH (1<<4)
< #define WPI_RUN (1<<5)
< #define WPI_SCAN_NEXT (1<<6)
< #define WPI_RESTART (1<<7)
< #define WPI_RF_RESTART (1<<8)
< #define WPI_CMD_MAXOPS 10
< /* command queuing request type */
< #define WPI_QUEUE_NORMAL 0
< #define WPI_QUEUE_CLEAR 1
< int sc_cmd[WPI_CMD_MAXOPS];
< int sc_cmd_arg[WPI_CMD_MAXOPS];
< int sc_cmd_cur; /* current queued scan task */
< int sc_cmd_next; /* last queued scan task */
< struct mtx sc_cmdlock;
<
< /* Task queues used to control the driver */
< struct taskqueue *sc_tq; /* Main command task queue */
< struct taskqueue *sc_tq2; /* firmware reset task queue */
<
221,223d195
< struct task sc_radioontask; /* enable rf transmitter task*/
< struct task sc_radioofftask;/* disable rf transmitter task*/
< struct task sc_opstask; /* operation handling task */
225c197
< struct task sc_bmiss_task; /* beacon miss */
---
> struct task sc_radiotask; /* reset rf task */
242,248d213
<
< #define WPI_CMD_LOCK_INIT(_sc) \
< mtx_init(&(_sc)->sc_cmdlock, device_get_nameunit((_sc)->sc_dev), \
< NULL, MTX_DEF)
< #define WPI_CMD_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_cmdlock)
< #define WPI_CMD_LOCK(_sc) mtx_lock(&(_sc)->sc_cmdlock)
< #define WPI_CMD_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_cmdlock)