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

Commit 67c0d6e2 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: N-PHY: move RF sequence declarations top, add missing calls 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f4ab6cd

drivers/net/wireless/b43/phy_n.c

+16 −12
Original line number Diff line number Diff line
@@ -55,6 +55,18 @@ struct nphy_iq_est { 
	u32 q1_pwr;

};



enum b43_nphy_rf_sequence {

	B43_RFSEQ_RX2TX,

	B43_RFSEQ_TX2RX,

	B43_RFSEQ_RESET2RX,

	B43_RFSEQ_UPDATE_GAINH,

	B43_RFSEQ_UPDATE_GAINL,

	B43_RFSEQ_UPDATE_GAINU,

};



static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,

				       enum b43_nphy_rf_sequence seq);



void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)

{//TODO

}
@@ -421,7 +433,7 @@ static void b43_nphy_reset_cca(struct b43_wldev *dev) 
	udelay(1);

	b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg & ~B43_NPHY_BBCFG_RSTCCA);

	b43_nphy_bmac_clock_fgc(dev, 0);

	/* TODO: N PHY Force RF Seq with argument 2 */

	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */
@@ -590,7 +602,7 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core) 


	/* TODO: Call N PHY RF Ctrl Intc Override with 2, 0, 3 as arguments */

	/* TODO: Call N PHY RF Intc Override with 8, 0, 3, 0 as arguments */

	/* TODO: Call N PHY RF Seq with 0 as argument */

	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX);



	if (core == 0) {

		rxval = 1;
@@ -872,15 +884,7 @@ static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev) 
		b43_nphy_stay_in_carrier_search(dev, false);

}



enum b43_nphy_rf_sequence {

	B43_RFSEQ_RX2TX,

	B43_RFSEQ_TX2RX,

	B43_RFSEQ_RESET2RX,

	B43_RFSEQ_UPDATE_GAINH,

	B43_RFSEQ_UPDATE_GAINL,

	B43_RFSEQ_UPDATE_GAINU,

};



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ForceRFSeq */

static void b43_nphy_force_rf_sequence(struct b43_wldev *dev,

				       enum b43_nphy_rf_sequence seq)

{
@@ -2156,7 +2160,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, 
	}



	/* TODO: Call N PHY RF Ctrl Override with 0x400, 0, 3, 1 as arguments*/

	/* TODO: Call N PHY Force RF Seq with 2 as argument */

	b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);

	/* TODO: Write an N PHY Table with ID 7, length 2, offset 0x110,

		width 16, and data from gain_save */