1 files changed, 34 insertions, 2 deletions

diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h
index 7e60049..b0aa35c 100644
--- a/sys/dev/wpi/if_wpireg.h
+++ b/sys/dev/wpi/if_wpireg.h
@@ -256,6 +256,26 @@ struct wpi_tx_stat {
 	uint8_t		rate;
 	uint32_t	duration;
 	uint32_t	status;
+#define WPI_TX_STATUS_SUCCESS			0x01
+#define WPI_TX_STATUS_DIRECT_DONE		0x02
+#define WPI_TX_STATUS_FAIL			0x80
+#define WPI_TX_STATUS_FAIL_SHORT_LIMIT		0x82
+#define WPI_TX_STATUS_FAIL_LONG_LIMIT		0x83
+#define WPI_TX_STATUS_FAIL_FIFO_UNDERRUN	0x84
+#define WPI_TX_STATUS_FAIL_MGMNT_ABORT		0x85
+#define WPI_TX_STATUS_FAIL_NEXT_FRAG		0x86
+#define WPI_TX_STATUS_FAIL_LIFE_EXPIRE		0x87
+#define WPI_TX_STATUS_FAIL_NODE_PS		0x88
+#define WPI_TX_STATUS_FAIL_ABORTED		0x89
+#define WPI_TX_STATUS_FAIL_BT_RETRY		0x8a
+#define WPI_TX_STATUS_FAIL_NODE_INVALID		0x8b
+#define WPI_TX_STATUS_FAIL_FRAG_DROPPED		0x8c
+#define WPI_TX_STATUS_FAIL_TID_DISABLE		0x8d
+#define WPI_TX_STATUS_FAIL_FRAME_FLUSHED	0x8e
+#define WPI_TX_STATUS_FAIL_INSUFFICIENT_CF_POLL	0x8f
+#define WPI_TX_STATUS_FAIL_TX_LOCKED		0x90
+#define WPI_TX_STATUS_FAIL_NO_BEACON_ON_RADAR	0x91
+
 } __packed;
 
 struct wpi_rx_desc {
@@ -332,6 +352,7 @@ struct wpi_tx_cmd {
 #define WPI_CMD_SET_LED		 72
 #define WPI_CMD_SET_POWER_MODE	119
 #define WPI_CMD_SCAN		128
+#define WPI_CMD_SCAN_ABORT	129
 #define WPI_CMD_SET_BEACON	145
 #define WPI_CMD_TXPOWER		151
 #define WPI_CMD_BT_COEX		155
@@ -547,6 +568,8 @@ struct wpi_mrr_setup {
 		uint8_t	plcp;
 		uint8_t	flags;
 		uint8_t	ntries;
+#define		WPI_NTRIES_DEFAULT	2
+
 		uint8_t	next;
 	} __packed	rates[WPI_RIDX_MAX + 1];
 } __packed;
@@ -589,12 +612,17 @@ struct wpi_scan_hdr {
 	uint16_t	len;
 	uint8_t		reserved1;
 	uint8_t		nchan;
-	uint16_t	quiet_time;
-	uint16_t	quiet_threshold;
+	uint16_t	quiet_time;	/* timeout in milliseconds */
+#define WPI_QUIET_TIME_DEFAULT		10
+
+	uint16_t	quiet_threshold; /* min # of packets */
 	uint16_t	crc_threshold;
 	uint16_t	reserved2;
 	uint32_t	max_svc;	/* background scans */
 	uint32_t	pause_svc;	/* background scans */
+#define WPI_PAUSE_MAX_TIME		((1 << 20) - 1)
+#define WPI_PAUSE_SCAN(nbeacons, time)	((nbeacons << 24) | time)
+
 	uint32_t	flags;
 	uint32_t	filter;
 
@@ -630,6 +658,7 @@ struct wpi_scan_chan {
 #define WPI_PASSIVE_DWELL_TIME_2GHZ	( 20)
 #define WPI_PASSIVE_DWELL_TIME_5GHZ	( 10)
 #define WPI_PASSIVE_DWELL_BASE		(100)
+#define WPI_CHANNEL_TUNE_TIME		(  6)
 
 /* Structure for command WPI_CMD_TXPOWER. */
 struct wpi_cmd_txpower {
@@ -697,6 +726,9 @@ struct wpi_start_scan {
 struct wpi_stop_scan {
 	uint8_t		nchan;
 	uint8_t		status;
+#define WPI_SCAN_COMPLETED	1
+#define WPI_SCAN_ABORTED	2
+
 	uint8_t		reserved;
 	uint8_t		chan;
 	uint64_t	tsf;