summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-02-07 21:48:26 +0000
committeradrian <adrian@FreeBSD.org>2011-02-07 21:48:26 +0000
commitbbca5a8a7e7e3d03f4201f05d16afb0a3d01cc70 (patch)
tree12fd5d32a9c14199a72c45cb2407f33c1912d0ae
parent98a74183c562adb77e882985bf45008730244567 (diff)
downloadFreeBSD-src-bbca5a8a7e7e3d03f4201f05d16afb0a3d01cc70.zip
FreeBSD-src-bbca5a8a7e7e3d03f4201f05d16afb0a3d01cc70.tar.gz
Bring over some AR9280-specific v14 additions that exist in ath9k.
Obtained from: Linux ath9k
-rw-r--r--sys/dev/ath/ath_hal/ah_eeprom_v14.c2
-rw-r--r--sys/dev/ath/ath_hal/ah_eeprom_v14.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v14.c b/sys/dev/ath/ath_hal/ah_eeprom_v14.c
index c58a713..8bb043a 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v14.c
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v14.c
@@ -91,7 +91,7 @@ v14EepromGet(struct ath_hal *ah, int param, void *val)
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;
diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v14.h b/sys/dev/ath/ath_hal/ah_eeprom_v14.h
index 87d21d1..929bf83 100644
--- a/sys/dev/ath/ath_hal/ah_eeprom_v14.h
+++ b/sys/dev/ath/ath_hal/ah_eeprom_v14.h
@@ -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 {
OpenPOWER on IntegriCloud