Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 17 Sep 2012 23:24:45 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240623 - head/sys/dev/ath/ath_hal
Message-ID:  <201209172324.q8HNOjCr005101@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Mon Sep 17 23:24:45 2012
New Revision: 240623
URL: http://svn.freebsd.org/changeset/base/240623

Log:
  Rename AH_MIMO_MAX_CHAINS to AH_MAX_CHAINS, for compatibility with
  internal atheros HAL code.

Modified:
  head/sys/dev/ath/ath_hal/ah.c
  head/sys/dev/ath/ath_hal/ah.h
  head/sys/dev/ath/ath_hal/ah_internal.h

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Mon Sep 17 23:04:15 2012	(r240622)
+++ head/sys/dev/ath/ath_hal/ah.c	Mon Sep 17 23:24:45 2012	(r240623)
@@ -1053,7 +1053,7 @@ ath_hal_getChanNoise(struct ath_hal *ah,
  * populated with values from NOISE_FLOOR[] + ath_hal_getNfAdjust().
  *
  * The caller must supply ctl/ext NF arrays which are at least
- * AH_MIMO_MAX_CHAINS entries long.
+ * AH_MAX_CHAINS entries long.
  */
 int
 ath_hal_get_mimo_chan_noise(struct ath_hal *ah,
@@ -1069,7 +1069,7 @@ ath_hal_get_mimo_chan_noise(struct ath_h
 		HALDEBUG(ah, HAL_DEBUG_NFCAL,
 		    "%s: invalid channel %u/0x%x; no mapping\n",
 		    __func__, chan->ic_freq, chan->ic_flags);
-		for (i = 0; i < AH_MIMO_MAX_CHAINS; i++) {
+		for (i = 0; i < AH_MAX_CHAINS; i++) {
 			nf_ctl[i] = nf_ext[i] = 0;
 		}
 		return 0;
@@ -1077,7 +1077,7 @@ ath_hal_get_mimo_chan_noise(struct ath_h
 
 	/* Return 0 if there's no valid MIMO values (yet) */
 	if (! (ichan->privFlags & CHANNEL_MIMO_NF_VALID)) {
-		for (i = 0; i < AH_MIMO_MAX_CHAINS; i++) {
+		for (i = 0; i < AH_MAX_CHAINS; i++) {
 			nf_ctl[i] = nf_ext[i] = 0;
 		}
 		return 0;
@@ -1090,7 +1090,7 @@ ath_hal_get_mimo_chan_noise(struct ath_h
 		 * stations which have a very low RSSI, below the
 		 * 'normalised' NF values in NOISE_FLOOR[].
 		 */
-		for (i = 0; i < AH_MIMO_MAX_CHAINS; i++) {
+		for (i = 0; i < AH_MAX_CHAINS; i++) {
 			nf_ctl[i] = nf_ext[i] = NOISE_FLOOR[mode] +
 			    ath_hal_getNfAdjust(ah, ichan);
 		}
@@ -1109,7 +1109,7 @@ ath_hal_get_mimo_chan_noise(struct ath_h
 		 * don't "wrap" when RSSI is less than the "adjusted" NF value.
 		 * ("Adjust" here is via ichan->noiseFloorAdjust.)
 		 */
-		for (i = 0; i < AH_MIMO_MAX_CHAINS; i++) {
+		for (i = 0; i < AH_MAX_CHAINS; i++) {
 			nf_ctl[i] = ichan->noiseFloorCtl[i] + ath_hal_getNfAdjust(ah, ichan);
 			nf_ext[i] = ichan->noiseFloorExt[i] + ath_hal_getNfAdjust(ah, ichan);
 		}

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Mon Sep 17 23:04:15 2012	(r240622)
+++ head/sys/dev/ath/ath_hal/ah.h	Mon Sep 17 23:24:45 2012	(r240623)
@@ -35,7 +35,7 @@
  * This is intended to be used by various statistics gathering operations
  * (NF, RSSI, EVM).
  */
-#define	AH_MIMO_MAX_CHAINS		3
+#define	AH_MAX_CHAINS			3
 #define	AH_MIMO_MAX_EVM_PILOTS		6
 
 /*

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Mon Sep 17 23:04:15 2012	(r240622)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Mon Sep 17 23:24:45 2012	(r240623)
@@ -153,8 +153,8 @@ typedef struct {
 	int16_t		rawNoiseFloor;
 	int16_t		noiseFloorAdjust;
 #ifdef	AH_SUPPORT_AR5416
-	int16_t		noiseFloorCtl[AH_MIMO_MAX_CHAINS];
-	int16_t		noiseFloorExt[AH_MIMO_MAX_CHAINS];
+	int16_t		noiseFloorCtl[AH_MAX_CHAINS];
+	int16_t		noiseFloorExt[AH_MAX_CHAINS];
 #endif	/* AH_SUPPORT_AR5416 */
 	uint16_t	mainSpur;	/* cached spur value for this channel */
 } HAL_CHANNEL_INTERNAL;

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