lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: Use a consistent naming convention

Browse Source 
This patch replaces old 'hal_' prefixes with 'ath9k_'.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith
2009-04-13 21:56:56 +05:30
committed by John W. Linville
parent 379f04407c
commit cbfe946860
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/wireless/ath/ath9k/calib.c
View File

@@ -186,7 +186,7 @@ static bool getNoiseFloorThresh(struct ath_hw *ah,
} }
static void ath9k_hw_setup_calibration(struct ath_hw *ah, static void ath9k_hw_setup_calibration(struct ath_hw *ah,
struct hal_cal_list *currCal) struct ath9k_cal_list *currCal)
{ {
REG_RMW_FIELD(ah, AR_PHY_TIMING_CTRL4(0), REG_RMW_FIELD(ah, AR_PHY_TIMING_CTRL4(0),
AR_PHY_TIMING_CTRL4_IQCAL_LOG_COUNT_MAX, AR_PHY_TIMING_CTRL4_IQCAL_LOG_COUNT_MAX,
@@ -220,7 +220,7 @@ static void ath9k_hw_setup_calibration(struct ath_hw *ah,
} }
static void ath9k_hw_reset_calibration(struct ath_hw *ah, static void ath9k_hw_reset_calibration(struct ath_hw *ah,
struct hal_cal_list *currCal) struct ath9k_cal_list *currCal)
{ {
int i; int i;
@@ -241,7 +241,7 @@ static void ath9k_hw_reset_calibration(struct ath_hw *ah,
static bool ath9k_hw_per_calibration(struct ath_hw *ah, static bool ath9k_hw_per_calibration(struct ath_hw *ah,
struct ath9k_channel *ichan, struct ath9k_channel *ichan,
u8 rxchainmask, u8 rxchainmask,
struct hal_cal_list *currCal) struct ath9k_cal_list *currCal)
{ {
bool iscaldone = false; bool iscaldone = false;
@@ -276,7 +276,7 @@ static bool ath9k_hw_per_calibration(struct ath_hw *ah,
/* Assumes you are talking about the currently configured channel */ /* Assumes you are talking about the currently configured channel */
static bool ath9k_hw_iscal_supported(struct ath_hw *ah, static bool ath9k_hw_iscal_supported(struct ath_hw *ah,
enum hal_cal_types calType) enum ath9k_cal_types calType)
{ {
struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
@@ -499,7 +499,7 @@ static void ath9k_hw_adc_dccal_calibrate(struct ath_hw *ah, u8 numChains)
{ {
u32 iOddMeasOffset, iEvenMeasOffset, val, i; u32 iOddMeasOffset, iEvenMeasOffset, val, i;
int32_t qOddMeasOffset, qEvenMeasOffset, qDcMismatch, iDcMismatch; int32_t qOddMeasOffset, qEvenMeasOffset, qDcMismatch, iDcMismatch;
const struct hal_percal_data *calData = const struct ath9k_percal_data *calData =
ah->cal_list_curr->calData; ah->cal_list_curr->calData;
u32 numSamples = u32 numSamples =
(1 << (calData->calCountMax + 5)) * calData->calNumSamples; (1 << (calData->calCountMax + 5)) * calData->calNumSamples;
@@ -556,7 +556,7 @@ static void ath9k_hw_adc_dccal_calibrate(struct ath_hw *ah, u8 numChains)
bool ath9k_hw_reset_calvalid(struct ath_hw *ah) bool ath9k_hw_reset_calvalid(struct ath_hw *ah)
{ {
struct ieee80211_conf *conf = &ah->ah_sc->hw->conf; struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
struct hal_cal_list *currCal = ah->cal_list_curr; struct ath9k_cal_list *currCal = ah->cal_list_curr;
if (!ah->curchan) if (!ah->curchan)
return true; return true;
@@ -845,7 +845,7 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
u8 rxchainmask, bool longcal) u8 rxchainmask, bool longcal)
{ {
bool iscaldone = true; bool iscaldone = true;
struct hal_cal_list *currCal = ah->cal_list_curr; struct ath9k_cal_list *currCal = ah->cal_list_curr;
if (currCal && if (currCal &&
(currCal->calState == CAL_RUNNING || (currCal->calState == CAL_RUNNING ||
@@ -1008,49 +1008,49 @@ bool ath9k_hw_init_cal(struct ath_hw *ah,
return true; return true;
} }
const struct hal_percal_data iq_cal_multi_sample = { const struct ath9k_percal_data iq_cal_multi_sample = {
IQ_MISMATCH_CAL, IQ_MISMATCH_CAL,
MAX_CAL_SAMPLES, MAX_CAL_SAMPLES,
PER_MIN_LOG_COUNT, PER_MIN_LOG_COUNT,
ath9k_hw_iqcal_collect, ath9k_hw_iqcal_collect,
ath9k_hw_iqcalibrate ath9k_hw_iqcalibrate
}; };
const struct hal_percal_data iq_cal_single_sample = { const struct ath9k_percal_data iq_cal_single_sample = {
IQ_MISMATCH_CAL, IQ_MISMATCH_CAL,
MIN_CAL_SAMPLES, MIN_CAL_SAMPLES,
PER_MAX_LOG_COUNT, PER_MAX_LOG_COUNT,
ath9k_hw_iqcal_collect, ath9k_hw_iqcal_collect,
ath9k_hw_iqcalibrate ath9k_hw_iqcalibrate
}; };
const struct hal_percal_data adc_gain_cal_multi_sample = { const struct ath9k_percal_data adc_gain_cal_multi_sample = {
ADC_GAIN_CAL, ADC_GAIN_CAL,
MAX_CAL_SAMPLES, MAX_CAL_SAMPLES,
PER_MIN_LOG_COUNT, PER_MIN_LOG_COUNT,
ath9k_hw_adc_gaincal_collect, ath9k_hw_adc_gaincal_collect,
ath9k_hw_adc_gaincal_calibrate ath9k_hw_adc_gaincal_calibrate
}; };
const struct hal_percal_data adc_gain_cal_single_sample = { const struct ath9k_percal_data adc_gain_cal_single_sample = {
ADC_GAIN_CAL, ADC_GAIN_CAL,
MIN_CAL_SAMPLES, MIN_CAL_SAMPLES,
PER_MAX_LOG_COUNT, PER_MAX_LOG_COUNT,
ath9k_hw_adc_gaincal_collect, ath9k_hw_adc_gaincal_collect,
ath9k_hw_adc_gaincal_calibrate ath9k_hw_adc_gaincal_calibrate
}; };
const struct hal_percal_data adc_dc_cal_multi_sample = { const struct ath9k_percal_data adc_dc_cal_multi_sample = {
ADC_DC_CAL, ADC_DC_CAL,
MAX_CAL_SAMPLES, MAX_CAL_SAMPLES,
PER_MIN_LOG_COUNT, PER_MIN_LOG_COUNT,
ath9k_hw_adc_dccal_collect, ath9k_hw_adc_dccal_collect,
ath9k_hw_adc_dccal_calibrate ath9k_hw_adc_dccal_calibrate
}; };
const struct hal_percal_data adc_dc_cal_single_sample = { const struct ath9k_percal_data adc_dc_cal_single_sample = {
ADC_DC_CAL, ADC_DC_CAL,
MIN_CAL_SAMPLES, MIN_CAL_SAMPLES,
PER_MAX_LOG_COUNT, PER_MAX_LOG_COUNT,
ath9k_hw_adc_dccal_collect, ath9k_hw_adc_dccal_collect,
ath9k_hw_adc_dccal_calibrate ath9k_hw_adc_dccal_calibrate
}; };
const struct hal_percal_data adc_init_dc_cal = { const struct ath9k_percal_data adc_init_dc_cal = {
ADC_DC_INIT_CAL, ADC_DC_INIT_CAL,
MIN_CAL_SAMPLES, MIN_CAL_SAMPLES,
INIT_LOG_COUNT, INIT_LOG_COUNT,

30
drivers/net/wireless/ath/ath9k/calib.h
View File

@@ -17,13 +17,13 @@
#ifndef CALIB_H #ifndef CALIB_H
#define CALIB_H #define CALIB_H
extern const struct hal_percal_data iq_cal_multi_sample; extern const struct ath9k_percal_data iq_cal_multi_sample;
extern const struct hal_percal_data iq_cal_single_sample; extern const struct ath9k_percal_data iq_cal_single_sample;
extern const struct hal_percal_data adc_gain_cal_multi_sample; extern const struct ath9k_percal_data adc_gain_cal_multi_sample;
extern const struct hal_percal_data adc_gain_cal_single_sample; extern const struct ath9k_percal_data adc_gain_cal_single_sample;
extern const struct hal_percal_data adc_dc_cal_multi_sample; extern const struct ath9k_percal_data adc_dc_cal_multi_sample;
extern const struct hal_percal_data adc_dc_cal_single_sample; extern const struct ath9k_percal_data adc_dc_cal_single_sample;
extern const struct hal_percal_data adc_init_dc_cal; extern const struct ath9k_percal_data adc_init_dc_cal;
#define AR_PHY_CCA_MAX_GOOD_VALUE -85 #define AR_PHY_CCA_MAX_GOOD_VALUE -85
#define AR_PHY_CCA_MAX_HIGH_VALUE -62 #define AR_PHY_CCA_MAX_HIGH_VALUE -62
@@ -67,14 +67,14 @@ struct ar5416IniArray {
} \ } \
} while (0) } while (0)
enum hal_cal_types { enum ath9k_cal_types {
ADC_DC_INIT_CAL = 0x1, ADC_DC_INIT_CAL = 0x1,
ADC_GAIN_CAL = 0x2, ADC_GAIN_CAL = 0x2,
ADC_DC_CAL = 0x4, ADC_DC_CAL = 0x4,
IQ_MISMATCH_CAL = 0x8 IQ_MISMATCH_CAL = 0x8
}; };
enum hal_cal_state { enum ath9k_cal_state {
CAL_INACTIVE, CAL_INACTIVE,
CAL_WAITING, CAL_WAITING,
CAL_RUNNING, CAL_RUNNING,
@@ -87,18 +87,18 @@ enum hal_cal_state {
#define PER_MIN_LOG_COUNT 2 #define PER_MIN_LOG_COUNT 2
#define PER_MAX_LOG_COUNT 10 #define PER_MAX_LOG_COUNT 10
struct hal_percal_data { struct ath9k_percal_data {
enum hal_cal_types calType; enum ath9k_cal_types calType;
u32 calNumSamples; u32 calNumSamples;
u32 calCountMax; u32 calCountMax;
void (*calCollect) (struct ath_hw *); void (*calCollect) (struct ath_hw *);
void (*calPostProc) (struct ath_hw *, u8); void (*calPostProc) (struct ath_hw *, u8);
}; };
struct hal_cal_list { struct ath9k_cal_list {
const struct hal_percal_data *calData; const struct ath9k_percal_data *calData;
enum hal_cal_state calState; enum ath9k_cal_state calState;
struct hal_cal_list *calNext; struct ath9k_cal_list *calNext;
}; };
struct ath9k_nfcal_hist { struct ath9k_nfcal_hist {

16
drivers/net/wireless/ath/ath9k/hw.h
View File

@@ -436,14 +436,14 @@ struct ath_hw {
enum ath9k_ant_setting diversity_control; enum ath9k_ant_setting diversity_control;
/* Calibration */ /* Calibration */
enum hal_cal_types supp_cals; enum ath9k_cal_types supp_cals;
struct hal_cal_list iq_caldata; struct ath9k_cal_list iq_caldata;
struct hal_cal_list adcgain_caldata; struct ath9k_cal_list adcgain_caldata;
struct hal_cal_list adcdc_calinitdata; struct ath9k_cal_list adcdc_calinitdata;
struct hal_cal_list adcdc_caldata; struct ath9k_cal_list adcdc_caldata;
struct hal_cal_list *cal_list; struct ath9k_cal_list *cal_list;
struct hal_cal_list *cal_list_last; struct ath9k_cal_list *cal_list_last;
struct hal_cal_list *cal_list_curr; struct ath9k_cal_list *cal_list_curr;
#define totalPowerMeasI meas0.unsign #define totalPowerMeasI meas0.unsign
#define totalPowerMeasQ meas1.unsign #define totalPowerMeasQ meas1.unsign
#define totalIqCorrMeas meas2.sign #define totalIqCorrMeas meas2.sign