svn commit: r219475 - head/sys/dev/ath/ath_hal/ar9002

[Adrian Chadd]

Author: adrian
Date: Fri Mar 11 04:31:00 2011
New Revision: 219475
URL: http://svn.freebsd.org/changeset/base/219475

Log:
  Bring over the same fix from the AR5416 PDADC calibration code.
  
  The ath9k driver has a unified boundary/pdadc function, whereas
  ours is split into two (one for each EEPROM type.) This is why
  the AR9280 check is done here where we could safely assume it'll
  always be AR9280 or later.

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c	Fri Mar 11 03:46:27 2011	(r219474)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c	Fri Mar 11 04:31:00 2011	(r219475)
@@ -727,7 +727,10 @@ ar9285GetGainBoundariesAndPdadcs(struct 
 
         /* Find starting index for this pdGain */
         if (i == 0) {
-            ss = 0; /* for the first pdGain, start from index 0 */
+            if (AR_SREV_MERLIN_20_OR_LATER(ah))
+                ss = (int16_t)(0 - (minPwrT4[i] / 2));
+            else
+                ss = 0; /* for the first pdGain, start from index 0 */
         } else {
 	    /* need overlap entries extrapolated below. */
             ss = (int16_t)((pPdGainBoundaries[i-1] - (minPwrT4[i] / 2)) - tPdGainOverlap + 1 + minDelta);