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

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

b43: N-PHY: prepare code for reapplying TX cal coeffs 



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

drivers/net/wireless/b43/phy_n.c

+34 −1
Original line number Diff line number Diff line
@@ -2587,6 +2587,39 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 
	return error;

}



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

static void b43_nphy_reapply_tx_cal_coeffs(struct b43_wldev *dev)

{

	struct b43_phy_n *nphy = dev->phy.n;

	u8 i;

	u16 buffer[7];

	bool equal = true;



	if (!nphy->txiqlocal_coeffsvalid || 1 /* FIXME */)

		return;



	b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 7, buffer);

	for (i = 0; i < 4; i++) {

		if (buffer[i] != nphy->txiqlocal_bestc[i]) {

			equal = false;

			break;

		}

	}



	if (!equal) {

		b43_ntab_write_bulk(dev, B43_NTAB16(15, 80), 4,

					nphy->txiqlocal_bestc);

		for (i = 0; i < 4; i++)

			buffer[i] = 0;

		b43_ntab_write_bulk(dev, B43_NTAB16(15, 88), 4,

					buffer);

		b43_ntab_write_bulk(dev, B43_NTAB16(15, 85), 2,

					&nphy->txiqlocal_bestc[5]);

		b43_ntab_write_bulk(dev, B43_NTAB16(15, 93), 2,

					&nphy->txiqlocal_bestc[5]);

	}

}



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

static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,

			struct nphy_txgains target, u8 type, bool debug)
@@ -2617,7 +2650,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, 
	b43_nphy_stay_in_carrier_search(dev, 1);



	if (dev->phy.rev < 2)

		;/* TODO: Call N PHY Reapply TX Cal Coeffs */

		b43_nphy_reapply_tx_cal_coeffs(dev);

	b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, gain_save);

	for (i = 0; i < 2; i++) {

		b43_nphy_iq_cal_gain_params(dev, i, target, &cal_params[i]);