Skip to content

K
Kernel

openeuler / Kernel
大约 1 年 前同步成功

通知 6
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 4ddfcd7d 编写于 作者: F Felix Fietkau 提交者： John W. Linville
浏览文件
操作

ath9k_hw: clean up duplicate and unnused eeprom related defines 

AR*_MAX_RATE_POWER => MAX_RATE_POWER
AR*_EEPROM_MODAL_SPURS => AR_EEPROM_MODAL_SPURS
AR*_OPFLAGS_* => AR5416_OPFLAGS_*
...
Signed-off-by: NFelix Fietkau <nbd@openwrt.org>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 040b74f7
隐藏空白更改
内联 并排
Showing with 77 addition and 138 deletion
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
浏览文件 @ 4ddfcd7d
...@@ -72,7 +72,7 @@ static const struct ar9300_eeprom ar9300_default = { ...@@ -72,7 +72,7 @@ static const struct ar9300_eeprom ar9300_default = {
.regDmn = { LE16(0), LE16(0x1f) }, .regDmn = { LE16(0), LE16(0x1f) },
.txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */
.opCapFlags = { .opCapFlags = {
.opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A,
.eepMisc = 0, .eepMisc = 0,
}, },
.rfSilent = 0, .rfSilent = 0,
...@@ -649,7 +649,7 @@ static const struct ar9300_eeprom ar9300_x113 = { ...@@ -649,7 +649,7 @@ static const struct ar9300_eeprom ar9300_x113 = {
.regDmn = { LE16(0), LE16(0x1f) }, .regDmn = { LE16(0), LE16(0x1f) },
.txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */
.opCapFlags = { .opCapFlags = {
.opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A,
.eepMisc = 0, .eepMisc = 0,
}, },
.rfSilent = 0, .rfSilent = 0,
...@@ -1227,7 +1227,7 @@ static const struct ar9300_eeprom ar9300_h112 = { ...@@ -1227,7 +1227,7 @@ static const struct ar9300_eeprom ar9300_h112 = {
.regDmn = { LE16(0), LE16(0x1f) }, .regDmn = { LE16(0), LE16(0x1f) },
.txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */
.opCapFlags = { .opCapFlags = {
.opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A,
.eepMisc = 0, .eepMisc = 0,
}, },
.rfSilent = 0, .rfSilent = 0,
...@@ -1805,7 +1805,7 @@ static const struct ar9300_eeprom ar9300_x112 = { ...@@ -1805,7 +1805,7 @@ static const struct ar9300_eeprom ar9300_x112 = {
.regDmn = { LE16(0), LE16(0x1f) }, .regDmn = { LE16(0), LE16(0x1f) },
.txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */
.opCapFlags = { .opCapFlags = {
.opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A,
.eepMisc = 0, .eepMisc = 0,
}, },
.rfSilent = 0, .rfSilent = 0,
...@@ -2382,7 +2382,7 @@ static const struct ar9300_eeprom ar9300_h116 = { ...@@ -2382,7 +2382,7 @@ static const struct ar9300_eeprom ar9300_h116 = {
.regDmn = { LE16(0), LE16(0x1f) }, .regDmn = { LE16(0), LE16(0x1f) },
.txrxMask = 0x33, /* 4 bits tx and 4 bits rx */ .txrxMask = 0x33, /* 4 bits tx and 4 bits rx */
.opCapFlags = { .opCapFlags = {
.opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A,
.eepMisc = 0, .eepMisc = 0,
}, },
.rfSilent = 0, .rfSilent = 0,
...@@ -2974,7 +2974,7 @@ static const struct ar9300_eeprom *ar9003_eeprom_struct_find_by_id(int id) ...@@ -2974,7 +2974,7 @@ static const struct ar9300_eeprom *ar9003_eeprom_struct_find_by_id(int id)
static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz) static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
{ {
if (fbin == AR9300_BCHAN_UNUSED) if (fbin == AR5416_BCHAN_UNUSED)
return fbin; return fbin;
return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin)); return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));
...@@ -4485,7 +4485,7 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep, ...@@ -4485,7 +4485,7 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]); return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]);
} }
return AR9300_MAX_RATE_POWER; return MAX_RATE_POWER;
} }
/* /*
...@@ -4494,7 +4494,7 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep, ...@@ -4494,7 +4494,7 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep, static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep,
u16 freq, int idx, bool is2GHz) u16 freq, int idx, bool is2GHz)
{ {
u16 twiceMaxEdgePower = AR9300_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
u8 *ctl_freqbin = is2GHz ? u8 *ctl_freqbin = is2GHz ?
&eep->ctl_freqbin_2G[idx][0] : &eep->ctl_freqbin_2G[idx][0] :
&eep->ctl_freqbin_5G[idx][0]; &eep->ctl_freqbin_5G[idx][0];
...@@ -4504,7 +4504,7 @@ static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep, ...@@ -4504,7 +4504,7 @@ static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep,
/* Get the edge power */ /* Get the edge power */
for (edge = 0; for (edge = 0;
(edge < num_edges) && (ctl_freqbin[edge] != AR9300_BCHAN_UNUSED); (edge < num_edges) && (ctl_freqbin[edge] != AR5416_BCHAN_UNUSED);
edge++) { edge++) {
/* /*
* If there's an exact channel match or an inband flag set * If there's an exact channel match or an inband flag set
...@@ -4542,9 +4542,9 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah, ...@@ -4542,9 +4542,9 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
struct ar9300_eeprom *pEepData = &ah->eeprom.ar9300_eep; struct ar9300_eeprom *pEepData = &ah->eeprom.ar9300_eep;
u16 twiceMaxEdgePower = AR9300_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
static const u16 tpScaleReductionTable[5] = { static const u16 tpScaleReductionTable[5] = {
0, 3, 6, 9, AR9300_MAX_RATE_POWER 0, 3, 6, 9, MAX_RATE_POWER
}; };
int i; int i;
int16_t twiceLargestAntenna; int16_t twiceLargestAntenna;
......
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
浏览文件 @ 4ddfcd7d
...@@ -20,48 +20,17 @@ ...@@ -20,48 +20,17 @@
/* #define AR9300_NUM_CTLS 21 */ /* #define AR9300_NUM_CTLS 21 */
#define AR9300_NUM_CTLS_5G 9 #define AR9300_NUM_CTLS_5G 9
#define AR9300_NUM_CTLS_2G 12 #define AR9300_NUM_CTLS_2G 12
#define AR9300_CTL_MODE_M 0xF
#define AR9300_NUM_BAND_EDGES_5G 8 #define AR9300_NUM_BAND_EDGES_5G 8
#define AR9300_NUM_BAND_EDGES_2G 4 #define AR9300_NUM_BAND_EDGES_2G 4
#define AR9300_NUM_PD_GAINS 4
#define AR9300_PD_GAINS_IN_MASK 4
#define AR9300_PD_GAIN_ICEPTS 5
#define AR9300_EEPROM_MODAL_SPURS 5
#define AR9300_MAX_RATE_POWER 63
#define AR9300_NUM_PDADC_VALUES 128
#define AR9300_NUM_RATES 16
#define AR9300_BCHAN_UNUSED 0xFF
#define AR9300_MAX_PWR_RANGE_IN_HALF_DB 64
#define AR9300_OPFLAGS_11A 0x01
#define AR9300_OPFLAGS_11G 0x02
#define AR9300_OPFLAGS_5G_HT40 0x04
#define AR9300_OPFLAGS_2G_HT40 0x08
#define AR9300_OPFLAGS_5G_HT20 0x10
#define AR9300_OPFLAGS_2G_HT20 0x20
#define AR9300_EEPMISC_BIG_ENDIAN 0x01 #define AR9300_EEPMISC_BIG_ENDIAN 0x01
#define AR9300_EEPMISC_WOW 0x02 #define AR9300_EEPMISC_WOW 0x02
#define AR9300_CUSTOMER_DATA_SIZE 20 #define AR9300_CUSTOMER_DATA_SIZE 20
#define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5))
#define FBIN2FREQ(x, y) ((y) ? (2300 + x) : (4800 + 5 * x)) #define FBIN2FREQ(x, y) ((y) ? (2300 + x) : (4800 + 5 * x))
#define AR9300_MAX_CHAINS 3 #define AR9300_MAX_CHAINS 3
#define AR9300_ANT_16S 25 #define AR9300_ANT_16S 25
#define AR9300_FUTURE_MODAL_SZ 6 #define AR9300_FUTURE_MODAL_SZ 6
#define AR9300_NUM_ANT_CHAIN_FIELDS 7
#define AR9300_NUM_ANT_COMMON_FIELDS 4
#define AR9300_SIZE_ANT_CHAIN_FIELD 3
#define AR9300_SIZE_ANT_COMMON_FIELD 4
#define AR9300_ANT_CHAIN_MASK 0x7
#define AR9300_ANT_COMMON_MASK 0xf
#define AR9300_CHAIN_0_IDX 0
#define AR9300_CHAIN_1_IDX 1
#define AR9300_CHAIN_2_IDX 2
#define AR928X_NUM_ANT_CHAIN_FIELDS 6
#define AR928X_SIZE_ANT_CHAIN_FIELD 2
#define AR928X_ANT_CHAIN_MASK 0x3
/* Delta from which to start power to pdadc table */ /* Delta from which to start power to pdadc table */
/* This offset is used in both open loop and closed loop power control /* This offset is used in both open loop and closed loop power control
* schemes. In open loop power control, it is not really needed, but for * schemes. In open loop power control, it is not really needed, but for
...@@ -71,12 +40,8 @@ ...@@ -71,12 +40,8 @@
*/ */
#define AR9300_PWR_TABLE_OFFSET 0 #define AR9300_PWR_TABLE_OFFSET 0
/* enable flags for voltage and temp compensation */
#define ENABLE_TEMP_COMPENSATION 0x01
#define ENABLE_VOLT_COMPENSATION 0x02
/* byte addressable */ /* byte addressable */
#define AR9300_EEPROM_SIZE (16*1024) #define AR9300_EEPROM_SIZE (16*1024)
#define FIXED_CCA_THRESHOLD 15
#define AR9300_BASE_ADDR_4K 0xfff #define AR9300_BASE_ADDR_4K 0xfff
#define AR9300_BASE_ADDR 0x3ff #define AR9300_BASE_ADDR 0x3ff
...@@ -226,7 +191,7 @@ struct ar9300_modal_eep_header { ...@@ -226,7 +191,7 @@ struct ar9300_modal_eep_header {
int8_t tempSlope; int8_t tempSlope;
int8_t voltSlope; int8_t voltSlope;
/* spur channels in usual fbin coding format */ /* spur channels in usual fbin coding format */
u8 spurChans[AR9300_EEPROM_MODAL_SPURS]; u8 spurChans[AR_EEPROM_MODAL_SPURS];
/* 3 Check if the register is per chain */ /* 3 Check if the register is per chain */
int8_t noiseFloorThreshCh[AR9300_MAX_CHAINS]; int8_t noiseFloorThreshCh[AR9300_MAX_CHAINS];
u8 ob[AR9300_MAX_CHAINS]; u8 ob[AR9300_MAX_CHAINS];
......
drivers/net/wireless/ath/ath9k/eeprom.c
浏览文件 @ 4ddfcd7d
...@@ -234,7 +234,7 @@ void ath9k_hw_get_target_powers(struct ath_hw *ah, ...@@ -234,7 +234,7 @@ void ath9k_hw_get_target_powers(struct ath_hw *ah,
u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower, u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower,
bool is2GHz, int num_band_edges) bool is2GHz, int num_band_edges)
{ {
u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
int i; int i;
for (i = 0; (i < num_band_edges) && for (i = 0; (i < num_band_edges) &&
......
drivers/net/wireless/ath/ath9k/eeprom.h
浏览文件 @ 4ddfcd7d
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
#ifndef EEPROM_H #ifndef EEPROM_H
#define EEPROM_H #define EEPROM_H
#define AR_EEPROM_MODAL_SPURS 5
#include "../ath.h" #include "../ath.h"
#include <net/cfg80211.h> #include <net/cfg80211.h>
#include "ar9003_eeprom.h" #include "ar9003_eeprom.h"
...@@ -149,8 +151,6 @@ ...@@ -149,8 +151,6 @@
#define AR5416_NUM_PD_GAINS 4 #define AR5416_NUM_PD_GAINS 4
#define AR5416_PD_GAINS_IN_MASK 4 #define AR5416_PD_GAINS_IN_MASK 4
#define AR5416_PD_GAIN_ICEPTS 5 #define AR5416_PD_GAIN_ICEPTS 5
#define AR5416_EEPROM_MODAL_SPURS 5
#define AR5416_MAX_RATE_POWER 63
#define AR5416_NUM_PDADC_VALUES 128 #define AR5416_NUM_PDADC_VALUES 128
#define AR5416_BCHAN_UNUSED 0xFF #define AR5416_BCHAN_UNUSED 0xFF
#define AR5416_MAX_PWR_RANGE_IN_HALF_DB 64 #define AR5416_MAX_PWR_RANGE_IN_HALF_DB 64
...@@ -175,8 +175,6 @@ ...@@ -175,8 +175,6 @@
#define AR5416_EEP4K_NUM_CTLS 12 #define AR5416_EEP4K_NUM_CTLS 12
#define AR5416_EEP4K_NUM_BAND_EDGES 4 #define AR5416_EEP4K_NUM_BAND_EDGES 4
#define AR5416_EEP4K_NUM_PD_GAINS 2 #define AR5416_EEP4K_NUM_PD_GAINS 2
#define AR5416_EEP4K_PD_GAINS_IN_MASK 4
#define AR5416_EEP4K_PD_GAIN_ICEPTS 5
#define AR5416_EEP4K_MAX_CHAINS 1 #define AR5416_EEP4K_MAX_CHAINS 1
#define AR9280_TX_GAIN_TABLE_SIZE 22 #define AR9280_TX_GAIN_TABLE_SIZE 22
...@@ -198,35 +196,12 @@ ...@@ -198,35 +196,12 @@
#define AR9287_NUM_2G_40_TARGET_POWERS 3 #define AR9287_NUM_2G_40_TARGET_POWERS 3
#define AR9287_NUM_CTLS 12 #define AR9287_NUM_CTLS 12
#define AR9287_NUM_BAND_EDGES 4 #define AR9287_NUM_BAND_EDGES 4
#define AR9287_NUM_PD_GAINS 4
#define AR9287_PD_GAINS_IN_MASK 4
#define AR9287_PD_GAIN_ICEPTS 1 #define AR9287_PD_GAIN_ICEPTS 1
#define AR9287_EEPROM_MODAL_SPURS 5
#define AR9287_MAX_RATE_POWER 63
#define AR9287_NUM_PDADC_VALUES 128
#define AR9287_NUM_RATES 16
#define AR9287_BCHAN_UNUSED 0xFF
#define AR9287_MAX_PWR_RANGE_IN_HALF_DB 64
#define AR9287_OPFLAGS_11A 0x01
#define AR9287_OPFLAGS_11G 0x02
#define AR9287_OPFLAGS_2G_HT40 0x08
#define AR9287_OPFLAGS_2G_HT20 0x20
#define AR9287_OPFLAGS_5G_HT40 0x04
#define AR9287_OPFLAGS_5G_HT20 0x10
#define AR9287_EEPMISC_BIG_ENDIAN 0x01 #define AR9287_EEPMISC_BIG_ENDIAN 0x01
#define AR9287_EEPMISC_WOW 0x02 #define AR9287_EEPMISC_WOW 0x02
#define AR9287_MAX_CHAINS 2 #define AR9287_MAX_CHAINS 2
#define AR9287_ANT_16S 32 #define AR9287_ANT_16S 32
#define AR9287_custdatasize 20
#define AR9287_NUM_ANT_CHAIN_FIELDS 6
#define AR9287_NUM_ANT_COMMON_FIELDS 4
#define AR9287_SIZE_ANT_CHAIN_FIELD 2
#define AR9287_SIZE_ANT_COMMON_FIELD 4
#define AR9287_ANT_CHAIN_MASK 0x3
#define AR9287_ANT_COMMON_MASK 0xf
#define AR9287_CHAIN_0_IDX 0
#define AR9287_CHAIN_1_IDX 1
#define AR9287_DATA_SZ 32 #define AR9287_DATA_SZ 32
#define AR9287_PWR_TABLE_OFFSET_DB -5 #define AR9287_PWR_TABLE_OFFSET_DB -5
...@@ -396,7 +371,7 @@ struct modal_eep_header { ...@@ -396,7 +371,7 @@ struct modal_eep_header {
u16 xpaBiasLvlFreq[3]; u16 xpaBiasLvlFreq[3];
u8 futureModal[6]; u8 futureModal[6];
struct spur_chan spurChans[AR5416_EEPROM_MODAL_SPURS]; struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS];
} __packed; } __packed;
struct calDataPerFreqOpLoop { struct calDataPerFreqOpLoop {
...@@ -464,7 +439,7 @@ struct modal_eep_4k_header { ...@@ -464,7 +439,7 @@ struct modal_eep_4k_header {
u8 db2_4:4, reserved:4; u8 db2_4:4, reserved:4;
#endif #endif
u8 futureModal[4]; u8 futureModal[4];
struct spur_chan spurChans[AR5416_EEPROM_MODAL_SPURS]; struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS];
} __packed; } __packed;
struct base_eep_ar9287_header { struct base_eep_ar9287_header {
...@@ -522,7 +497,7 @@ struct modal_eep_ar9287_header { ...@@ -522,7 +497,7 @@ struct modal_eep_ar9287_header {
u8 ob_qam; u8 ob_qam;
u8 ob_pal_off; u8 ob_pal_off;
u8 futureModal[30]; u8 futureModal[30];
struct spur_chan spurChans[AR9287_EEPROM_MODAL_SPURS]; struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS];
} __packed; } __packed;
struct cal_data_per_freq { struct cal_data_per_freq {
...@@ -531,8 +506,8 @@ struct cal_data_per_freq { ...@@ -531,8 +506,8 @@ struct cal_data_per_freq {
} __packed; } __packed;
struct cal_data_per_freq_4k { struct cal_data_per_freq_4k {
u8 pwrPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_EEP4K_PD_GAIN_ICEPTS]; u8 pwrPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_PD_GAIN_ICEPTS];
u8 vpdPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_EEP4K_PD_GAIN_ICEPTS]; u8 vpdPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_PD_GAIN_ICEPTS];
} __packed; } __packed;
struct cal_target_power_leg { struct cal_target_power_leg {
...@@ -558,8 +533,8 @@ struct cal_data_op_loop_ar9287 { ...@@ -558,8 +533,8 @@ struct cal_data_op_loop_ar9287 {
} __packed; } __packed;
struct cal_data_per_freq_ar9287 { struct cal_data_per_freq_ar9287 {
u8 pwrPdg[AR9287_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; u8 pwrPdg[AR5416_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS];
u8 vpdPdg[AR9287_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; u8 vpdPdg[AR5416_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS];
} __packed; } __packed;
union cal_data_per_freq_ar9287_u { union cal_data_per_freq_ar9287_u {
......
drivers/net/wireless/ath/ath9k/eeprom_4k.c
浏览文件 @ 4ddfcd7d
...@@ -153,7 +153,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah) ...@@ -153,7 +153,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
eep->modalHeader.antCtrlChain[i] = integer; eep->modalHeader.antCtrlChain[i] = integer;
} }
for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) { for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
word = swab16(eep->modalHeader.spurChans[i].spurChan); word = swab16(eep->modalHeader.spurChans[i].spurChan);
eep->modalHeader.spurChans[i].spurChan = word; eep->modalHeader.spurChans[i].spurChan = word;
} }
...@@ -258,7 +258,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -258,7 +258,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
struct chan_centers centers; struct chan_centers centers;
#define PD_GAIN_BOUNDARY_DEFAULT 58; #define PD_GAIN_BOUNDARY_DEFAULT 58;
memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS);
ath9k_hw_get_channel_centers(ah, chan, &centers); ath9k_hw_get_channel_centers(ah, chan, &centers);
for (numPiers = 0; numPiers < availPiers; numPiers++) { for (numPiers = 0; numPiers < availPiers; numPiers++) {
...@@ -278,7 +278,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -278,7 +278,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
pRawDataSet[idxL].pwrPdg[i], pRawDataSet[idxL].pwrPdg[i],
pRawDataSet[idxL].vpdPdg[i], pRawDataSet[idxL].vpdPdg[i],
AR5416_EEP4K_PD_GAIN_ICEPTS, AR5416_PD_GAIN_ICEPTS,
vpdTableI[i]); vpdTableI[i]);
} }
} else { } else {
...@@ -291,17 +291,17 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -291,17 +291,17 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
minPwrT4[i] = max(pPwrL[0], pPwrR[0]); minPwrT4[i] = max(pPwrL[0], pPwrR[0]);
maxPwrT4[i] = maxPwrT4[i] =
min(pPwrL[AR5416_EEP4K_PD_GAIN_ICEPTS - 1], min(pPwrL[AR5416_PD_GAIN_ICEPTS - 1],
pPwrR[AR5416_EEP4K_PD_GAIN_ICEPTS - 1]); pPwrR[AR5416_PD_GAIN_ICEPTS - 1]);
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
pPwrL, pVpdL, pPwrL, pVpdL,
AR5416_EEP4K_PD_GAIN_ICEPTS, AR5416_PD_GAIN_ICEPTS,
vpdTableL[i]); vpdTableL[i]);
ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
pPwrR, pVpdR, pPwrR, pVpdR,
AR5416_EEP4K_PD_GAIN_ICEPTS, AR5416_PD_GAIN_ICEPTS,
vpdTableR[i]); vpdTableR[i]);
for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) {
...@@ -328,7 +328,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -328,7 +328,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
(u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4);
pPdGainBoundaries[i] = pPdGainBoundaries[i] =
min((u16)AR5416_MAX_RATE_POWER, pPdGainBoundaries[i]); min((u16)MAX_RATE_POWER, pPdGainBoundaries[i]);
if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) {
minDelta = pPdGainBoundaries[0] - 23; minDelta = pPdGainBoundaries[0] - 23;
...@@ -380,7 +380,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -380,7 +380,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
} }
} }
while (i < AR5416_EEP4K_PD_GAINS_IN_MASK) { while (i < AR5416_PD_GAINS_IN_MASK) {
pPdGainBoundaries[i] = PD_GAIN_BOUNDARY_DEFAULT; pPdGainBoundaries[i] = PD_GAIN_BOUNDARY_DEFAULT;
i++; i++;
} }
...@@ -404,7 +404,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, ...@@ -404,7 +404,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
u8 *pCalBChans = NULL; u8 *pCalBChans = NULL;
u16 pdGainOverlap_t2; u16 pdGainOverlap_t2;
static u8 pdadcValues[AR5416_NUM_PDADC_VALUES]; static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
u16 gainBoundaries[AR5416_EEP4K_PD_GAINS_IN_MASK]; u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK];
u16 numPiers, i, j; u16 numPiers, i, j;
u16 numXpdGain, xpdMask; u16 numXpdGain, xpdMask;
u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 }; u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 };
...@@ -426,12 +426,12 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, ...@@ -426,12 +426,12 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
numXpdGain = 0; numXpdGain = 0;
for (i = 1; i <= AR5416_EEP4K_PD_GAINS_IN_MASK; i++) { for (i = 1; i <= AR5416_PD_GAINS_IN_MASK; i++) {
if ((xpdMask >> (AR5416_EEP4K_PD_GAINS_IN_MASK - i)) & 1) { if ((xpdMask >> (AR5416_PD_GAINS_IN_MASK - i)) & 1) {
if (numXpdGain >= AR5416_EEP4K_NUM_PD_GAINS) if (numXpdGain >= AR5416_EEP4K_NUM_PD_GAINS)
break; break;
xpdGainValues[numXpdGain] = xpdGainValues[numXpdGain] =
(u16)(AR5416_EEP4K_PD_GAINS_IN_MASK - i); (u16)(AR5416_PD_GAINS_IN_MASK - i);
numXpdGain++; numXpdGain++;
} }
} }
...@@ -528,7 +528,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, ...@@ -528,7 +528,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
int i; int i;
int16_t twiceLargestAntenna; int16_t twiceLargestAntenna;
u16 twiceMinEdgePower; u16 twiceMinEdgePower;
u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
u16 scaledPower = 0, minCtlPower, maxRegAllowedPower; u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
u16 numCtlModes; u16 numCtlModes;
const u16 *pCtlMode; const u16 *pCtlMode;
...@@ -537,7 +537,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, ...@@ -537,7 +537,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
struct cal_ctl_data_4k *rep; struct cal_ctl_data_4k *rep;
struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k; struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
static const u16 tpScaleReductionTable[5] = static const u16 tpScaleReductionTable[5] =
{ 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; { 0, 3, 6, 9, MAX_RATE_POWER };
struct cal_target_power_leg targetPowerOfdm, targetPowerCck = { struct cal_target_power_leg targetPowerOfdm, targetPowerCck = {
0, { 0, 0, 0, 0} 0, { 0, 0, 0, 0}
}; };
...@@ -613,7 +613,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, ...@@ -613,7 +613,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
if (ah->eep_ops->get_eeprom_ver(ah) == 14 && if (ah->eep_ops->get_eeprom_ver(ah) == 14 &&
ah->eep_ops->get_eeprom_rev(ah) <= 2) ah->eep_ops->get_eeprom_rev(ah) <= 2)
twiceMaxEdgePower = AR5416_MAX_RATE_POWER; twiceMaxEdgePower = MAX_RATE_POWER;
for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) && for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) &&
pEepData->ctlIndex[i]; i++) { pEepData->ctlIndex[i]; i++) {
...@@ -752,8 +752,8 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah, ...@@ -752,8 +752,8 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah,
regulatory->max_power_level = 0; regulatory->max_power_level = 0;
for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { for (i = 0; i < ARRAY_SIZE(ratesArray); i++) {
ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]);
if (ratesArray[i] > AR5416_MAX_RATE_POWER) if (ratesArray[i] > MAX_RATE_POWER)
ratesArray[i] = AR5416_MAX_RATE_POWER; ratesArray[i] = MAX_RATE_POWER;
if (ratesArray[i] > regulatory->max_power_level) if (ratesArray[i] > regulatory->max_power_level)
regulatory->max_power_level = ratesArray[i]; regulatory->max_power_level = ratesArray[i];
......
drivers/net/wireless/ath/ath9k/eeprom_9287.c
浏览文件 @ 4ddfcd7d
...@@ -150,7 +150,7 @@ static int ath9k_hw_ar9287_check_eeprom(struct ath_hw *ah) ...@@ -150,7 +150,7 @@ static int ath9k_hw_ar9287_check_eeprom(struct ath_hw *ah)
eep->modalHeader.antCtrlChain[i] = integer; eep->modalHeader.antCtrlChain[i] = integer;
} }
for (i = 0; i < AR9287_EEPROM_MODAL_SPURS; i++) { for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
word = swab16(eep->modalHeader.spurChans[i].spurChan); word = swab16(eep->modalHeader.spurChans[i].spurChan);
eep->modalHeader.spurChans[i].spurChan = word; eep->modalHeader.spurChans[i].spurChan = word;
} }
...@@ -236,8 +236,8 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -236,8 +236,8 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
int16_t ss; int16_t ss;
u16 idxL = 0, idxR = 0, numPiers; u16 idxL = 0, idxR = 0, numPiers;
u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR;
u8 minPwrT4[AR9287_NUM_PD_GAINS]; u8 minPwrT4[AR5416_NUM_PD_GAINS];
u8 maxPwrT4[AR9287_NUM_PD_GAINS]; u8 maxPwrT4[AR5416_NUM_PD_GAINS];
int16_t vpdStep; int16_t vpdStep;
int16_t tmpVal; int16_t tmpVal;
u16 sizeCurrVpdTable, maxIndex, tgtIndex; u16 sizeCurrVpdTable, maxIndex, tgtIndex;
...@@ -251,11 +251,11 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -251,11 +251,11 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS] static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS]
[AR5416_MAX_PWR_RANGE_IN_HALF_DB]; [AR5416_MAX_PWR_RANGE_IN_HALF_DB];
memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS);
ath9k_hw_get_channel_centers(ah, chan, &centers); ath9k_hw_get_channel_centers(ah, chan, &centers);
for (numPiers = 0; numPiers < availPiers; numPiers++) { for (numPiers = 0; numPiers < availPiers; numPiers++) {
if (bChans[numPiers] == AR9287_BCHAN_UNUSED) if (bChans[numPiers] == AR5416_BCHAN_UNUSED)
break; break;
} }
...@@ -314,7 +314,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -314,7 +314,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
pPdGainBoundaries[i] = pPdGainBoundaries[i] =
(u16)((maxPwrT4[i] + minPwrT4[i+1]) / 4); (u16)((maxPwrT4[i] + minPwrT4[i+1]) / 4);
pPdGainBoundaries[i] = min((u16)AR5416_MAX_RATE_POWER, pPdGainBoundaries[i] = min((u16)MAX_RATE_POWER,
pPdGainBoundaries[i]); pPdGainBoundaries[i]);
...@@ -334,7 +334,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -334,7 +334,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]);
vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep);
while ((ss < 0) && (k < (AR9287_NUM_PDADC_VALUES - 1))) { while ((ss < 0) && (k < (AR5416_NUM_PDADC_VALUES - 1))) {
tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep);
pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal);
ss++; ss++;
...@@ -346,7 +346,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -346,7 +346,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
maxIndex = (tgtIndex < sizeCurrVpdTable) ? maxIndex = (tgtIndex < sizeCurrVpdTable) ?
tgtIndex : sizeCurrVpdTable; tgtIndex : sizeCurrVpdTable;
while ((ss < maxIndex) && (k < (AR9287_NUM_PDADC_VALUES - 1))) while ((ss < maxIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1)))
pPDADCValues[k++] = vpdTableI[i][ss++]; pPDADCValues[k++] = vpdTableI[i][ss++];
vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] -
...@@ -355,7 +355,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -355,7 +355,7 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
if (tgtIndex > maxIndex) { if (tgtIndex > maxIndex) {
while ((ss <= tgtIndex) && while ((ss <= tgtIndex) &&
(k < (AR9287_NUM_PDADC_VALUES - 1))) { (k < (AR5416_NUM_PDADC_VALUES - 1))) {
tmpVal = (int16_t) TMP_VAL_VPD_TABLE; tmpVal = (int16_t) TMP_VAL_VPD_TABLE;
pPDADCValues[k++] = pPDADCValues[k++] =
(u8)((tmpVal > 255) ? 255 : tmpVal); (u8)((tmpVal > 255) ? 255 : tmpVal);
...@@ -364,12 +364,12 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -364,12 +364,12 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
} }
} }
while (i < AR9287_PD_GAINS_IN_MASK) { while (i < AR5416_PD_GAINS_IN_MASK) {
pPdGainBoundaries[i] = pPdGainBoundaries[i-1]; pPdGainBoundaries[i] = pPdGainBoundaries[i-1];
i++; i++;
} }
while (k < AR9287_NUM_PDADC_VALUES) { while (k < AR5416_NUM_PDADC_VALUES) {
pPDADCValues[k] = pPDADCValues[k-1]; pPDADCValues[k] = pPDADCValues[k-1];
k++; k++;
} }
...@@ -389,7 +389,7 @@ static void ar9287_eeprom_get_tx_gain_index(struct ath_hw *ah, ...@@ -389,7 +389,7 @@ static void ar9287_eeprom_get_tx_gain_index(struct ath_hw *ah,
ath9k_hw_get_channel_centers(ah, chan, &centers); ath9k_hw_get_channel_centers(ah, chan, &centers);
for (numPiers = 0; numPiers < availPiers; numPiers++) { for (numPiers = 0; numPiers < availPiers; numPiers++) {
if (pCalChans[numPiers] == AR9287_BCHAN_UNUSED) if (pCalChans[numPiers] == AR5416_BCHAN_UNUSED)
break; break;
} }
...@@ -455,11 +455,11 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah, ...@@ -455,11 +455,11 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
struct cal_data_op_loop_ar9287 *pRawDatasetOpenLoop; struct cal_data_op_loop_ar9287 *pRawDatasetOpenLoop;
u8 *pCalBChans = NULL; u8 *pCalBChans = NULL;
u16 pdGainOverlap_t2; u16 pdGainOverlap_t2;
u8 pdadcValues[AR9287_NUM_PDADC_VALUES]; u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
u16 gainBoundaries[AR9287_PD_GAINS_IN_MASK]; u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK];
u16 numPiers = 0, i, j; u16 numPiers = 0, i, j;
u16 numXpdGain, xpdMask; u16 numXpdGain, xpdMask;
u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0}; u16 xpdGainValues[AR5416_NUM_PD_GAINS] = {0, 0, 0, 0};
u32 reg32, regOffset, regChainOffset, regval; u32 reg32, regOffset, regChainOffset, regval;
int16_t modalIdx, diff = 0; int16_t modalIdx, diff = 0;
struct ar9287_eeprom *pEepData = &ah->eeprom.map9287; struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
...@@ -487,12 +487,12 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah, ...@@ -487,12 +487,12 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
numXpdGain = 0; numXpdGain = 0;
/* Calculate the value of xpdgains from the xpdGain Mask */ /* Calculate the value of xpdgains from the xpdGain Mask */
for (i = 1; i <= AR9287_PD_GAINS_IN_MASK; i++) { for (i = 1; i <= AR5416_PD_GAINS_IN_MASK; i++) {
if ((xpdMask >> (AR9287_PD_GAINS_IN_MASK - i)) & 1) { if ((xpdMask >> (AR5416_PD_GAINS_IN_MASK - i)) & 1) {
if (numXpdGain >= AR9287_NUM_PD_GAINS) if (numXpdGain >= AR5416_NUM_PD_GAINS)
break; break;
xpdGainValues[numXpdGain] = xpdGainValues[numXpdGain] =
(u16)(AR9287_PD_GAINS_IN_MASK-i); (u16)(AR5416_PD_GAINS_IN_MASK-i);
numXpdGain++; numXpdGain++;
} }
} }
...@@ -561,13 +561,13 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah, ...@@ -561,13 +561,13 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
(int32_t)AR9287_PWR_TABLE_OFFSET_DB); (int32_t)AR9287_PWR_TABLE_OFFSET_DB);
diff *= 2; diff *= 2;
for (j = 0; j < ((u16)AR9287_NUM_PDADC_VALUES-diff); j++) for (j = 0; j < ((u16)AR5416_NUM_PDADC_VALUES-diff); j++)
pdadcValues[j] = pdadcValues[j+diff]; pdadcValues[j] = pdadcValues[j+diff];
for (j = (u16)(AR9287_NUM_PDADC_VALUES-diff); for (j = (u16)(AR5416_NUM_PDADC_VALUES-diff);
j < AR9287_NUM_PDADC_VALUES; j++) j < AR5416_NUM_PDADC_VALUES; j++)
pdadcValues[j] = pdadcValues[j] =
pdadcValues[AR9287_NUM_PDADC_VALUES-diff]; pdadcValues[AR5416_NUM_PDADC_VALUES-diff];
} }
if (!ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) { if (!ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) {
...@@ -610,9 +610,9 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, ...@@ -610,9 +610,9 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
#define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
static const u16 tpScaleReductionTable[5] = static const u16 tpScaleReductionTable[5] =
{ 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; { 0, 3, 6, 9, MAX_RATE_POWER };
int i; int i;
int16_t twiceLargestAntenna; int16_t twiceLargestAntenna;
struct cal_ctl_data_ar9287 *rep; struct cal_ctl_data_ar9287 *rep;
...@@ -877,8 +877,8 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, ...@@ -877,8 +877,8 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
regulatory->max_power_level = 0; regulatory->max_power_level = 0;
for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { for (i = 0; i < ARRAY_SIZE(ratesArray); i++) {
ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]);
if (ratesArray[i] > AR9287_MAX_RATE_POWER) if (ratesArray[i] > MAX_RATE_POWER)
ratesArray[i] = AR9287_MAX_RATE_POWER; ratesArray[i] = MAX_RATE_POWER;
if (ratesArray[i] > regulatory->max_power_level) if (ratesArray[i] > regulatory->max_power_level)
regulatory->max_power_level = ratesArray[i]; regulatory->max_power_level = ratesArray[i];
......
drivers/net/wireless/ath/ath9k/eeprom_def.c
浏览文件 @ 4ddfcd7d
...@@ -206,7 +206,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah) ...@@ -206,7 +206,7 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
pModal->antCtrlChain[i] = integer; pModal->antCtrlChain[i] = integer;
} }
for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) { for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
word = swab16(pModal->spurChans[i].spurChan); word = swab16(pModal->spurChans[i].spurChan);
pModal->spurChans[i].spurChan = word; pModal->spurChans[i].spurChan = word;
} }
...@@ -616,7 +616,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -616,7 +616,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
int16_t minDelta = 0; int16_t minDelta = 0;
struct chan_centers centers; struct chan_centers centers;
memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS);
ath9k_hw_get_channel_centers(ah, chan, &centers); ath9k_hw_get_channel_centers(ah, chan, &centers);
for (numPiers = 0; numPiers < availPiers; numPiers++) { for (numPiers = 0; numPiers < availPiers; numPiers++) {
...@@ -685,7 +685,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah, ...@@ -685,7 +685,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
(u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4);
pPdGainBoundaries[i] = pPdGainBoundaries[i] =
min((u16)AR5416_MAX_RATE_POWER, pPdGainBoundaries[i]); min((u16)MAX_RATE_POWER, pPdGainBoundaries[i]);
if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) {
minDelta = pPdGainBoundaries[0] - 23; minDelta = pPdGainBoundaries[0] - 23;
...@@ -782,7 +782,7 @@ static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah, ...@@ -782,7 +782,7 @@ static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah,
/* Because of a hardware limitation, ensure the gain boundary /* Because of a hardware limitation, ensure the gain boundary
* is not larger than (63 - overlap) * is not larger than (63 - overlap)
*/ */
gb_limit = (u16)(AR5416_MAX_RATE_POWER - pdGainOverlap_t2); gb_limit = (u16)(MAX_RATE_POWER - pdGainOverlap_t2);
for (k = 0; k < numXpdGain; k++) for (k = 0; k < numXpdGain; k++)
gb[k] = (u16)min(gb_limit, gb[k]); gb[k] = (u16)min(gb_limit, gb[k]);
...@@ -1001,9 +1001,9 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, ...@@ -1001,9 +1001,9 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
struct ar5416_eeprom_def *pEepData = &ah->eeprom.def; struct ar5416_eeprom_def *pEepData = &ah->eeprom.def;
u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; u16 twiceMaxEdgePower = MAX_RATE_POWER;
static const u16 tpScaleReductionTable[5] = static const u16 tpScaleReductionTable[5] =
{ 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; { 0, 3, 6, 9, MAX_RATE_POWER };
int i; int i;
int16_t twiceLargestAntenna; int16_t twiceLargestAntenna;
...@@ -1148,7 +1148,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, ...@@ -1148,7 +1148,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
if (ah->eep_ops->get_eeprom_ver(ah) == 14 && if (ah->eep_ops->get_eeprom_ver(ah) == 14 &&
ah->eep_ops->get_eeprom_rev(ah) <= 2) ah->eep_ops->get_eeprom_rev(ah) <= 2)
twiceMaxEdgePower = AR5416_MAX_RATE_POWER; twiceMaxEdgePower = MAX_RATE_POWER;
for (i = 0; (i < AR5416_NUM_CTLS) && pEepData->ctlIndex[i]; i++) { for (i = 0; (i < AR5416_NUM_CTLS) && pEepData->ctlIndex[i]; i++) {
if ((((cfgCtl & ~CTL_MODE_M) | if ((((cfgCtl & ~CTL_MODE_M) |
...@@ -1293,8 +1293,8 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah, ...@@ -1293,8 +1293,8 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
regulatory->max_power_level = 0; regulatory->max_power_level = 0;
for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { for (i = 0; i < ARRAY_SIZE(ratesArray); i++) {
ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]);
if (ratesArray[i] > AR5416_MAX_RATE_POWER) if (ratesArray[i] > MAX_RATE_POWER)
ratesArray[i] = AR5416_MAX_RATE_POWER; ratesArray[i] = MAX_RATE_POWER;
if (ratesArray[i] > regulatory->max_power_level) if (ratesArray[i] > regulatory->max_power_level)
regulatory->max_power_level = ratesArray[i]; regulatory->max_power_level = ratesArray[i];
} }
......
drivers/net/wireless/ath/ath9k/hw.h
浏览文件 @ 4ddfcd7d
...@@ -238,7 +238,6 @@ struct ath9k_ops_config { ...@@ -238,7 +238,6 @@ struct ath9k_ops_config {
#define SPUR_DISABLE 0 #define SPUR_DISABLE 0
#define SPUR_ENABLE_IOCTL 1 #define SPUR_ENABLE_IOCTL 1
#define SPUR_ENABLE_EEPROM 2 #define SPUR_ENABLE_EEPROM 2
#define AR_EEPROM_MODAL_SPURS 5
#define AR_SPUR_5413_1 1640 #define AR_SPUR_5413_1 1640
#define AR_SPUR_5413_2 1200 #define AR_SPUR_5413_2 1200
#define AR_NO_SPUR 0x8000 #define AR_NO_SPUR 0x8000
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或