diff options
| author | Rafał Miłecki | 2013-03-16 23:47:29 +0100 |
|---|---|---|
| committer | Rafał Miłecki | 2013-04-23 12:27:55 +0200 |
| commit | 9cfc17cbbf20af09ec4bd941338416bfb78d3a25 (patch) | |
| tree | ae57d9223d4246a56d484b1523d20c3a1b17aa50 /drivers/net/wireless/b43 | |
| parent | b43: HT-PHY: tables: don't duplicate core-generic regs (diff) | |
| download | kernel-qcow2-linux-9cfc17cbbf20af09ec4bd941338416bfb78d3a25.tar.gz kernel-qcow2-linux-9cfc17cbbf20af09ec4bd941338416bfb78d3a25.tar.xz kernel-qcow2-linux-9cfc17cbbf20af09ec4bd941338416bfb78d3a25.zip | |
b43: HT-PHY: finish calculating values for idle TSSI
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/phy_ht.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index 3d0bddb64b3d..fd9e249e95b8 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c @@ -529,9 +529,21 @@ static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable) static void b43_phy_ht_tx_power_ctl_idle_tssi(struct b43_wldev *dev) { struct b43_phy_ht *phy_ht = dev->phy.ht; + static const u16 base[] = { 0x840, 0x860, 0x880 }; + u16 save_regs[3][3]; s32 rssi_buf[6]; + int core; - /* TODO */ + for (core = 0; core < 3; core++) { + save_regs[core][1] = b43_phy_read(dev, base[core] + 6); + save_regs[core][2] = b43_phy_read(dev, base[core] + 7); + save_regs[core][0] = b43_phy_read(dev, base[core] + 0); + + b43_phy_write(dev, base[core] + 6, 0); + b43_phy_mask(dev, base[core] + 7, ~0xF); /* 0xF? Or just 0x6? */ + b43_phy_set(dev, base[core] + 0, 0x0400); + b43_phy_set(dev, base[core] + 0, 0x1000); + } b43_phy_ht_tx_tone(dev); udelay(20); @@ -543,7 +555,11 @@ static void b43_phy_ht_tx_power_ctl_idle_tssi(struct b43_wldev *dev) phy_ht->idle_tssi[1] = rssi_buf[2] & 0xff; phy_ht->idle_tssi[2] = rssi_buf[4] & 0xff; - /* TODO */ + for (core = 0; core < 3; core++) { + b43_phy_write(dev, base[core] + 0, save_regs[core][0]); + b43_phy_write(dev, base[core] + 6, save_regs[core][1]); + b43_phy_write(dev, base[core] + 7, save_regs[core][2]); + } } static void b43_phy_ht_tx_power_ctl_setup(struct b43_wldev *dev) |