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

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

b43: N-PHY: split RSSI calibration into 2 functions (rev2, rev3) 



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

drivers/net/wireless/b43/phy_n.c

+26 −5
Original line number Diff line number Diff line
@@ -429,10 +429,31 @@ static void b43_nphy_bphy_init(struct b43_wldev *dev) 
	b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668);

}



/* RSSI Calibration */

static void b43_nphy_rssi_cal(struct b43_wldev *dev, u8 type)

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

static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)

{

	//TODO

	/* TODO */

}



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

static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)

{

	/* TODO */

}



/*

 * RSSI Calibration

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

 */

static void b43_nphy_rssi_cal(struct b43_wldev *dev)

{

	if (dev->phy.rev >= 3) {

		b43_nphy_rev3_rssi_cal(dev);

	} else {

		b43_nphy_rev2_rssi_cal(dev, 2);

		b43_nphy_rev2_rssi_cal(dev, 0);

		b43_nphy_rev2_rssi_cal(dev, 1);

	}

}



/*
@@ -571,11 +592,11 @@ int b43_phy_initn(struct b43_wldev *dev) 
			do_rssi_cal = (nphy->rssical_chanspec_5G == 0);



		if (do_rssi_cal)

			;/* b43_nphy_rssi_cal(dev); */

			b43_nphy_rssi_cal(dev);

		else

			;/* b43_nphy_restore_rssi_cal(dev); */

	} else {

		/* b43_nphy_rssi_cal(dev); */

		b43_nphy_rssi_cal(dev);

	}



	if (!((nphy->measure_hold & 0x6) != 0)) {