Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 795f5e2c authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: split calib code by hardware families 



Calibration code touches phy registers and since these
change the calibration code needs to be abstracted.

Noise floor calibration is the only thing remaining but
since the remaining calls only touch the AR_PHY_AGC_CONTROL
register we'll just define that register conditionally, that
will be done separately. The goal is to remove the dependency
of ar9002_phy.h on calib.c

This also adds stubs to be filled for AR9003 calibration code.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0df13da4

drivers/net/wireless/ath/ath9k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ ath9k_hw-y:= hw.o \ 
		ar9003_phy.o \

		ar9002_phy.o \

		ar5008_phy.o \

		ar9002_calib.o \

		ar9003_calib.o \

		calib.o \

		eeprom.o \

		eeprom_def.o \

		eeprom_4k.o \

		eeprom_9287.o \

		calib.o \

		ani.o \

		btcoex.o \

		mac.o \

drivers/net/wireless/ath/ath9k/ar9002_calib.c

0 → 100644
+993 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath/ath9k/ar9003_calib.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "hw.h"

#include "hw-ops.h"

#include "ar9003_phy.h"



static void ar9003_hw_setup_calibration(struct ath_hw *ah,

					struct ath9k_cal_list *currCal)

{

	/* TODO */

}



static bool ar9003_hw_calibrate(struct ath_hw *ah,

				struct ath9k_channel *chan,

				u8 rxchainmask,

				bool longcal)

{

	/* TODO */

	return false;

}



static bool ar9003_hw_init_cal(struct ath_hw *ah,

			       struct ath9k_channel *chan)

{

	/* TODO */

	return false;

}



static void ar9003_hw_init_cal_settings(struct ath_hw *ah)

{

	/* TODO */

}



static bool ar9003_hw_iscal_supported(struct ath_hw *ah,

				      enum ath9k_cal_types calType)

{

	/* TODO */

	return false;

}



void ar9003_hw_attach_calib_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);

	struct ath_hw_ops *ops = ath9k_hw_ops(ah);



	priv_ops->init_cal_settings = ar9003_hw_init_cal_settings;

	priv_ops->init_cal = ar9003_hw_init_cal;

	priv_ops->setup_calibration = ar9003_hw_setup_calibration;

	priv_ops->iscal_supported = ar9003_hw_iscal_supported;



	ops->calibrate = ar9003_hw_calibrate;

}

drivers/net/wireless/ath/ath9k/calib.c

+4 −924

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath/ath9k/calib.h

+3 −12
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ 


#include "hw.h"



extern const struct ath9k_percal_data iq_cal_multi_sample;

extern const struct ath9k_percal_data iq_cal_single_sample;

extern const struct ath9k_percal_data adc_gain_cal_multi_sample;

extern const struct ath9k_percal_data adc_gain_cal_single_sample;

extern const struct ath9k_percal_data adc_dc_cal_multi_sample;

extern const struct ath9k_percal_data adc_dc_cal_single_sample;

extern const struct ath9k_percal_data adc_init_dc_cal;



#define AR_PHY_CCA_MAX_AR5416_GOOD_VALUE	-85

#define AR_PHY_CCA_MAX_AR9280_GOOD_VALUE	-112

#define AR_PHY_CCA_MAX_AR9285_GOOD_VALUE	-118
@@ -127,9 +119,8 @@ int16_t ath9k_hw_getnf(struct ath_hw *ah, 
		       struct ath9k_channel *chan);

void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah);

s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan);

bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,

			u8 rxchainmask, bool longcal);

bool ath9k_hw_init_cal(struct ath_hw *ah,

		       struct ath9k_channel *chan);

void ath9k_hw_reset_calibration(struct ath_hw *ah,

				struct ath9k_cal_list *currCal);





#endif /* CALIB_H */