- add support for 802.11 headers with various sizes (will be required

  for EDCA support).
- remove an unused function.
- fix scan command.
- detect if the hardware radio switch is on instead of failing in the
  calibration of the thermal sensor with an obscure message.

1 files changed, 4 insertions, 23 deletions

diff --git a/sys/dev/pci/if_wpireg.h b/sys/dev/pci/if_wpireg.h
index b989feb635b..98a8ed65b5b 100644
--- a/sys/dev/pci/if_wpireg.h
+++ b/sys/dev/pci/if_wpireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpireg.h,v 1.17 2007/07/24 16:07:47 damien Exp $	*/
+/*	$OpenBSD: if_wpireg.h,v 1.18 2007/09/10 20:34:43 damien Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007
@@ -83,6 +83,7 @@
 #define WPI_MEM_BYPASS2		0x2e30
 #define WPI_MEM_CLOCK1		0x3004
 #define WPI_MEM_CLOCK2		0x3008
+#define WPI_MEM_RFKILL		0x3014
 #define WPI_MEM_POWER		0x300c
 #define WPI_MEM_PCIDEV		0x3010
 #define WPI_MEM_UCODE_CTL	0x3400
@@ -393,7 +394,6 @@ struct wpi_cmd_data {
 	uint8_t		data_ntries;
 	uint16_t	timeout;
 	uint16_t	txop;
-	struct		ieee80211_frame wh;
 } __packed;
 
 /* structure for command WPI_CMD_SET_BEACON */
@@ -476,27 +476,8 @@ struct wpi_scan_hdr {
 	uint32_t	flags;
 	uint32_t	filter;
 
-	/* wpi_cmd_data structure */
-	uint16_t	paylen;
-	uint16_t	lnext;
-	uint32_t	txflags;
-	uint8_t		rate;
-	uint8_t		id;
-	uint8_t		tid;
-	uint8_t		security;
-	uint8_t		key[IEEE80211_KEYBUF_SIZE];
-	uint8_t		tkip[IEEE80211_WEP_MICLEN];
-	uint32_t	fnext;
-	uint32_t	lifetime;
-	uint8_t		ofdm_mask;
-	uint8_t		cck_mask;
-	uint8_t		rts_ntries;
-	uint8_t		data_ntries;
-	uint16_t	timeout;
-	uint16_t	txop;
-
-	struct		wpi_scan_essid essid[4];
-
+	/* followed by a struct wpi_cmd_data */
+	/* followed by an array of 4x struct wpi_scan_essid */
 	/* followed by probe request body */
 	/* followed by nchan x wpi_scan_chan */
 } __packed;