leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

b43: N-PHY: fix RSSI selection

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2010-11-30 22:33:14 +01:00 committed by John W. Linville
parent 44b23b488d
commit 99f6c2ef1e
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/wireless/b43/phy_n.c
View File

@ -1822,27 +1822,39 @@ static void b43_nphy_rev2_rssi_select(struct b43_wldev *dev, u8 code, u8 type)
(type + 1) << 4);
}
/* TODO use some definitions */
if (code == 0) {
b43_phy_maskset(dev, B43_NPHY_AFECTL_OVER, 0xCFFF, 0);
b43_phy_mask(dev, B43_NPHY_AFECTL_OVER, ~0x3000);
if (type < 3) {
b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, 0xFEC7, 0);
b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, 0xEFDC, 0);
b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, 0xFFFE, 0);
b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,
~(B43_NPHY_RFCTL_CMD_RXEN |
B43_NPHY_RFCTL_CMD_CORESEL));
b43_phy_mask(dev, B43_NPHY_RFCTL_OVER,
~(0x1 << 12 |
0x1 << 5 |
0x1 << 1 |
0x1));
b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,
~B43_NPHY_RFCTL_CMD_START);
udelay(20);
b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, 0xFFFE, 0);
b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);
}
} else {
b43_phy_maskset(dev, B43_NPHY_AFECTL_OVER, 0xCFFF,
0x3000);
b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x3000);
if (type < 3) {
b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD,
0xFEC7, 0x0180);
b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER,
0xEFDC, (code << 1 | 0x1021));
b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, 0xFFFE, 0x1);
~(B43_NPHY_RFCTL_CMD_RXEN |
B43_NPHY_RFCTL_CMD_CORESEL),
(B43_NPHY_RFCTL_CMD_RXEN |
code << B43_NPHY_RFCTL_CMD_CORESEL_SHIFT));
b43_phy_set(dev, B43_NPHY_RFCTL_OVER,
(0x1 << 12 |
0x1 << 5 |
0x1 << 1 |
0x1));
b43_phy_set(dev, B43_NPHY_RFCTL_CMD,
B43_NPHY_RFCTL_CMD_START);
udelay(20);
b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, 0xFFFE, 0);
b43_phy_mask(dev, B43_NPHY_RFCTL_OVER, ~0x1);
}
}
}