Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 7 Feb 2011 21:48:26 +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: r218419 - head/sys/dev/ath/ath_hal
Message-ID:  <201102072148.p17LmQ9r023679@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Mon Feb  7 21:48:26 2011
New Revision: 218419
URL: http://svn.freebsd.org/changeset/base/218419

Log:
  Bring over some AR9280-specific v14 additions that exist in ath9k.
  
  Obtained from:	Linux ath9k

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_v14.c
  head/sys/dev/ath/ath_hal/ah_eeprom_v14.h

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Mon Feb  7 21:45:22 2011	(r218418)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Mon Feb  7 21:48:26 2011	(r218419)
@@ -91,7 +91,7 @@ v14EepromGet(struct ath_hal *ah, int par
 		return pBase->openLoopPwrCntl ?  HAL_OK : HAL_EIO;
 	case AR_EEP_DAC_HPWR_5G:
 		if (IS_VERS(>=, AR5416_EEP_MINOR_VER_20)) {
-			*(uint8_t *) val = pBase->dacHiPwrMode;
+			*(uint8_t *) val = pBase->dacHiPwrMode_5G;
 			return HAL_OK;
 		} else
 			return HAL_EIO;

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v14.h	Mon Feb  7 21:45:22 2011	(r218418)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.h	Mon Feb  7 21:48:26 2011	(r218419)
@@ -168,13 +168,16 @@ typedef struct BaseEepHeader {
 	uint8_t		fastClk5g;
 	uint8_t		divChain;  
 	uint8_t		rxGainType;
-	uint8_t		dacHiPwrMode;	/* use the DAC high power mode (MB91) */
+	uint8_t		dacHiPwrMode_5G;/* use the DAC high power mode (MB91) */
 	uint8_t		openLoopPwrCntl;/* 1: use open loop power control,
 					   0: use closed loop power control */
 	uint8_t		dacLpMode;
 	uint8_t		txGainType;	/* high power tx gain table support */
 	uint8_t		rcChainMask;	/* "1" if the card is an HB93 1x2 */
-	uint8_t		futureBase[24];
+	uint8_t		desiredScaleCCK;
+	uint8_t		pwr_table_offset;
+	uint8_t		frac_n_5g;
+	uint8_t		futureBase[21];
 } __packed BASE_EEP_HEADER; // 64 B
 
 typedef struct ModalEepHeader {

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