From ff90f62ecf430e92fb297770587433e6533bab4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 14 Aug 2011 23:27:30 +0200 Subject: [PATCH] --- yaml --- r: 265653 b: refs/heads/master c: 7ed88528884bd477bddef367e8676b9e5ff99668 h: refs/heads/master i: 265651: ea7e1456873969f50aef1c4c55f0f57149a32a08 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/phy_lcn.c | 12 +++++++++++- trunk/drivers/net/wireless/b43/phy_lcn.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81a53ae953ec..88c4e5dffb94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba356b569f7c0ff5cdf6c1abb8a9b789e5eeed22 +refs/heads/master: 7ed88528884bd477bddef367e8676b9e5ff99668 diff --git a/trunk/drivers/net/wireless/b43/phy_lcn.c b/trunk/drivers/net/wireless/b43/phy_lcn.c index 69a93b5586c8..0fd72c194a25 100644 --- a/trunk/drivers/net/wireless/b43/phy_lcn.c +++ b/trunk/drivers/net/wireless/b43/phy_lcn.c @@ -81,6 +81,16 @@ static void b43_phy_lcn_op_software_rfkill(struct b43_wldev *dev, } } +static void b43_phy_lcn_op_switch_analog(struct b43_wldev *dev, bool on) +{ + if (on) { + b43_phy_mask(dev, B43_PHY_LCN_AFE_CTL1, ~0x7); + } else { + b43_phy_set(dev, B43_PHY_LCN_AFE_CTL2, 0x7); + b43_phy_set(dev, B43_PHY_LCN_AFE_CTL1, 0x7); + } +} + static unsigned int b43_phy_lcn_op_get_default_chan(struct b43_wldev *dev) { if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) @@ -115,8 +125,8 @@ const struct b43_phy_operations b43_phyops_lcn = { .radio_write = b43_phy_lcn_op_radio_write, */ .software_rfkill = b43_phy_lcn_op_software_rfkill, - /* .switch_analog = b43_phy_lcn_op_switch_analog, + /* .switch_channel = b43_phy_lcn_op_switch_channel, */ .get_default_chan = b43_phy_lcn_op_get_default_chan, diff --git a/trunk/drivers/net/wireless/b43/phy_lcn.h b/trunk/drivers/net/wireless/b43/phy_lcn.h index 89f13b2e3370..371e07d2be3b 100644 --- a/trunk/drivers/net/wireless/b43/phy_lcn.h +++ b/trunk/drivers/net/wireless/b43/phy_lcn.h @@ -4,6 +4,8 @@ #include "phy_common.h" +#define B43_PHY_LCN_AFE_CTL1 B43_PHY_OFDM(0x03B) +#define B43_PHY_LCN_AFE_CTL2 B43_PHY_OFDM(0x03C) #define B43_PHY_LCN_RF_CTL1 B43_PHY_OFDM(0x04C) #define B43_PHY_LCN_RF_CTL2 B43_PHY_OFDM(0x04D) #define B43_PHY_LCN_RF_CTL3 B43_PHY_OFDM(0x0B0)