Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Oct 2004 05:30:32 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 63620 for review
Message-ID:  <200410240530.i9O5UWHD067782@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63620

Change 63620 by sam@sam_ebb on 2004/10/24 05:30:31

	integrate 20041015 patch

Affected files ...

.. //depot/projects/wifi/sys/conf/files#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/README#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/ah.h#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/ah_desc.h#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/ah_devid.h#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_if.m#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/opt_ah.h#2 edit
.. //depot/projects/wifi/sys/contrib/dev/ath/version.h#2 edit
.. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#1 add
.. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.h#1 add
.. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#1 add
.. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.h#1 add
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#2 edit
.. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#2 edit
.. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#2 edit
.. //depot/projects/wifi/sys/dev/ath/if_athrate.h#1 add
.. //depot/projects/wifi/sys/dev/ath/if_athvar.h#2 edit
.. //depot/projects/wifi/sys/dev/awi/awi.c#2 edit
.. //depot/projects/wifi/sys/dev/awi/awivar.h#2 edit
.. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#2 edit
.. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#2 edit
.. //depot/projects/wifi/sys/dev/ray/if_ray.c#2 edit
.. //depot/projects/wifi/sys/dev/wi/if_wi.c#2 edit
.. //depot/projects/wifi/sys/dev/wi/if_wi_pci.c#2 edit
.. //depot/projects/wifi/sys/dev/wi/if_wivar.h#2 edit
.. //depot/projects/wifi/sys/kern/uipc_mbuf.c#2 edit
.. //depot/projects/wifi/sys/modules/Makefile#2 edit
.. //depot/projects/wifi/sys/modules/wlan/Makefile#2 edit
.. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#1 add
.. //depot/projects/wifi/sys/modules/wlan_tkip/Makefile#1 add
.. //depot/projects/wifi/sys/modules/wlan_wep/Makefile#1 add
.. //depot/projects/wifi/sys/modules/wlan_xauth/Makefile#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#1 add
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#2 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#1 add
.. //depot/projects/wifi/sys/sys/mbuf.h#2 edit
.. //depot/projects/wifi/tools/regression/net80211/ccmp/Makefile#1 add
.. //depot/projects/wifi/tools/regression/net80211/ccmp/test_ccmp.c#1 add
.. //depot/projects/wifi/tools/regression/net80211/tkip/Makefile#1 add
.. //depot/projects/wifi/tools/regression/net80211/tkip/test_tkip.c#1 add
.. //depot/projects/wifi/tools/regression/net80211/wep/Makefile#1 add
.. //depot/projects/wifi/tools/regression/net80211/wep/test_wep.c#1 add
.. //depot/projects/wifi/tools/tools/ath/80211stats.c#2 edit
.. //depot/projects/wifi/tools/tools/ath/athstats.c#2 edit

Differences ...

==== //depot/projects/wifi/sys/conf/files#2 (text+ko) ====

@@ -360,6 +360,8 @@
 dev/ath/if_ath.c	optional ath
 dev/ath/if_ath_pci.c	optional ath pci
 dev/ath/if_ath_pci.c	optional ath card
+dev/ath/ath_rate/amrr/amrr.c 	optional ath_rate_amrr
+dev/ath/ath_rate/onoe/onoe.c 	optional ath_rate_onoe
 dev/awi/am79c930.c	optional awi
 dev/awi/awi.c		optional awi
 dev/awi/if_awi_pccard.c	optional awi card
@@ -1271,11 +1273,19 @@
 net/zlib.c		optional geom_uzip
 net80211/ieee80211.c	optional wlan
 net80211/ieee80211_crypto.c	optional wlan
+net80211/ieee80211_crypto_ccmp.c	optional wlan_ccmp
+crypto/rijndael/rijndael-alg-fst.c	optional wlan_ccmp
+crypto/rijndael/rijndael-api.c		optional wlan_ccmp
+net80211/ieee80211_crypto_none.c	optional wlan
+net80211/ieee80211_crypto_tkip.c	optional wlan_tkip
+net80211/ieee80211_crypto_wep.c	optional wlan_wep
+net80211/ieee80211_freebsd.c	optional wlan
 net80211/ieee80211_input.c	optional wlan
 net80211/ieee80211_ioctl.c	optional wlan
 net80211/ieee80211_node.c	optional wlan
 net80211/ieee80211_output.c	optional wlan
 net80211/ieee80211_proto.c	optional wlan
+net80211/ieee80211_xauth.c	optional wlan_xauth
 netatalk/aarp.c		optional netatalk
 netatalk/at_control.c	optional netatalk
 netatalk/at_proto.c	optional netatalk
@@ -1441,7 +1451,6 @@
 netgraph/ng_mppc.c	optional netgraph_mppc_encryption
 netgraph/netflow/ng_netflow.c	optional netgraph_netflow
 netgraph/netflow/netflow.c	optional netgraph_netflow
-crypto/rc4/rc4.c	optional wlan
 crypto/rc4/rc4.c	optional netgraph_mppc_encryption
 crypto/sha1.c		optional netgraph_mppc_encryption
 netgraph/ng_one2many.c	optional netgraph_one2many

==== //depot/projects/wifi/sys/contrib/dev/ath/COPYRIGHT#2 (text+ko) ====

@@ -4,7 +4,7 @@
 redistribution with changes.
 
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -38,5 +38,5 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: COPYRIGHT,v 1.2 2003/06/25 04:50:21 sam Exp $
+ * $Id: COPYRIGHT,v 1.3 2004/01/07 23:09:27 sam Exp $
  */

==== //depot/projects/wifi/sys/contrib/dev/ath/README#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2003/07/02 01:55:27 sam Exp $
+$Id: README,v 1.3 2004/01/07 23:09:27 sam Exp $
 
 
 WARNING: THIS IS A BETA DISTRIBUTION.  THIS SOFTWARE HAS KNOWN PROBLEMS AND
@@ -9,8 +9,8 @@
 Atheros Hardware Access Layer (HAL)
 ===================================
 
-* Copyright (c) 2002, 2003 Sam Leffler.
-* Copyright (c) 2002, 2003 Atheros Communications, Inc.
+* Copyright (c) 2002-2004 Sam Leffler.
+* Copyright (c) 2002-2004 Atheros Communications, Inc.
 * All rights reserved.
 
 Read the file COPYRIGHT for the complete copyright.

==== //depot/projects/wifi/sys/contrib/dev/ath/ah.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: ah.h,v 1.45 2003/12/06 22:58:09 sam Exp $
+ * $Id: ah.h,v 1.71 2004/10/06 15:35:07 sam Exp $
  */
 
 #ifndef _ATH_AH_H_
@@ -49,6 +49,17 @@
 #include "ah_osdep.h"
 
 /*
+ * __ahdecl is analogous to _cdecl; it defines the calling
+ * convention used within the HAL.  For most systems this
+ * can just default to be empty and the compiler will (should)
+ * use _cdecl.  For systems where _cdecl is not compatible this
+ * must be defined.  See linux/ah_osdep.h for an example.
+ */
+#ifndef __ahdecl
+#define __ahdecl
+#endif
+
+/*
  * Status codes that may be returned by the HAL.  Note that
  * interfaces that return a status code set it only when an
  * error occurs--i.e. you cannot check it for success.
@@ -77,6 +88,15 @@
 	AH_TRUE  = 1,
 } HAL_BOOL;
 
+typedef enum {
+	HAL_CAP_REG_DMN		= 0,	/* current regulatory domain */
+	HAL_CAP_CIPHER		= 1,	/* hardware supports cipher */
+	HAL_CAP_TKIP_MIC	= 2,	/* handle TKIP MIC in hardware */
+	HAL_CAP_TKIP_SPLIT	= 3,	/* hardware TKIP uses split keys */
+	HAL_CAP_PHYCOUNTERS	= 4,	/* hardware PHY error counters */
+	HAL_CAP_DIVERSITY	= 5,	/* hardware supports fast diversity */
+} HAL_CAPABILITY_TYPE;
+
 /* 
  * "States" for setting the LED.  These correspond to
  * the possible 802.11 operational states and there may
@@ -108,6 +128,51 @@
 #define	HAL_NUM_TX_QUEUES	10		/* max possible # of queues */
 
 /*
+ * Transmit queue subtype.  These map directly to
+ * WME Access Categories (except for UPSD).  Refer
+ * to Table 5 of the WME spec.
+ */
+typedef enum {
+	HAL_WME_AC_BK	= 0,			/* background access category */
+	HAL_WME_AC_BE	= 1, 			/* best effort access category*/
+	HAL_WME_AC_VI	= 2,			/* video access category */
+	HAL_WME_AC_VO	= 3,			/* voice access category */
+	HAL_WME_UPSD	= 4,			/* uplink power save */
+} HAL_TX_QUEUE_SUBTYPE;
+
+/*
+ * Transmit queue flags that control various
+ * operational parameters.
+ */
+typedef enum {
+	TXQ_FLAG_TXOKINT_ENABLE	    = 0x0001,    /* enable TXOK interrupt */
+	TXQ_FLAG_TXERRINT_ENABLE    = 0x0001,    /* enable TXERR interrupt */
+	TXQ_FLAG_TXDESCINT_ENABLE   = 0x0002,    /* enable TXDESC interrupt */
+	TXQ_FLAG_TXEOLINT_ENABLE    = 0x0004,    /* enable TXEOL interrupt */
+	TXQ_FLAG_TXURNINT_ENABLE    = 0x0008,    /* enable TXURN interrupt */
+	TXQ_FLAG_BACKOFF_DISABLE    = 0x0010,    /* disable Post Backoff  */
+	TXQ_FLAG_COMPRESSION_ENABLE = 0x0020,    /* compression enabled */
+	TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE = 0x0040, /* enable ready time
+							expiry policy */
+	TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE = 0x0080, /* enable backoff while
+							sending fragment burst*/
+} HAL_TX_QUEUE_FLAGS;
+
+typedef struct {
+	u_int32_t	tqi_ver;		/* hal TXQ version */
+	HAL_TX_QUEUE_SUBTYPE tqi_subtype;	/* subtype if applicable */
+	HAL_TX_QUEUE_FLAGS tqi_qflags;		/* flags (see above) */
+	u_int32_t	tqi_priority;
+	u_int32_t	tqi_aifs;		/* AIFS shift */
+	int32_t		tqi_cwmin;		/* cwMin shift */
+	int32_t		tqi_cwmax;		/* cwMax shift */
+	u_int32_t	tqi_cbrPeriod;
+	u_int32_t	tqi_cbrOverflowLimit;
+	u_int32_t	tqi_burstTime;
+	u_int32_t	tqi_readyTime;
+} HAL_TXQ_INFO;
+
+/*
  * Transmit packet types.  This belongs in ah_desc.h, but
  * is here so we can give a proper type to various parameters
  * (and not require everyone include the file).
@@ -212,6 +277,7 @@
 #define	CHANNEL_5GHZ	0x0100	/* 5 GHz spectrum channel */
 #define	CHANNEL_PASSIVE	0x0200	/* Only passive scan allowed in the channel */
 #define	CHANNEL_DYN	0x0400	/* dynamic CCK-OFDM channel */
+#define	CHANNEL_XR	0x0800	/* XR channel */
 
 #define	CHANNEL_A	(CHANNEL_5GHZ|CHANNEL_OFDM)
 #define	CHANNEL_B	(CHANNEL_2GHZ|CHANNEL_CCK)
@@ -222,6 +288,8 @@
 #define	CHANNEL_G	(CHANNEL_2GHZ|CHANNEL_OFDM)
 #endif
 #define	CHANNEL_T	(CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_TURBO)
+#define	CHANNEL_108G	(CHANNEL_2GHZ|CHANNEL_OFDM|CHANNEL_TURBO)
+#define	CHANNEL_X	(CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_XR)
 #define	CHANNEL_ALL \
 	(CHANNEL_OFDM|CHANNEL_CCK|CHANNEL_5GHZ|CHANNEL_2GHZ|CHANNEL_TURBO)
 #define	CHANNEL_ALL_NOTURBO 	(CHANNEL_ALL &~ CHANNEL_TURBO)
@@ -252,11 +320,12 @@
 #else
 	HAL_MODE_11G	= 0x008,
 #endif
+	HAL_MODE_108G	= 0x020,
 	HAL_MODE_ALL	= 0xfff
 };
 
 typedef struct {
-	u_int16_t	rateCount;
+	int		rateCount;		/* NB: for proper padding */
 	u_int8_t	rateCodeToIndex[32];	/* back mapping */
 	struct {
 		u_int8_t	valid;		/* valid for rate control use */
@@ -269,6 +338,8 @@
 						 * info element of MLME */
 		u_int8_t	controlRate;	/* index of next lower basic
 						 * rate; used for dur. calcs */
+		u_int16_t	lpAckDuration;	/* long preamble ACK duration */
+		u_int16_t	spAckDuration;	/* short preamble ACK duration*/
 	} info[32];
 } HAL_RATE_TABLE;
 
@@ -291,14 +362,22 @@
 } HAL_OPMODE;
 
 typedef struct {
-	int		wk_len;
-	u_int8_t	wk_key[16];		/* XXX big enough for WEP */
+	u_int8_t	kv_type;		/* one of HAL_CIPHER */
+	u_int8_t	kv_pad;
+	u_int16_t	kv_len;			/* length in bits */
+	u_int8_t	kv_val[16];		/* enough for 128-bit keys */
+	u_int8_t	kv_mic[8];		/* TKIP MIC key */
 } HAL_KEYVAL;
 
 typedef enum {
 	HAL_CIPHER_WEP		= 0,
-	HAL_CIPHER_AES_CCM	= 1,
-	HAL_CIPHER_CKIP		= 2
+	HAL_CIPHER_AES_OCB	= 1,
+	HAL_CIPHER_AES_CCM	= 2,
+	HAL_CIPHER_CKIP		= 3,
+	HAL_CIPHER_TKIP		= 4,
+	HAL_CIPHER_CLR		= 5,		/* no encryption */
+
+	HAL_CIPHER_MIC		= 127		/* TKIP-MIC, not a cipher */
 } HAL_CIPHER;
 
 enum {
@@ -307,21 +386,40 @@
 };
 
 /*
- * Per-station beacon timer state.
+ * Per-station beacon timer state.  Note that the specified
+ * beacon interval (given in TU's) can also include flags
+ * to force a TSF reset and to enable the beacon xmit logic.
+ * If bs_cfpmaxduration is non-zero the hardware is setup to
+ * coexist with a PCF-capable AP.
  */
 typedef struct {
 	u_int32_t	bs_nexttbtt;		/* next beacon in TU */
 	u_int32_t	bs_nextdtim;		/* next DTIM in TU */
-	u_int16_t	bs_intval;		/* beacon interval/period */
-	u_int8_t	bs_dtimperiod;
-	u_int8_t	bs_cfpperiod;		/* # of DTIMs between CFPs */
+	u_int32_t	bs_intval;		/* beacon interval+flags */
+#define	HAL_BEACON_PERIOD	0x0000ffff	/* beacon interval period */
+#define	HAL_BEACON_ENA		0x00800000	/* beacon xmit enable */
+#define	HAL_BEACON_RESET_TSF	0x01000000	/* clear TSF */
+	u_int32_t	bs_dtimperiod;
+	u_int16_t	bs_cfpperiod;		/* CFP period in TU */
 	u_int16_t	bs_cfpmaxduration;	/* max CFP duration in TU */
-	u_int16_t	bs_cfpduremain;		/* remaining CFP duration */
-	u_int16_t	bs_timoffset;
-	u_int16_t	bs_sleepduration;	/* max sleep duration */
+	u_int32_t	bs_cfpnext;		/* next CFP in TU */
+	u_int16_t	bs_timoffset;		/* byte offset to TIM bitmap */
 	u_int16_t	bs_bmissthreshold;	/* beacon miss threshold */
+	u_int32_t	bs_sleepduration;	/* max sleep duration */
 } HAL_BEACON_STATE;
 
+/*
+ * Per-node statistics maintained by the driver for use in
+ * optimizing signal quality and other operational aspects.
+ */
+typedef struct {
+	u_int32_t	ns_avgbrssi;	/* average beacon rssi */
+	u_int32_t	ns_avgrssi;	/* average data rssi */
+	u_int32_t	ns_avgtxrssi;	/* average tx rssi */
+} HAL_NODE_STATS;
+
+#define	HAL_RSSI_EP_MULTIPLIER	(1<<7)	/* pow2 to optimize out * and / */
+
 struct ath_desc;
 
 /*
@@ -337,7 +435,7 @@
 struct ath_hal {
 	u_int32_t	ah_magic;	/* consistency check magic number */
 	u_int32_t	ah_abi;		/* HAL ABI version */
-#define	HAL_ABI_VERSION	0x03112500	/* YYMMDDnn */
+#define	HAL_ABI_VERSION	0x04093000	/* YYMMDDnn */
 	u_int16_t	ah_devid;	/* PCI device ID */
 	u_int16_t	ah_subvendorid;	/* PCI subvendor ID */
 	HAL_SOFTC	ah_sc;		/* back pointer to driver/os state */
@@ -351,130 +449,144 @@
 	u_int16_t	ah_analog5GhzRev;/* 2GHz radio revision */
 	u_int16_t	ah_analog2GhzRev;/* 5GHz radio revision */
 
-	const HAL_RATE_TABLE *(*ah_getRateTable)(struct ath_hal *, u_int mode);
-	void		(*ah_detach)(struct ath_hal*);
+	const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *,
+				u_int mode);
+	void	  __ahdecl(*ah_detach)(struct ath_hal*);
 
 	/* Reset functions */
-	HAL_BOOL	(*ah_reset)(struct ath_hal *, HAL_OPMODE,
+	HAL_BOOL  __ahdecl(*ah_reset)(struct ath_hal *, HAL_OPMODE,
 				HAL_CHANNEL *, HAL_BOOL bChannelChange,
 				HAL_STATUS *status);
-	HAL_BOOL	(*ah_setPCUConfig)(struct ath_hal *, HAL_OPMODE);
-	HAL_BOOL	(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *);
+	HAL_BOOL  __ahdecl (*ah_phyDisable)(struct ath_hal *);
+	void	  __ahdecl (*ah_setPCUConfig)(struct ath_hal *);
+	HAL_BOOL  __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *);
 
 	/* Transmit functions */
-	HAL_BOOL	(*ah_updateTxTrigLevel)(struct ath_hal*,
+	HAL_BOOL  __ahdecl(*ah_updateTxTrigLevel)(struct ath_hal*,
 				HAL_BOOL incTrigLevel);
-	int		(*ah_setupTxQueue)(struct ath_hal *, HAL_TX_QUEUE type,
-				HAL_BOOL irq);
-	HAL_BOOL	(*ah_releaseTxQueue)(struct ath_hal *ah, u_int q);
-	HAL_BOOL	(*ah_resetTxQueue)(struct ath_hal *ah, u_int q);
-	u_int32_t 	(*ah_getTxDP)(struct ath_hal*, u_int);
-	HAL_BOOL	(*ah_setTxDP)(struct ath_hal*, u_int, u_int32_t txdp);
-	HAL_BOOL	(*ah_startTxDma)(struct ath_hal*, u_int);
-	HAL_BOOL	(*ah_stopTxDma)(struct ath_hal*, u_int);
-	HAL_BOOL	(*ah_setupTxDesc)(struct ath_hal *, struct ath_desc *,
+	int	  __ahdecl(*ah_setupTxQueue)(struct ath_hal *, HAL_TX_QUEUE,
+				const HAL_TXQ_INFO *qInfo);
+	HAL_BOOL  __ahdecl(*ah_setTxQueueProps)(struct ath_hal *, int q, 
+				const HAL_TXQ_INFO *qInfo);
+	HAL_BOOL  __ahdecl(*ah_releaseTxQueue)(struct ath_hal *ah, u_int q);
+	HAL_BOOL  __ahdecl(*ah_resetTxQueue)(struct ath_hal *ah, u_int q);
+	u_int32_t __ahdecl(*ah_getTxDP)(struct ath_hal*, u_int);
+	HAL_BOOL  __ahdecl(*ah_setTxDP)(struct ath_hal*, u_int, u_int32_t txdp);
+	HAL_BOOL  __ahdecl(*ah_startTxDma)(struct ath_hal*, u_int);
+	HAL_BOOL  __ahdecl(*ah_stopTxDma)(struct ath_hal*, u_int);
+	HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_desc *,
 				u_int pktLen, u_int hdrLen,
 				HAL_PKT_TYPE type, u_int txPower,
 				u_int txRate0, u_int txTries0,
 				u_int keyIx, u_int antMode, u_int flags,
 				u_int rtsctsRate, u_int rtsctsDuration);
-	HAL_BOOL	(*ah_setupXTxDesc)(struct ath_hal *, struct ath_desc *,
-				HAL_BOOL shortPreamble,
+	HAL_BOOL  __ahdecl(*ah_setupXTxDesc)(struct ath_hal *, struct ath_desc *,
 				u_int txRate1, u_int txTries1,
 				u_int txRate2, u_int txTries2,
 				u_int txRate3, u_int txTries3);
-	HAL_BOOL	(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *,
+	HAL_BOOL  __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *,
 				u_int segLen, HAL_BOOL firstSeg,
-				HAL_BOOL lastSeg);
-	HAL_STATUS	(*ah_procTxDesc)(struct ath_hal *, struct ath_desc *);
-	HAL_BOOL	(*ah_hasVEOL)(struct ath_hal *);
+				HAL_BOOL lastSeg, const struct ath_desc *);
+	HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_desc *);
+	HAL_BOOL  __ahdecl(*ah_hasVEOL)(struct ath_hal *);
 
 	/* Receive Functions */
-	u_int32_t	(*ah_getRxDP)(struct ath_hal*);
-	void		(*ah_setRxDP)(struct ath_hal*, u_int32_t rxdp);
-	void		(*ah_enableReceive)(struct ath_hal*);
-	HAL_BOOL	(*ah_stopDmaReceive)(struct ath_hal*);
-	void		(*ah_startPcuReceive)(struct ath_hal*);
-	void		(*ah_stopPcuReceive)(struct ath_hal*);
-	void		(*ah_setMulticastFilter)(struct ath_hal*,
+	u_int32_t __ahdecl(*ah_getRxDP)(struct ath_hal*);
+	void	  __ahdecl(*ah_setRxDP)(struct ath_hal*, u_int32_t rxdp);
+	void	  __ahdecl(*ah_enableReceive)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_stopDmaReceive)(struct ath_hal*);
+	void	  __ahdecl(*ah_startPcuReceive)(struct ath_hal*);
+	void	  __ahdecl(*ah_stopPcuReceive)(struct ath_hal*);
+	void	  __ahdecl(*ah_setMulticastFilter)(struct ath_hal*,
 				u_int32_t filter0, u_int32_t filter1);
-	HAL_BOOL	(*ah_setMulticastFilterIndex)(struct ath_hal*,
+	HAL_BOOL  __ahdecl(*ah_setMulticastFilterIndex)(struct ath_hal*,
 				u_int32_t index);
-	HAL_BOOL	(*ah_clrMulticastFilterIndex)(struct ath_hal*,
+	HAL_BOOL  __ahdecl(*ah_clrMulticastFilterIndex)(struct ath_hal*,
 				u_int32_t index);
-	u_int32_t	(*ah_getRxFilter)(struct ath_hal*);
-	void		(*ah_setRxFilter)(struct ath_hal*, u_int32_t);
-	HAL_BOOL	(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *,
+	u_int32_t __ahdecl(*ah_getRxFilter)(struct ath_hal*);
+	void	  __ahdecl(*ah_setRxFilter)(struct ath_hal*, u_int32_t);
+	HAL_BOOL  __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *,
 				u_int32_t size, u_int flags);
-	HAL_STATUS	(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *,
+	HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *,
 				u_int32_t phyAddr, struct ath_desc *next);
-	void		(*ah_rxMonitor)(struct ath_hal *);
+	void	  __ahdecl(*ah_rxMonitor)(struct ath_hal *,
+				const HAL_NODE_STATS *);
+	void	  __ahdecl(*ah_procMibEvent)(struct ath_hal *,
+				const HAL_NODE_STATS *);
 
 	/* Misc Functions */
-	void		(*ah_dumpState)(struct ath_hal *);
-	HAL_BOOL	(*ah_getDiagState)(struct ath_hal *,
-				int, void **, u_int *);
-	void		(*ah_getMacAddress)(struct ath_hal *, u_int8_t *);
-	HAL_BOOL	(*ah_setMacAddress)(struct ath_hal *, const u_int8_t *);
-	HAL_BOOL	(*ah_setRegulatoryDomain)(struct ath_hal*,
+	HAL_STATUS __ahdecl (*ah_getCapability)(struct ath_hal *,
+				HAL_CAPABILITY_TYPE, u_int32_t capability,
+				u_int32_t *result);
+	HAL_BOOL   __ahdecl (*ah_setCapability)(struct ath_hal *,
+				HAL_CAPABILITY_TYPE, u_int32_t capability,
+				u_int32_t setting, HAL_STATUS *);
+	HAL_BOOL   __ahdecl (*ah_getDiagState)(struct ath_hal *, int request,
+				const void *args, u_int32_t argsize,
+				void **result, u_int32_t *resultsize);
+	void	  __ahdecl(*ah_getMacAddress)(struct ath_hal *, u_int8_t *);
+	HAL_BOOL  __ahdecl(*ah_setMacAddress)(struct ath_hal *, const u_int8_t*);
+	HAL_BOOL  __ahdecl(*ah_setRegulatoryDomain)(struct ath_hal*,
 				u_int16_t, HAL_STATUS *);
-	void		(*ah_setLedState)(struct ath_hal*, HAL_LED_STATE);
-	void		(*ah_writeAssocid)(struct ath_hal*,
-				const u_int8_t *bssid, u_int16_t assocId,
-				u_int16_t timOffset);
-	u_int32_t	(*ah_gpioGet)(struct ath_hal*, u_int32_t gpio);
-	void		(*ah_gpioSetIntr)(struct ath_hal*, u_int, u_int32_t);
-	u_int32_t	(*ah_getTsf32)(struct ath_hal*);
-	u_int64_t	(*ah_getTsf64)(struct ath_hal*);
-	void		(*ah_resetTsf)(struct ath_hal*);
-	u_int16_t	(*ah_getRegDomain)(struct ath_hal*);
-	HAL_BOOL	(*ah_detectCardPresent)(struct ath_hal*);
-	void		(*ah_updateMibCounters)(struct ath_hal*, HAL_MIB_STATS*);
-	HAL_BOOL	(*ah_isHwCipherSupported)(struct ath_hal*, HAL_CIPHER);
-	HAL_RFGAIN	(*ah_getRfGain)(struct ath_hal*);
-#if 0
-	u_int32_t	(*ah_getCurRssi)(struct ath_hal*);
-	u_int32_t	(*ah_getDefAntenna)(struct ath_hal*);
-	void		(*ah_setDefAntenna)(struct ath_hal*, u_int32_t antenna);
-#endif
-	HAL_BOOL	(*ah_setSlotTime)(struct ath_hal*, u_int);
+	void	  __ahdecl(*ah_setLedState)(struct ath_hal*, HAL_LED_STATE);
+	void	  __ahdecl(*ah_writeAssocid)(struct ath_hal*,
+				const u_int8_t *bssid, u_int16_t assocId);
+	HAL_BOOL  __ahdecl(*ah_gpioCfgOutput)(struct ath_hal *, u_int32_t gpio);
+	HAL_BOOL  __ahdecl(*ah_gpioCfgInput)(struct ath_hal *, u_int32_t gpio);
+	u_int32_t __ahdecl(*ah_gpioGet)(struct ath_hal *, u_int32_t gpio);
+	HAL_BOOL  __ahdecl(*ah_gpioSet)(struct ath_hal *,
+				u_int32_t gpio, u_int32_t val);
+	void	  __ahdecl(*ah_gpioSetIntr)(struct ath_hal*, u_int, u_int32_t);
+	u_int32_t __ahdecl(*ah_getTsf32)(struct ath_hal*);
+	u_int64_t __ahdecl(*ah_getTsf64)(struct ath_hal*);
+	void	  __ahdecl(*ah_resetTsf)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_detectCardPresent)(struct ath_hal*);
+	void	  __ahdecl(*ah_updateMibCounters)(struct ath_hal*, HAL_MIB_STATS*);
+	HAL_RFGAIN __ahdecl(*ah_getRfGain)(struct ath_hal*);
+	u_int	  __ahdecl(*ah_getDefAntenna)(struct ath_hal*);
+	void	  __ahdecl(*ah_setDefAntenna)(struct ath_hal*, u_int);
+	HAL_BOOL  __ahdecl(*ah_setSlotTime)(struct ath_hal*, u_int);
+	u_int	  __ahdecl(*ah_getSlotTime)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_setAckTimeout)(struct ath_hal*, u_int);
+	u_int	  __ahdecl(*ah_getAckTimeout)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_setCTSTimeout)(struct ath_hal*, u_int);
+	u_int	  __ahdecl(*ah_getCTSTimeout)(struct ath_hal*);
 
 	/* Key Cache Functions */
-	u_int32_t	(*ah_getKeyCacheSize)(struct ath_hal*);
-	HAL_BOOL	(*ah_resetKeyCacheEntry)(struct ath_hal*, u_int16_t);
-	HAL_BOOL	(*ah_isKeyCacheEntryValid)(struct ath_hal *, u_int16_t);
-	HAL_BOOL	(*ah_setKeyCacheEntry)(struct ath_hal*,
+	u_int32_t __ahdecl(*ah_getKeyCacheSize)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_resetKeyCacheEntry)(struct ath_hal*, u_int16_t);
+	HAL_BOOL  __ahdecl(*ah_isKeyCacheEntryValid)(struct ath_hal *,u_int16_t);
+	HAL_BOOL  __ahdecl(*ah_setKeyCacheEntry)(struct ath_hal*,
 				u_int16_t, const HAL_KEYVAL *,
 				const u_int8_t *, int);
-	HAL_BOOL	(*ah_setKeyCacheEntryMac)(struct ath_hal*,
+	HAL_BOOL  __ahdecl(*ah_setKeyCacheEntryMac)(struct ath_hal*,
 				u_int16_t, const u_int8_t *);
 
 	/* Power Management Functions */
-	HAL_BOOL	(*ah_setPowerMode)(struct ath_hal*,
+	HAL_BOOL  __ahdecl(*ah_setPowerMode)(struct ath_hal*,
 				HAL_POWER_MODE mode, int setChip,
 				u_int16_t sleepDuration);
-	HAL_POWER_MODE	(*ah_getPowerMode)(struct ath_hal*);
-	HAL_BOOL	(*ah_queryPSPollSupport)(struct ath_hal*);
-	HAL_BOOL	(*ah_initPSPoll)(struct ath_hal*);
-	HAL_BOOL	(*ah_enablePSPoll)(struct ath_hal *,
+	HAL_POWER_MODE __ahdecl(*ah_getPowerMode)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_queryPSPollSupport)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_initPSPoll)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_enablePSPoll)(struct ath_hal *,
 				u_int8_t *, u_int16_t);
-	HAL_BOOL	(*ah_disablePSPoll)(struct ath_hal *);
+	HAL_BOOL  __ahdecl(*ah_disablePSPoll)(struct ath_hal *);
 
 	/* Beacon Management Functions */
-	void		(*ah_beaconInit)(struct ath_hal *, HAL_OPMODE,
-				u_int32_t, u_int32_t);
-	void		(*ah_setStationBeaconTimers)(struct ath_hal*,
-				const HAL_BEACON_STATE *, u_int32_t tsf,
-				u_int32_t dtimCount, u_int32_t cfpCcount);
-	void		(*ah_resetStationBeaconTimers)(struct ath_hal*);
-	HAL_BOOL	(*ah_waitForBeaconDone)(struct ath_hal *,
+	void	  __ahdecl(*ah_beaconInit)(struct ath_hal *,
+				u_int32_t nexttbtt, u_int32_t intval);
+	void	  __ahdecl(*ah_setStationBeaconTimers)(struct ath_hal*,
+				const HAL_BEACON_STATE *);
+	void	  __ahdecl(*ah_resetStationBeaconTimers)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_waitForBeaconDone)(struct ath_hal *,
 				HAL_BUS_ADDR);
 
 	/* Interrupt functions */
-	HAL_BOOL	(*ah_isInterruptPending)(struct ath_hal*);
-	HAL_BOOL	(*ah_getPendingInterrupts)(struct ath_hal*, HAL_INT *);
-	HAL_INT		(*ah_getInterrupts)(struct ath_hal*);
-	HAL_INT		(*ah_setInterrupts)(struct ath_hal*, HAL_INT);
+	HAL_BOOL  __ahdecl(*ah_isInterruptPending)(struct ath_hal*);
+	HAL_BOOL  __ahdecl(*ah_getPendingInterrupts)(struct ath_hal*, HAL_INT *);
+	HAL_INT	  __ahdecl(*ah_getInterrupts)(struct ath_hal*);
+	HAL_INT	  __ahdecl(*ah_setInterrupts)(struct ath_hal*, HAL_INT);
 };
 
 /* 
@@ -482,7 +594,7 @@
  * and return a printable description for any Atheros hardware.
  * AH_NULL is returned if the ID's do not describe Atheros hardware.
  */
-extern	const char *ath_hal_probe(u_int16_t vendorid, u_int16_t devid);
+extern	const char *__ahdecl ath_hal_probe(u_int16_t vendorid, u_int16_t devid);
 
 /*
  * Attach the HAL for use with the specified device.  The device is
@@ -497,7 +609,7 @@
  * null (AH_NULL) reference will be returned and a status code will
  * be returned if the status parameter is non-zero.
  */
-extern	struct ath_hal *ath_hal_attach(u_int16_t devid, HAL_SOFTC,
+extern	struct ath_hal * __ahdecl ath_hal_attach(u_int16_t devid, HAL_SOFTC,
 		HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS* status);
 
 /*
@@ -511,25 +623,26 @@
  * number of channels returned.  If a problem occurred or there were
  * no channels that met the criteria then AH_FALSE is returned.
  */
-extern	HAL_BOOL ath_hal_init_channels(struct ath_hal *,
+extern	HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *,
 		HAL_CHANNEL *chans, u_int maxchans, u_int *nchans,
-		HAL_CTRY_CODE cc, u_int16_t modeSelect, int enableOutdoor);
+		HAL_CTRY_CODE cc, u_int16_t modeSelect,
+		HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels);
 
 /*
  * Return bit mask of wireless modes supported by the hardware.
  */
-extern	u_int ath_hal_getwirelessmodes(struct ath_hal *ah, HAL_CTRY_CODE cc);
+extern	u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*, HAL_CTRY_CODE);
 
 /*
  * Return rate table for specified mode (11a, 11b, 11g, etc).
  */
-extern	const HAL_RATE_TABLE *ath_hal_getratetable(struct ath_hal *,
+extern	const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *,
 		u_int mode);
 
 /*
  * Calculate the transmit duration of a frame.
  */
-extern u_int16_t ath_hal_computetxtime(struct ath_hal *,
+extern u_int16_t __ahdecl ath_hal_computetxtime(struct ath_hal *,
 		const HAL_RATE_TABLE *rates, u_int32_t frameLen,
 		u_int16_t rateix, HAL_BOOL shortPreamble);
 
@@ -537,11 +650,15 @@
  * Convert between IEEE channel number and channel frequency
  * using the specified channel flags; e.g. CHANNEL_2GHZ.
  */
-extern	u_int ath_hal_mhz2ieee(u_int mhz, u_int flags);
-extern	u_int ath_hal_ieee2mhz(u_int ieee, u_int flags);
+extern	u_int __ahdecl ath_hal_mhz2ieee(u_int mhz, u_int flags);
+extern	u_int __ahdecl ath_hal_ieee2mhz(u_int ieee, u_int flags);
 
 /*
  * Return a version string for the HAL release.
  */
 extern	char ath_hal_version[];
+/*
+ * Return a NULL-terminated array of build/configuration options.
+ */
+extern	const char* ath_hal_buildopts[];
 #endif /* _ATH_AH_H_ */

==== //depot/projects/wifi/sys/contrib/dev/ath/ah_desc.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: ah_desc.h,v 1.11 2003/06/25 04:50:22 sam Exp $
+ * $Id: ah_desc.h,v 1.14 2004/02/19 22:53:16 sam Exp $
  */
 
 #ifndef _DEV_ATH_DESC_H
@@ -53,6 +53,7 @@
 	u_int16_t	ts_tstamp;	/* h/w assigned timestamp */
 	u_int8_t	ts_status;	/* frame status, 0 => xmit ok */
 	u_int8_t	ts_rate;	/* h/w transmit rate index */
+#define	HAL_TXSTAT_ALTRATE	0x80	/* alternate xmit rate used */
 	int8_t		ts_rssi;	/* tx ack RSSI */
 	u_int8_t	ts_shortretry;	/* # short retries */
 	u_int8_t	ts_longretry;	/* # long retries */
@@ -72,10 +73,17 @@
  *
  * If rx_status is zero, then the frame was received ok;
  * otherwise the error information is indicated and rs_phyerr
- * contains a phy error code if HAL_RXERR_PHY is set.
+ * contains a phy error code if HAL_RXERR_PHY is set.  In general
+ * the frame contents is undefined when an error occurred thought
+ * for some errors (e.g. a decryption error), it may be meaningful.
  *
  * Note that the receive timestamp is expanded using the TSF to
  * a full 16 bits (regardless of what the h/w provides directly).
+ *
+ * rx_rssi is in units of dbm above the noise floor.  This value
+ * is measured during the preamble and PLCP; i.e. with the initial
+ * 4us of detection.  The noise floor is typically a consistent
+ * -96dBm absolute power in a 20MHz channel.
  */
 struct ath_rx_status {
 	u_int16_t	rs_datalen;	/* rx frame length */

==== //depot/projects/wifi/sys/contrib/dev/ath/ah_devid.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: ah_devid.h,v 1.7 2003/10/22 21:17:40 sam Exp $
+ * $Id: ah_devid.h,v 1.11 2004/06/08 21:00:22 sam Exp $
  */
 
 #ifndef _DEV_ATH_DEVID_H_
@@ -45,7 +45,8 @@
  *     of 0x168c, but some vendors, in their infinite wisdom
  *     do not follow this so we must handle them specially.
  */
-#define	ATHEROS_3COM_VENDOR_ID	0xa727		/* 3Com PCI vendor ID */
+#define	ATHEROS_3COM_VENDOR_ID	0xa727		/* 3Com 3CRPAG175 vendor ID */
+#define	ATHEROS_3COM2_VENDOR_ID	0x10b7		/* 3Com 3CRDAG675 vendor ID */
 
 /* AR5210 (for reference) */
 #define AR5210_DEFAULT          0x1107          /* No eeprom HW default */
@@ -64,6 +65,9 @@
 #define AR5212_DEVID            0x0013          /* Final ar5212 devid */
 #define AR5212_FPGA             0xf013          /* Emulation board */
 #define	AR5212_DEVID_IBM	0x1014          /* IBM minipci ID */
+#define AR5212_AR5312_REV2      0x0052          /* AR5312 WMAC (AP31) */
+#define AR5212_AR5312_REV7      0x0057          /* AR5312 WMAC (AP30-040) */
+#define AR5212_AR2313_REV8      0x0058          /* AR2313 WMAC (AP43-030) */
 
 #define	AR_SUBVENDOR_ID_NOG	0x0e11		/* No 11G subvendor ID */
 #endif /* _DEV_ATH_DEVID_H */

==== //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_if.m#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+# Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
 # Communications, Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGES.
 #
-# $Id: ah_if.m,v 1.4 2003/06/25 04:55:02 sam Exp $
+# $Id: ah_if.m,v 1.5 2004/01/07 23:09:30 sam Exp $
 #
 
 INTERFACE ath_hal;

==== //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: ah_osdep.c,v 1.28 2003/11/01 01:43:21 sam Exp $
+ * $Id: ah_osdep.c,v 1.34 2004/09/16 23:23:02 sam Exp $
  */
 #include "opt_ah.h"
 
@@ -73,9 +73,10 @@
 SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0, "Atheros HAL parameters");
 
 #ifdef AH_DEBUG
-static	int ath_hal_debug = 0;		/* XXX */
+static	int ath_hal_debug = 0;
 SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RW, &ath_hal_debug,
 	    0, "Atheros HAL debugging printfs");
+TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug);
 #endif /* AH_DEBUG */
 
 SYSCTL_STRING(_hw_ath_hal, OID_AUTO, version, CTLFLAG_RD, ath_hal_version, 0,
@@ -367,6 +368,18 @@
 		(((uint64_t)1000 * (uint32_t)(bt.frac >> 32)) >> 32);
 }
 
+void
+ath_hal_memzero(void *dst, size_t n)
+{
+	bzero(dst, n);
+}
+
+void *
+ath_hal_memcpy(void *dst, const void *src, size_t n)
+{
+	return memcpy(dst, src, n);
+}
+
 /*
  * Module glue.
  */

==== //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,7 +33,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: ah_osdep.h,v 1.10 2003/11/01 01:21:31 sam Exp $
+ * $Id: ah_osdep.h,v 1.16 2004/09/16 23:23:02 sam Exp $
  */
 #ifndef _ATH_AH_OSDEP_H_
 #define _ATH_AH_OSDEP_H_
@@ -58,10 +58,12 @@
 #define	OS_DELAY(_n)	ath_hal_delay(_n)
 
 #define	OS_INLINE	__inline
-#define	OS_MEMZERO(_a, _size)		bzero((_a), (_size))
-#define	OS_MEMCPY(_dst, _src, _size)	bcopy((_src), (_dst), (_size))
-#define	OS_MACEQU(_a, _b) \
-	(bcmp((_a), (_b), IEEE80211_ADDR_LEN) == 0)
+#define	OS_MEMZERO(_a, _n)	ath_hal_memzero((_a), (_n))
+extern void ath_hal_memzero(void *, size_t);
+#define	OS_MEMCPY(_d, _s, _n)	ath_hal_memcpy(_d,_s,_n)
+extern void *ath_hal_memcpy(void *, const void *, size_t);
+
+#define	abs(_a)		__builtin_abs(_a)
 
 struct ath_hal;
 extern	u_int32_t ath_hal_getuptime(struct ath_hal *);

==== //depot/projects/wifi/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting, Atheros
+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -33,3527 +33,3547 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGES.
  *
- * $Id: i386-elf.hal.o.uu,v 1.11 2003/12/07 02:20:39 sam Exp $
+ * $Id: i386-elf.hal.o.uu,v 1.25 2004/10/13 21:18:38 sam Exp $
  */
+#define	ATH_HAL_VERSION	"0.9.12.13"
 begin 644 hal.o
-M?T5,1@$!`0D```````````$``P`!``````````````#$%P(``````#0`````
-M`"@`#0`*`````````````````%6)Y0^W50B!^A00``!T<8'Z%!```'\9@_H2
-M?PR#^A%]5(/Z!W1(ZU^#^A-T4^M8D('Z$Q$``'1(@?H3$0``?Q*!^@<1``!T
-M)H'Z$A$``'0EZS6X`````('Z$_```'0QN!0```"!^AOQ``!T).L9N"@```#K
-M&[@U````ZQ2-="8`N$(```#K";@`````C70F`%W#C;0F`````(V\)P````!5
-MB>6#[`0/MU4(#[=-#&:!^HP6=`RX`````&:!^B>G=0B)#"3H-____XGL7<.-
-M=@!5B>564X/L%(MU#(M=$(M5%(M-&`^W10@]%!```'13/100``!_((/X$G\*
-M@_@1?6&#^`?K"H/X$W0]/0<"``!T:NF.````/1,1``!T*CT3$0``?PX]!Q$`
-M`'10/1(1``#K##T3\```=`X]&_$``'0AZV*X$P```(E,)!")5"0,B5PD"(ET
-M)`2)!"3H_/___^L_B4PD$(E4)`R)7"0(B70D!(D$).C\____ZR6)3"00B50D
-M#(E<)`B)="0$B00DZ/S___^-M@````"-O"<`````B<+K#+H`````QP$!````
-MD(72=$L/MX),`0``9HE""`^W@DX!``!FB4(*BX)0`0``B4(<#[>"5`$``&:)
-M0B`/MX)6`0``9HE"(@^W@E@!``!FB4(D#[>"6@$``&:)0B:)T(/$%%M>7<.0
-MC;0F`````%6)Y5=64X/L!(M]"+L`````BW4,C;8`````C;\`````BT<4@W\0
-M`'4'C10&[>L$D(L$!B-%$+H!````.T44=!K'!"0*````Z/S___]#@?OG`P``
-M?LNZ`````(G0@\0$6UY?7<.-M@````"-OP````!5B>564XM-"(MU#+L`````
-MN``````Y\',8C;0F`````(T4`(G(@^`!"=#1Z4,Y\W+O6UY=PXUT)@"-O"<`
-M````58GE@^P,B1PDB70D!(E\)`B+30R+=1`/MU44#[=<T20/MD31(X/X`G1F
-M@_@"?PF%P'0=Z=L```"#^`-T>H/X!`^$F````.G(````D(UT)@"_P````(-]
-M&`!T%8!\T2<`=`Z_8````(GVC;PG`````(T$]0````!IP.@#``"Z`````/?S
-MC40X"NF+````C78`C12=`````+C336(0]^+!Z@:-1/(5B=&Z`````/?QC02%
-M)````.MAC13=`````+C336(0]^+!Z@:-1/(5B=&Z`````/?QC02%%@```.LZ
-MC12=`````+C336(0]^+!Z@:-1/(5B=&Z`````/?QP>`"@?OG`P``=P<%O0``
-M`.L*@\!<ZP6X``````^WP(L<)(MT)`2+?"0(B>Q=PXVV`````%6)Y8M-#/9!
-M`B!T![H"````ZTH/MT$")<````"Z`P```#W`````=#4/MT$")=````"Z!```
-M`#W0````="#V00(0=`VZ`0```.L3C;8`````]D$#"`^5P`^VT(T4DHG07</K
-M#9"0D)"0D)"0D)"0D)!5B>6+50B+10R$P'D7N`X```"!^K0)``!T78'ZLPD`
-M`'<NZQKVQ`%U/+@.````@?JT"0``=$&!^K,)``!W"('J9PD``.LE@?J'$P``
-M=Q>)]H'JT`D``+C-S,S,]^+!Z@2-0@_K$H'JB!,``+C-S,S,]^*)T,'H`EW#
-MC;0F`````%6)Y8M5"(M%#(3`>1.XM`D``(/Z#G19@_H-=ACK,HGV]L0!=3NX
-MM`D``(/Z#G1!@_H-=PR-!)(%9PD``.LRB?:#^AIW&XUT)@"-O"<`````C022
-MC02%I`@``.L4C70F`(T$D@6($P``D(VT)@````!=PXVT)@````"-O"<`````
-M58GE5E.+70R`>P(`=5*Y`````(VV`````(V\)P````#&1!D"_T&#^1]^];D`
-M````#[<#B<8YP7TGC;0F``````^V1,LF#[;0B$P:`@I$RR</ML"(3!@"03GQ
-M?.2-="8`6UY=PXVV`````(V_`````%6)Y;@`````7<.-M@````!5B>575E.#
-M[$"+=0B+70R-0Q")P3M%$`^'Z@```(UV`(M6%(-^$`!U"`'*[8E%Y.L&BQ01
-MB57DBTX4C5,,@WX0`'4-C10*[8E%\.L*C70F`(L,"HE-\(M.%(U3"(-^$`!U
-M#HT4"NV)1>SK"Y"-="8`BPP*B4WLBTX4C5,$@WX0`'4.C10*[8G'ZPF-M@``
-M``"+/`J+3A2#?A``=0B-%`OMB<+K`XL4"XM%Y(E$)"R-0Q")1"0HBT7PB40D
-M)(U##(E$)""+1>R)1"0<C4,(B40D&(E\)!2-0P2)1"00B50D#(E<)`C'1"0$
-M3P```,<$)`````#H_/___X/#%(U+$#M-$`^&&?___XM%$"G8@_@(#X0Y`0``
-M@_@(=PZ#^`0/A'T!``#IJ`$``(/X#`^$IP```(/X$`^%E@$``(M6%(U##(-^
-M$`!U"`'"[8E%Z.L&BQ00B57HBU84C4,(@WX0`'4'`<+MB<?K`XL\$(M6%(U#
-M!(-^$`!U!P'"[8G!ZP.+#!"+5A2#?A``=0<!VNV)PNL#BQ03BT7HB40D)(U#
-M#(E$)"")?"0<C4,(B40D&(E,)!2-0P2)1"00B50D#(E<)`C'1"0$A@```,<$
-M)`````#H_/___^GX````BU84C4,(@WX0`'4'`<+MB<?K`XL\$(M6%(U#!(-^
-M$`!U!P'"[8G!ZP.+#!"+5A2#?A``=0<!VNV)PNL#BQ03B7PD'(U#"(E$)!B)
-M3"04C4,$B40D$(E4)`R)7"0(QT0D!+(```#'!"0`````Z/S____I@@```(M6
-M%(U#!(-^$`!U!P'"[8G!ZP.+#!"+5A2#?A``=0<!VNV)PNL#BQ03B4PD%(U#
-M!(E$)!")5"0,B5PD",=$)`33````QP0D`````.C\____ZS"+5A2#?A``=04!
-MVNWK`XL$$XE$)`R)7"0(QT0D!.D```#'!"0`````Z/S___^-=@"#Q$!;7E]=
-MPY"-M"8`````58GE5U93@^PTBW4(BWT,NP````"#?1`##X;$````B?:+5A2+
-M1-\<@WX0`'4(`<+MB47PZP:+%!")5?"+5A2+1-\4@WX0`'4(`<+MB47LZP:+
-M%!")5>R+5A2+1-\,@WX0`'4-`<+MB<'K"8VV`````(L,$(M6%(M$WP2#?A``
-M=0<!PNV)PNL#BQ00BT7PB40D)(M$WQB)1"0@BT7LB40D'(M$WQ")1"08B4PD
-M%(M$WPB)1"00B50D#(L$WXE$)`C'1"0$]````,<$)`````#H_/___X/#!(U#
-M`SM%$`^"/O___XM%$"G8@_@"#X2D````@_@"=PZ#^`$/A/$```#I+0$``(/X
-M`P^%)`$``(M6%(M$WQ2#?A``=0@!PNV)1>CK!HL4$(E5Z(M6%(M$WPR#?A``
-M=0<!PNV)P>L#BPP0BU84BT3?!(-^$`!U!P'"[8G"ZP.+%!"+1>B)1"0<BT3?
-M$(E$)!B)3"04BT3?"(E$)!")5"0,BP3?B40D",=$)`0@`0``QP0D`````.C\
-M____Z9P```"+5A2+1-\,@WX0`'4'`<+MB<'K`XL,$(M6%(M$WP2#?A``=0<!
-MPNV)PNL#BQ00B4PD%(M$WPB)1"00B50D#(L$WXE$)`C'1"0$00$``,<$)```
-M``#H_/___^M!BU84BT3?!(-^$`!U!0'"[>L#BP00B40D#(L$WXE$)`C'1"0$
-M5P$``,<$)`````#H_/___XVV`````(V\)P````"#Q#1;7E]=PY"0D)"0D)"0
-M58GE5U93@^P(BUT4#[=%#(E%\`^W?1"+10AF@3@!,'<)QT7L`````.L'QT7L
-M%@```+X`````C78`C;PG`````(M5[`^W!'*)P0^OS[ID````*<*)T`^O1?`!
-MP;@?A>M1]^G!^@7!^1\IRF:)$X/#`D:#_@I^RH/$"%M>7UW#B?95B>4/MU4,
-MB=!F@?K_`'0[BT4(9H$X`C!W)F:#^CYV$(T$D@4B%0``ZQZ-M@````"-!)*-
-MA`#L$P``ZPR-="8`C022!<`2```/M\!=PXUV`%6)Y0^W50R)T&:!^O\`=!N+
-M10AF@3@",'<(C8)@"0``ZP:-@OP(```/M\!=PXUV`%6)Y5=64X/L$(M]#&:!
-M/_\_=AUF@W\L`'069H-_%@`/A&P"``"-="8`C;PG`````&:!/P(P=FV^4`$`
-M`+L`````9H._6`$````/A$("``"0C47RB40D"(GRC48!#[?PB50D!(M%"(D$
-M)/]5$+H`````A<`/A!T"```/MD7S9HF$7T0!```/MD7R9HF$7T8!``"#PP(/
-MMX=8`0``.<-\L>FQ`0``C47RB40D"+X!`0``QT0D!``!``"+10B)!"3_51"Z
-M`````(7`#X3(`0``#[=5\HG0P>@)9HF'1`$``(G0P>@"@^!_9HF'1@$``,'B
-M!8/B?V:)ET@!``"-1?*)1"0(B?*-1@$/M_")5"0$BT4(B00D_U40N@````"%
-MP`^$<P$```^W5?*)T<'I"P^WAT@!```)R&:)AT@!``")T,'H!(/@?V:)ATH!
-M``#!X@.#XG]FB9=,`0``C47RB40D"(GRC48!#[?PB50D!(M%"(D$)/]5$+H`
-M````A<`/A!4!```/MU7RB='!Z0T/MX=,`0``"<AFB8=,`0``B=#!Z`:#X']F
-MB8=.`0```=*#XG]FB9=0`0``C47RB40D"(GRC48!#[?PB50D!(M%"(D$)/]5
-M$+H`````A<`/A+@````/MU7RB='!Z0\/MX=0`0``"<AFB8=0`0``B=#!Z`B#
-MX']FB8=2`0``B=#1Z(/@?V:)AU0!``#!X@:#XG]FB9=6`0``C47RB40D"(ET
-M)`2+10B)!"3_51"Z`````(7`=%@/MU7RP>H*#[>'5@$```G09HF'5@$``+L`
-M````9H._6`$```!T+0^WMU@!``"0C70F``^WA%]$`0``B40D!(D\).C\_/__
-M9HF$7T0!``!#.?-\W[H!````B="#Q!!;7E]=PU6)Y5=64X/L$(M%#(M]$`^W
-M4!2)5?")1>R-!)*-!(*-5!(#P>H"`=#!X`*)!"3H_/___XG"N`````"%T@^$
-MN````(D7BTWPC40)`R7\_P<`C000B4<(9HE/!+X`````.W7P#XV-````D(VT
-M)@````"+'XM/"(T$MHT$AHE%Z(M%[`^W%'"+1>AFB12!9HD4<[D`````C02V
-MC02&C1R%`````(VT)@````"-O"<`````C02)C02#B<(#5PAFB4H$`T<(9L=`
-M!@``08/Y`W[BBT<(C12VC126P>("9L=$$`8$`(M'"&;'1!!"`P!&.W7P#XQ[
-M____N`$```"#Q!!;7E]=PXVT)@````"-O"<`````58GE5U93@^P,BWT0BU4,
-M#[="%F:)1P:!9?```/__@4WPK=X``&;'1?*MWKH`````#[=?!KD`````C77P
-MC70F`(G8T_BH`703N`````"#^@$/CQ4"``!FB0Q60D&#^0-^WXM-#`^W011F
-MB4<$9H7`=0JX`````.GP`0``QT7L`````&:#?P0`#X39`0``C78`BT7LC11`
-MC120BTT,C111C7(8BU\(C02`BTWLC02!P>`"#[=2&&:)%`.+7P@/MU829HE4
-M`P*Y`````(M5[(T$DHT$@HT4A0````"-M@````"-!(F-!((#1PAFQT`&``!!
-M@_D#?NMF@7WRK=YU;0^W3?"+1>R-%("-%)"-!(G!X`*-')`#7PB#PP1FQT,"
-M!``/MT8"9HE#!`^W5@8!T&:)0P8/MU8*`=!FB4,(#[=6#@'09HE#"@^W1@1F
-MB4,,#[=&"&:)0PX/MT8,9HE#$`^W1A!FB4,2Z>P```"+5>R-!)*-!(+!X`*)
-M1>@/MT7PC02`BTWHC02!`T<(#[=6`F:)4`@/MT7RC02`C02!`T<(9L=`"!0`
-M#[=%\HT$@(T$@0-'"&;'0`HC``^W1?*-!("-!($#1PAFQT`,/P`/MTWPC02)
-MBU7HC1R"`U\(@\,$9L=#`@0`#[=#!`^W5@8!T&:)0P8/MU8*`=!FB4,(#[=6
-M#@'09HE#"@^W1@1FB4,,#[=&"&:)0PX/MT8,9HE#$`^W1A!FB4,2#[=-\HT$
-MB8M-Z(T<@0-?"(/#!&;'0P(#``^W1A1FB4,,#[=&%F:)0PX/MT889HE#$/]%
-M[`^W1P0Y1>P/C"K^__^X`0```(/$#%M>7UW#C;8`````C;PG`````%6)Y5=6
-M4X'L6`$``+]0`0``QX6L_O__`````,>%J/[__P````"#O:S^__\!#X30````
-M@[VL_O__`7\5@[VL_O__`'0CZ2D!``"-M"8`````NP````"#O:S^__\"#X3?
-M````Z0L!``"#O:C^__\)#X\,`0``C47RB40D"(E\)`1'BT4(B00D_U40N@``
-M``"%P`^$V`,``(!]\@`/A.````"+G:C^__\/MD7R_X6H_O__B40D!(M5#(D4
-M).B1^/__9HE$7=`/ME7SA-(/A+````"+G:C^____A:C^__^)5"0$BTT,B0PD
-MZ&7X__]FB41=T(.]J/[__PD/CG?____I?@```+L`````B?:-O"<`````BT4,
-M9H&\6#8!``#_`'0:#[>$6#8!``"+C:C^__]FB41-T$&)C:C^__]#@_L"?M'K
-M/XM%#&:!O%@P`0``_P!T&@^WA%@P`0``BXVH_O__9HE$3=!!B8VH_O__0X/[

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410240530.i9O5UWHD067782>