replace if_awi w/ semi-current netbsd driver; still has problems

1 files changed, 196 insertions, 247 deletions

diff --git a/sys/dev/ic/awireg.h b/sys/dev/ic/awireg.h
index 76c97ee5309..9866c561e3c 100644
--- a/sys/dev/ic/awireg.h
+++ b/sys/dev/ic/awireg.h
@@ -1,5 +1,4 @@
-/* $NetBSD: awireg.h,v 1.2 1999/11/05 05:13:36 sommerfeld Exp $ */
-/* $OpenBSD: awireg.h,v 1.1 1999/12/16 02:56:56 deraadt Exp $ */
+/* $NetBSD: awireg.h,v 1.3 2000/03/22 11:22:22 onoe Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -58,11 +57,11 @@
  */
 #define AWI_LAST_TXD		0x3ec	/* last completed Tx Descr */
 
-#define AWI_LAST_BCAST_TXD	AWI_LAST_TXD+0
-#define AWI_LAST_MGT_TXD	AWI_LAST_TXD+4
-#define AWI_LAST_DATA_TXD	AWI_LAST_TXD+8
-#define AWI_LAST_PS_POLL_TXD	AWI_LAST_TXD+12
-#define AWI_LAST_CF_POLL_TXD	AWI_LAST_TXD+16
+#define AWI_LAST_BCAST_TXD		AWI_LAST_TXD+0
+#define AWI_LAST_MGT_TXD		AWI_LAST_TXD+4
+#define AWI_LAST_DATA_TXD		AWI_LAST_TXD+8
+#define AWI_LAST_PS_POLL_TXD		AWI_LAST_TXD+12
+#define AWI_LAST_CF_POLL_TXD		AWI_LAST_TXD+16
 
 /*
  * Banner block; null-terminated string.
@@ -72,7 +71,7 @@
  */
 
 #define AWI_BANNER		0x480	/* Version string */
-#define AWI_BANNER_LEN		0x20
+#define AWI_BANNER_LEN			0x20
 
 /*
  * Command block protocol:
@@ -85,96 +84,94 @@
  * write command status to a zero value.
  */
 
-#define AWI_CMD		0x4a0	/* Command opcode byte */
+#define AWI_CMD			0x4a0	/* Command opcode byte */
 
-#define AWI_CMD_IDLE		0x0
-#define AWI_CMD_NOP		0x1
+#define AWI_CMD_IDLE			0x0
+#define AWI_CMD_NOP			0x1
 
-#define AWI_CMD_SET_MIB	0x2
-#define AWI_CMD_GET_MIB	0x9
+#define AWI_CMD_SET_MIB			0x2
+#define AWI_CMD_GET_MIB			0x9
 
-#define AWI_CA_MIB_TYPE		0x0
-#define AWI_CA_MIB_SIZE		0x1
+#define AWI_CA_MIB_TYPE			0x0
+#define AWI_CA_MIB_SIZE			0x1
 #define AWI_CA_MIB_INDEX		0x2
-#define AWI_CA_MIB_DATA		0x4
+#define AWI_CA_MIB_DATA			0x4
 
-#define AWI_MIB_LOCAL		0x0
-#define AWI_MIB_MAC_ADDR	0x2
-#define AWI_MIB_MAC		0x3
-#define AWI_MIB_MAC_STAT	0x4
-#define AWI_MIB_MAC_MGT	0x5
-#define AWI_MIB_DRVR_MAC	0x6
-#define AWI_MIB_PHY		0x7
+#define AWI_MIB_LOCAL			0x0
+#define AWI_MIB_ADDR			0x2
+#define AWI_MIB_MAC			0x3
+#define AWI_MIB_STAT			0x4
+#define AWI_MIB_MGT			0x5
+#define AWI_MIB_DRVR			0x6
+#define AWI_MIB_PHY			0x7
 
-#define AWI_MIB_LAST		AWI_MIB_PHY
 
-
-#define AWI_CMD_INIT_TX	0x3
+#define AWI_CMD_INIT_TX			0x3
 
 #define AWI_CA_TX_LEN			0x14
 #define AWI_CA_TX_DATA			0x0
 #define AWI_CA_TX_MGT			0x4
-#define AWI_CA_TX_BCAST	       	0x8
+#define AWI_CA_TX_BCAST		       	0x8
 #define AWI_CA_TX_PS			0xc
 #define AWI_CA_TX_CF			0x10
 
-#define AWI_CMD_FLUSH_TX	0x4
+#define AWI_CMD_FLUSH_TX		0x4
 
 #define AWI_CA_FTX_LEN			0x5
-#define AWI_CA_FTX_DATA		0x0
+#define AWI_CA_FTX_DATA			0x0
 #define AWI_CA_FTX_MGT			0x1
 #define AWI_CA_FTX_BCAST		0x2
 #define AWI_CA_FTX_PS			0x3
 #define AWI_CA_FTX_CF			0x4
 
-#define AWI_CMD_INIT_RX	0x5
+#define AWI_CMD_INIT_RX			0x5
 #define AWI_CA_IRX_LEN			0x8
 #define AWI_CA_IRX_DATA_DESC		0x0 /* return */
 #define AWI_CA_IRX_PS_DESC		0x4 /* return */
 
-#define AWI_CMD_KILL_RX	0x6
+#define AWI_CMD_KILL_RX			0x6
 
-#define AWI_CMD_SLEEP		0x7
+#define AWI_CMD_SLEEP			0x7
 #define AWI_CA_SLEEP_LEN		0x8 
 #define AWI_CA_WAKEUP			0x0 /* uint64 */
 
-#define AWI_CMD_WAKE		0x8
+#define AWI_CMD_WAKE			0x8
 
-#define AWI_CMD_SCAN		0xa
-#define AWI_CA_SCAN_LEN		0x6
+#define AWI_CMD_SCAN			0xa
+#define AWI_CA_SCAN_LEN			0x6
 #define AWI_CA_SCAN_DURATION		0x0
-#define AWI_CA_SCAN_SET		0x2
+#define AWI_CA_SCAN_SET			0x2
 #define AWI_CA_SCAN_PATTERN		0x3
-#define AWI_CA_SCAN_IDX		0x4
+#define AWI_CA_SCAN_IDX			0x4
 #define AWI_CA_SCAN_SUSP		0x5
 
-#define AWI_CMD_SYNC		0xb
-#define AWI_CA_SYNC_LEN		0x14
-#define AWI_CA_SYNC_SET		0x0
+#define AWI_CMD_SYNC			0xb
+#define AWI_CA_SYNC_LEN			0x14
+#define AWI_CA_SYNC_SET			0x0
 #define AWI_CA_SYNC_PATTERN		0x1
-#define AWI_CA_SYNC_IDX		0x2
+#define AWI_CA_SYNC_IDX			0x2
 #define AWI_CA_SYNC_STARTBSS		0x3
 #define AWI_CA_SYNC_DWELL		0x4
-#define AWI_CA_SYNC_MBZ		0x6
+#define AWI_CA_SYNC_MBZ			0x6
 #define AWI_CA_SYNC_TIMESTAMP		0x8
 #define AWI_CA_SYNC_REFTIME		0x10
 
-#define AWI_CMD_RESUME		0xc
+#define AWI_CMD_RESUME			0xc
 
-#define AWI_CMD_STATUS		0x4a1 	/* Command status */
+#define AWI_CMD_STATUS			0x4a1 	/* Command status */
 
-#define AWI_STAT_IDLE		0x0
-#define AWI_STAT_OK		0x1
-#define AWI_STAT_BADCMD	0x2
-#define AWI_STAT_BADPARM	0x3
-#define AWI_STAT_NOTIMP	0x4
-#define AWI_STAT_BADRES	0x5
-#define AWI_STAT_BADMODE	0x6
+#define AWI_STAT_IDLE			0x0
+#define AWI_STAT_OK			0x1
+#define AWI_STAT_BADCMD			0x2
+#define AWI_STAT_BADPARM		0x3
+#define AWI_STAT_NOTIMP			0x4
+#define AWI_STAT_BADRES			0x5
+#define AWI_STAT_BADMODE		0x6
 
 #define AWI_ERROR_OFFSET	0x4a2 	/* Offset to erroneous parameter */
 #define AWI_CMD_PARAMS		0x4a4 	/* Command parameters */
 
-#define AWI_CSB		0x4f0 	/* Control/Status block */
+#define AWI_CSB			0x4f0 	/* Control/Status block */
 
 #define AWI_SELFTEST		0x4f0
 
@@ -184,9 +181,9 @@
 #define AWI_SELFTEST_MIB		0x03 /* mib initializing */
 
 #define AWI_SELFTEST_MIB_FAIL		0xfa
-#define AWI_SELFTEST_RADIO_FAIL	0xfb
+#define AWI_SELFTEST_RADIO_FAIL		0xfb
 #define AWI_SELFTEST_MAC_FAIL		0xfc
-#define AWI_SELFTEST_FLASH_FAIL	0xfd
+#define AWI_SELFTEST_FLASH_FAIL		0xfd
 #define AWI_SELFTEST_RAM_FAIL		0xfe
 #define AWI_SELFTEST_PASSED		0xff
 
@@ -213,8 +210,6 @@
 #define AWI_INT_RX			0x02 /* rx done */
 #define AWI_INT_CMD			0x01 /* cmd done */
 
-#define AWI_INT_BITS "\20\1CMD\2RX\3TX\4SCAN\5CFPST\6DTIM\7CFPE\10GROGGY"
-
 /*
  * The following are used to implement a locking protocol between host
  * and MAC to protect the interrupt status and mask fields.
@@ -224,7 +219,7 @@
  *	if non-zero, clear lockout_mac, loop.
  */
 
-#define AWI_LOCKOUT_MAC	0x4f5
+#define AWI_LOCKOUT_MAC		0x4f5
 #define AWI_LOCKOUT_HOST	0x4f6
 
 
@@ -232,17 +227,17 @@
 #define AWI_INTMASK2		0x4fd
 
 /* Bits in AWI_INTSTAT2/INTMASK2 */
-#define AWI_INT2_RXMGT		0x80 		/* mgt/ps recieved */
-#define AWI_INT2_RXDATA	0x40 		/* data received */
-#define AWI_INT2_TXMGT		0x10		/* mgt tx done */
-#define AWI_INT2_TXCF		0x08f		/* CF tx done */
-#define AWI_INT2_TXPS		0x04		/* PS tx done */
-#define AWI_INT2_TXBCAST	0x02		/* Broadcast tx done */
-#define AWI_INT2_TXDATA	0x01		/* data tx done */
+#define AWI_INT2_RXMGT			0x80 		/* mgt/ps recieved */
+#define AWI_INT2_RXDATA			0x40 		/* data received */
+#define AWI_INT2_TXMGT			0x10		/* mgt tx done */
+#define AWI_INT2_TXCF			0x08		/* CF tx done */
+#define AWI_INT2_TXPS			0x04		/* PS tx done */
+#define AWI_INT2_TXBCAST		0x02		/* Broadcast tx done */
+#define AWI_INT2_TXDATA			0x01		/* data tx done */
 
 #define AWI_DIS_PWRDN		0x4fc		/* disable powerdown if set */
 
-#define AWI_DRIVERSTATE	0x4fe		/* driver state */
+#define AWI_DRIVERSTATE		0x4fe		/* driver state */
 
 #define AWI_DRV_STATEMASK		0x0f
 
@@ -251,46 +246,45 @@
 #define AWI_DRV_ADHSC			0x2 /* adhoc scan */
 #define AWI_DRV_ADHSY			0x3 /* adhoc synced */
 #define AWI_DRV_INFSC			0x4 /* inf scanning */
-#define AWI_DRV_INFAUTH		0x5 /* inf authed */
+#define AWI_DRV_INFAUTH			0x5 /* inf authed */
 #define AWI_DRV_INFASSOC		0x6 /* inf associated */
-#define AWI_DRV_INFTOSS		0x7 /* inf handoff */
+#define AWI_DRV_INFTOSS			0x7 /* inf handoff */
 #define AWI_DRV_APNONE			0x8 /* AP activity: no assoc */
-#define AWI_DRV_APQUIET		0xc /* AP: >=one assoc, no traffic */
+#define AWI_DRV_APQUIET			0xc /* AP: >=one assoc, no traffic */
 #define AWI_DRV_APLO			0xd /* AP: >=one assoc, light tfc */
 #define AWI_DRV_APMED			0xe /* AP: >=one assoc, mod tfc */
 #define AWI_DRV_APHIGH			0xf /* AP: >=one assoc, heavy tfc */
 
-#define AWI_DRV_AUTORXLED			0x10
-#define AWI_DRV_AUTOTXLED			0x20
-#define AWI_DRV_RXLED				0x40
-#define AWI_DRV_TXLED				0x80
+#define AWI_DRV_AUTORXLED		0x10
+#define AWI_DRV_AUTOTXLED		0x20
+#define AWI_DRV_RXLED			0x40
+#define AWI_DRV_TXLED			0x80
 
-#define AWI_VBM		0x500	/* Virtual Bit Map */
+#define AWI_VBM			0x500	/* Virtual Bit Map */
 
 #define AWI_BUFFERS		0x600	/* Buffers */
+#define	AWI_BUFFERS_END		0x6000
 
 /*
  * Receive descriptors; there are a linked list of these chained
  * through the "NEXT" fields, starting from XXX
  */
 
-#define AWI_RXD_SIZE		0x18
+#define AWI_RXD_SIZE			0x18
 
-#define AWI_RXD_NEXT		0x4
-#define AWI_RXD_NEXT_LAST	0x80000000
+#define AWI_RXD_NEXT			0x4
+#define AWI_RXD_NEXT_LAST		0x80000000
 
 
-#define AWI_RXD_HOST_DESC_STATE	0x9
+#define AWI_RXD_HOST_DESC_STATE		0x9
 
 #define AWI_RXD_ST_OWN		0x80 /* host owns this */
 #define AWI_RXD_ST_CONSUMED	0x40 /* host is done */
 #define AWI_RXD_ST_LF		0x20 /* last frag */
 #define AWI_RXD_ST_CRC		0x08 /* CRC error */
-#define AWI_RXD_ST_OFLO	0x02 /* possible buffer overrun */
+#define AWI_RXD_ST_OFLO		0x02 /* possible buffer overrun */
 #define AWI_RXD_ST_RXERROR	0x01 /* this frame is borked; discard me */
 
-#define AWI_RXD_ST_BITS	"\20\1ERROR\2OVERRUN\4CRC\6LF\7CONSUMED\10OWN"
-
 #define AWI_RXD_RSSI		0xa /* 1 byte: radio strength indicator */
 #define AWI_RXD_INDEX		0xb /* 1 byte: FH hop index or DS channel */
 #define AWI_RXD_LOCALTIME	0xc /* 4 bytes: local time of RX */
@@ -309,19 +303,19 @@
 #define AWI_TXD_LENGTH		0x08 /* length of frame */
 #define AWI_TXD_STATE		0x0a /* state */
 
-#define AWI_TXD_ST_OWN			0x80 /* MAC owns this  */
+#define AWI_TXD_ST_OWN		0x80 /* MAC owns this  */
 #define AWI_TXD_ST_DONE		0x40 /* MAC is done */
-#define AWI_TXD_ST_REJ			0x20 /* MAC doesn't like */
+#define AWI_TXD_ST_REJ		0x20 /* MAC doesn't like */
 #define AWI_TXD_ST_MSDU		0x10 /* MSDU timeout */
 #define AWI_TXD_ST_ABRT		0x08 /* TX aborted */
-#define AWI_TXD_ST_RETURNED		0x04 /* TX returned */
-#define AWI_TXD_ST_RETRY		0x02 /* TX retries exceeded */
-#define AWI_TXD_ST_ERROR		0x01 /* TX error */
+#define AWI_TXD_ST_RETURNED	0x04 /* TX returned */
+#define AWI_TXD_ST_RETRY	0x02 /* TX retries exceeded */
+#define AWI_TXD_ST_ERROR	0x01 /* TX error */
 
 #define AWI_TXD_RATE		0x0b /* rate */
 
-#define AWI_RATE_1MBIT			10
-#define AWI_RATE_2MBIT			20
+#define AWI_RATE_1MBIT		10
+#define AWI_RATE_2MBIT		20
 
 #define AWI_TXD_NDA		0x0c /* num DIFS attempts */
 #define AWI_TXD_NDF		0x0d /* num DIFS failures */
@@ -332,7 +326,7 @@
 #define AWI_TXD_NDTA		0x15 /* num data attempts */
 #define AWI_TXD_CTL		0x16 /* control */
 
-#define AWI_TXD_CTL_PSN	0x80	/* preserve sequence in MAC frame */
+#define AWI_TXD_CTL_PSN		0x80	/* preserve sequence in MAC frame */
 #define AWI_TXD_CTL_BURST	0x02    /* host is doing 802.11 fragmt. */
 #define AWI_TXD_CTL_FRAGS	0x01    /* override normal fragmentation */
 
@@ -340,171 +334,126 @@
  * MIB structures.
  */
 
-/*
- * MIB 0: Local MIB
- */
-
-#define AWI_MIB_LOCAL_NOFRAG		0
-#define AWI_MIB_LOCAL_NOPLCP		1
-#define AWI_MIB_LOCAL_MACPRES		2
-#define AWI_MIB_LOCAL_RXMGTQ		3
-#define AWI_MIB_LOCAL_NOREASM		4
-#define AWI_MIB_LOCAL_NOSTRIPPLCP	5
-#define AWI_MIB_LOCAL_NORXERROR	6
-#define AWI_MIB_LOCAL_NOPWRSAVE	7
-
-#define AWI_MIB_LOCAL_FILTMULTI	8
-#define AWI_MIB_LOCAL_NOSEQCHECK	9
-#define AWI_MIB_LOCAL_CFPENDFLUSHCFPQ	10
-#define AWI_MIB_LOCAL_INFRA_MODE	11
-#define AWI_MIB_LOCAL_PWD_LEVEL	12
-#define AWI_MIB_LOCAL_CFPMODE		13
-
-#define AWI_MIB_LOCAL_TXB_OFFSET		14
-#define AWI_MIB_LOCAL_TXB_SIZE		18
-#define AWI_MIB_LOCAL_RXB_OFFSET		22
-#define AWI_MIB_LOCAL_RXB_SIZE		26
-
-#define AWI_MIB_LOCAL_ACTING_AS_AP	30
-#define AWI_MIB_LOCAL_FILL_CFP		31
-#define AWI_MIB_LOCAL_SIZE		32
-
-/*
- * MAC mib 
- */
-
-#define AWI_MIB_MAC_RTS_THRESH		4	 /* 2 bytes */
-#define AWI_MIB_MAC_CW_MAX		6
-#define AWI_MIB_MAC_CW_MIN		8
-#define AWI_MIB_MAC_PROMISC		10
-#define AWI_MIB_MAC_SHORT_RETRY	16
-#define AWI_MIB_MAC_LONG_RETRY		17
-#define AWI_MIB_MAC_MAX_FRAME		18
-#define AWI_MIB_MAC_MAX_FRAG		20
-#define AWI_MIB_MAC_PROBE_DELAY	22
-#define AWI_MIB_MAC_PROBE_RESP_MIN	24
-#define AWI_MIB_MAC_PROBE_RESP_MAX	26
-#define AWI_MIB_MAC_MAX_TX_MSDU_LIFE	28
-#define AWI_MIB_MAC_MAX_RX_MSDU_LIFE	32
-#define AWI_MIB_MAC_STATION_BASE_RATE	36
-#define AWI_MIB_MAC_DES_ESSID		38		/* 34 bytes */
-
-/*
- * MGT mib.
- */
-
-#define AWI_MIB_MGT_POWER_MODE		0
-#define AWI_MIB_MGT_SCAN_MODE		1
-#define AWI_MIB_MGT_SCAN_STATE		2
-#define AWI_MIB_MGT_DTIM_PERIOD	3
-#define AWI_MIB_MGT_ATIM_WINDOW	4
-#define AWI_MIB_MGT_WEPREQ		6
-#define AWI_MIB_MGT_BEACON_PD		8
-#define AWI_MIB_MGT_PASSIVE_SCAN	10
-#define AWI_MIB_MGT_LISTEN_INT		12
-#define AWI_MIB_MGT_MEDIUP_OCC		14
-#define AWI_MIB_MGT_MAX_MPDU_TIME	16
-#define AWI_MIB_MGT_CFP_MAX_DUR	18
-#define AWI_MIB_MGT_CFP_RATE		20
-#define AWI_MIB_MGT_NO_DTMS		21
-#define AWI_MIB_MGT_STATION_ID		22
-#define AWI_MIB_MGT_BSS_ID		24
-#define AWI_MIB_MGT_ESS_ID		30 		/* 34 bytes */
-#define AWI_MIB_MGT_ESS_SIZE		34
-
-
-/*
- * MAC address group.
- */
-
-#define AWI_MIB_MAC_ADDR_MINE		0
-#define AWI_MIB_MAC_ADDR_MULTI0	6
-#define AWI_MIB_MAC_ADDR_MULTI1	12
-#define AWI_MIB_MAC_ADDR_MULTI2	18
-#define AWI_MIB_MAC_ADDR_MULTI3	24
-
-#define AWI_MIB_MAC_ADDR_TXEN		30
-
-/*
- * 802.11 media layer goo.
- * Should be split out into separate module independant of this driver.
- */
-
-#define IEEEWL_FC		0 		/* frame control */
-
-#define IEEEWL_FC_VERS		0
-#define IEEEWL_FC_VERS_MASK	0x03
-
-#define IEEEWL_FC_TYPE_MGT	0
-#define IEEEWL_FC_TYPE_CTL	1
-#define IEEEWL_FC_TYPE_DATA	2
-
-#define IEEEWL_FC_TYPE_MASK	0x0c
-#define IEEEWL_FC_TYPE_SHIFT	2
-
-#define IEEEWL_FC_SUBTYPE_MASK	0xf0
-#define IEEEWL_FC_SUBTYPE_SHIFT	4
-
-#define IEEEWL_SUBTYPE_ASSOCREQ		0x00
-#define IEEEWL_SUBTYPE_ASSOCRESP	0x01
-#define IEEEWL_SUBTYPE_REASSOCREQ	0x02
-#define IEEEWL_SUBTYPE_REASSOCRESP	0x03
-#define IEEEWL_SUBTYPE_PROBEREQ		0x04
-#define IEEEWL_SUBTYPE_PROBERESP	0x05
-
-#define IEEEWL_SUBTYPE_BEACON		0x08
-#define IEEEWL_SUBTYPE_DISSOC		0x0a
-#define IEEEWL_SUBTYPE_AUTH		0x0b
-#define IEEEWL_SUBTYPE_DEAUTH		0x0c
-
-#define IEEEWL_FC2		1		/* second byte of fc */
-
-/*
- * TLV tags for things we care about..
- */
-#define IEEEWL_MGT_TLV_SSID		0
-#define IEEEWL_MGT_TLV_FHPARMS		2
+#define	AWI_ESS_ID_SIZE			(IEEE80211_NWID_LEN+2)
+struct awi_mib_local {
+	u_int8_t	Fragmentation_Dis;
+	u_int8_t	Add_PLCP_Dis;
+	u_int8_t	MAC_Hdr_Prsv;
+	u_int8_t	Rx_Mgmt_Que_En;
+	u_int8_t	Re_Assembly_Dis;
+	u_int8_t	Strip_PLCP_Dis;
+	u_int8_t	Rx_Error_Dis;
+	u_int8_t	Power_Saving_Mode_Dis;
+	u_int8_t	Accept_All_Multicast_Dis;
+	u_int8_t	Check_Seq_Cntl_Dis;
+	u_int8_t	Flush_CFP_Queue_On_CF_End;
+	u_int8_t	Network_Mode;
+	u_int8_t	PWD_Lvl;
+	u_int8_t	CFP_Mode;
+	u_int8_t	Tx_Buffer_Offset[4];
+	u_int8_t	Tx_Buffer_Size[4];
+	u_int8_t	Rx_Buffer_Offset[4];
+	u_int8_t	Rx_Buffer_Size[4];
+	u_int8_t	Acting_as_AP;
+	u_int8_t	Fill_CFP;
+};
 
-/*
- * misc frame control bits in second byte of frame control word.
- * there are others, but we don't ever want to set them..
- */
+struct awi_mib_mac {
+	u_int8_t	_Reserved1[2];
+	u_int8_t	_Reserved2[2];
+	u_int8_t	aRTS_Threshold[2];
+	u_int8_t	aCW_max[2];
+	u_int8_t	aCW_min[2];
+	u_int8_t	aPromiscuous_Enable;
+	u_int8_t	_Reserved3;
+	u_int8_t	_Reserved4[4];
+	u_int8_t	aShort_Retry_Limit;
+	u_int8_t	aLong_Retry_Limit;
+	u_int8_t	aMax_Frame_Length[2];
+	u_int8_t	aFragmentation_Threshold[2];
+	u_int8_t	aProbe_Delay[2];
+	u_int8_t	aMin_Probe_Response_Time[2];
+	u_int8_t	aMax_Probe_Response_Time[2];
+	u_int8_t	aMax_Transmit_MSDU_Lifetime[4];
+	u_int8_t	aMax_Receive_MSDU_Lifetime[4];
+	u_int8_t	aStation_Basic_Rate[2];
+	u_int8_t	aDesired_ESS_ID[AWI_ESS_ID_SIZE];
+};
 
-#define IEEEWL_FC2_DSMASK		0x03
-
-#define IEEEWL_FC2_TODS			0x01
-#define IEEEWL_FC2_FROMDS		0x02
-
-#define IEEEWL_FH_CHANSET_MIN		1
-#define IEEEWL_FH_CHANSET_MAX		3
-#define IEEEWL_FH_PATTERN_MIN		0
-#define IEEEWL_FH_PATTERN_MAX		77
-
-struct awi_mac_header 
-{
-	u_int8_t	awi_fc;
-	u_int8_t	awi_f2;
-	u_int16_t	awi_duration;
-	u_int8_t	awi_addr1[6];
-	u_int8_t	awi_addr2[6];
-	u_int8_t	awi_addr3[6];
-	u_int16_t	awi_seqctl;
+struct awi_mib_stat {
+	u_int8_t	aTransmitted_MPDU_Count[4];
+	u_int8_t	aTransmitted_MSDU_Count[4];
+	u_int8_t	aOctets_Transmitted_Cnt[4];
+	u_int8_t	aMulticast_Transmitted_Frame_Count[2];
+	u_int8_t	aBroadcast_Transmitted_Frame_Count[2];
+	u_int8_t	aFailed_Count[4];
+	u_int8_t	aRetry_Count[4];
+	u_int8_t	aMultiple_Retry_Count[4];
+	u_int8_t	aFrame_Duplicate_Count[4];
+	u_int8_t	aRTS_Success_Count[4];
+	u_int8_t	aRTS_Failure_Count[4];
+	u_int8_t	aACK_Failure_Count[4];
+	u_int8_t	aReceived_Frame_Count [4];
+	u_int8_t	aOctets_Received_Count[4];
+	u_int8_t	aMulticast_Received_Count[2];
+	u_int8_t	aBroadcast_Received_Count[2];
+	u_int8_t	aFCS_Error_Count[4];
+	u_int8_t	aError_Count[4];
+	u_int8_t	aWEP_Undecryptable_Count[4];
 };
 
-struct awi_llc_header
-{
-	u_int8_t	awi_llc_goo[8];
+struct awi_mib_mgt {
+	u_int8_t	aPower_Mgt_Mode;
+	u_int8_t	aScan_Mode;
+#define	AWI_SCAN_PASSIVE		0x00
+#define	AWI_SCAN_ACTIVE			0x01
+#define	AWI_SCAN_BACKGROUND		0x02
+	u_int8_t	aScan_State;
+	u_int8_t	aDTIM_Period;
+	u_int8_t	aATIM_Window[2];
+	u_int8_t	Wep_Required;
+	u_int8_t	_Reserved1;
+	u_int8_t	aBeacon_Period[2];
+	u_int8_t	aPassive_Scan_Duration[2];
+	u_int8_t	aListen_Interval[2];
+	u_int8_t	aMedium_Occupancy_Limit[2];
+	u_int8_t	aMax_MPDU_Time[2];
+	u_int8_t	aCFP_Max_Duration[2];
+	u_int8_t	aCFP_Rate;
+	u_int8_t	Do_Not_Receive_DTIMs;
+	u_int8_t	aStation_ID[2];
+	u_int8_t	aCurrent_BSS_ID[ETHER_ADDR_LEN];
+	u_int8_t	aCurrent_ESS_ID[AWI_ESS_ID_SIZE];
 };
 
-struct awi_assoc_hdr 
-{
-	u_int8_t	awi_cap_info[2];
-	u_int8_t	awi_li[2];
+#define	AWI_GROUP_ADDR_SIZE	4
+struct awi_mib_addr {
+	u_int8_t	aMAC_Address[ETHER_ADDR_LEN];
+	u_int8_t	aGroup_Addresses[AWI_GROUP_ADDR_SIZE][ETHER_ADDR_LEN];
+	u_int8_t	aTransmit_Enable_Status;
+	u_int8_t	_Reserved1;
 };
 
-struct awi_auth_hdr 
-{
-	u_int8_t	awi_algno[2];
-	u_int8_t	awi_seqno[2];
-	u_int8_t	awi_status[2];		
+#define AWI_PWR_LEVEL_SIZE 4
+struct awi_mib_phy {
+	u_int8_t	aSlot_Time[2];
+	u_int8_t	aSIFS[2];
+	u_int8_t	aMPDU_Maximum[2];
+	u_int8_t	aHop_Time[2];
+	u_int8_t	aSuprt_Data_Rates[4];
+	u_int8_t	aCurrent_Reg_Domain;
+#define	AWI_REG_DOMAIN_US	0x10
+#define	AWI_REG_DOMAIN_CA	0x20
+#define	AWI_REG_DOMAIN_EU	0x30
+#define	AWI_REG_DOMAIN_ES	0x31
+#define	AWI_REG_DOMAIN_FR	0x32
+#define	AWI_REG_DOMAIN_JP	0x40
+	u_int8_t	aPreamble_Lngth;
+	u_int8_t	aPLCP_Hdr_Lngth;
+	u_int8_t	Pwr_Up_Time[AWI_PWR_LEVEL_SIZE][2];
+	u_int8_t	IEEE_PHY_Type;
+#define	AWI_PHY_TYPE_FH		1
+#define	AWI_PHY_TYPE_DS		2
+#define	AWI_PHY_TYPE_IR		3
+	u_int8_t	RCR_33A_Bits[8];
 };