Skip to content

Commit

Permalink
b43: N-PHY: split RSSI calibration into 2 functions (rev2, rev3)
Browse files Browse the repository at this point in the history
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Jan 15, 2010
1 parent 4a933c8 commit 4cb9977
Showing 1 changed file with 26 additions and 5 deletions.
31 changes: 26 additions & 5 deletions drivers/net/wireless/b43/phy_n.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

/*
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit 4cb9977

Please sign in to comment.