|
@@ -2794,7 +2794,7 @@ static int ath9k_hw_AR9287_get_eeprom_rev(struct ath_hw *ah)
|
|
|
|
|
|
static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
|
|
|
{
|
|
|
- struct ar9287_eeprom_t *eep = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
|
|
u16 *eep_data;
|
|
|
int addr, eep_start_loc = AR9287_EEP_START_LOC;
|
|
|
eep_data = (u16 *)eep;
|
|
@@ -2803,7 +2803,7 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
|
|
|
"Reading from EEPROM, not flash\n");
|
|
|
}
|
|
|
|
|
|
- for (addr = 0; addr < sizeof(struct ar9287_eeprom_t) / sizeof(u16);
|
|
|
+ for (addr = 0; addr < sizeof(struct ar9287_eeprom) / sizeof(u16);
|
|
|
addr++) {
|
|
|
if (!ath9k_hw_nvram_read(ah, addr + eep_start_loc, eep_data)) {
|
|
|
DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
|
|
@@ -2816,12 +2816,12 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
|
|
|
}
|
|
|
static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
|
|
|
{
|
|
|
-#define SIZE_EEPROM_87 (sizeof(struct ar9287_eeprom_t) / sizeof(u16))
|
|
|
+#define SIZE_EEPROM_87 (sizeof(struct ar9287_eeprom) / sizeof(u16))
|
|
|
u32 sum = 0, el, integer;
|
|
|
u16 temp, word, magic, magic2, *eepdata;
|
|
|
int i, addr;
|
|
|
bool need_swap = false;
|
|
|
- struct ar9287_eeprom_t *eep = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
|
|
|
|
|
if (!ath9k_hw_use_flash(ah)) {
|
|
|
if (!ath9k_hw_nvram_read
|
|
@@ -2920,7 +2920,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
|
|
|
static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
|
|
|
enum eeprom_param param)
|
|
|
{
|
|
|
- struct ar9287_eeprom_t *eep = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
|
|
struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
|
|
|
struct base_eep_ar9287_header *pBase = &eep->baseEepHeader;
|
|
|
u16 ver_minor;
|
|
@@ -3210,7 +3210,7 @@ static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
|
|
|
u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0};
|
|
|
u32 reg32, regOffset, regChainOffset;
|
|
|
int16_t modalIdx, diff = 0;
|
|
|
- struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
|
|
|
modalIdx = IS_CHAN_2GHZ(chan) ? 1 : 0;
|
|
|
xpdMask = pEepData->modalHeader.xpdGain;
|
|
|
if ((pEepData->baseEepHeader.version & AR9287_EEP_VER_MINOR_MASK) >=
|
|
@@ -3380,7 +3380,7 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
|
|
|
struct chan_centers centers;
|
|
|
int tx_chainmask;
|
|
|
u16 twiceMinEdgePower;
|
|
|
- struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
|
|
|
tx_chainmask = ah->txchainmask;
|
|
|
|
|
|
ath9k_hw_get_channel_centers(ah, chan, ¢ers);
|
|
@@ -3613,7 +3613,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
|
|
|
{
|
|
|
#define INCREASE_MAXPOW_BY_TWO_CHAIN 6
|
|
|
#define INCREASE_MAXPOW_BY_THREE_CHAIN 10
|
|
|
- struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
|
|
|
struct modal_eep_ar9287_header *pModal = &pEepData->modalHeader;
|
|
|
int16_t ratesArray[Ar5416RateSize];
|
|
|
int16_t txPowerIndexOffset = 0;
|
|
@@ -3776,7 +3776,7 @@ static void ath9k_hw_AR9287_set_addac(struct ath_hw *ah,
|
|
|
static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah,
|
|
|
struct ath9k_channel *chan)
|
|
|
{
|
|
|
- struct ar9287_eeprom_t *eep = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
|
|
struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
|
|
|
|
|
|
u16 antWrites[AR9287_ANT_16S];
|
|
@@ -3928,7 +3928,7 @@ static u8 ath9k_hw_AR9287_get_num_ant_config(struct ath_hw *ah,
|
|
|
static u16 ath9k_hw_AR9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
|
|
|
struct ath9k_channel *chan)
|
|
|
{
|
|
|
- struct ar9287_eeprom_t *eep = &ah->eeprom.map9287;
|
|
|
+ struct ar9287_eeprom *eep = &ah->eeprom.map9287;
|
|
|
struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
|
|
|
return pModal->antCtrlCommon & 0xFFFF;
|
|
|
}
|