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

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index c9d2b7738aefe85b6e52b32e160011aca56eb8c6..30b9dacb666c1a6e524f3c7250edb0a25161475b 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -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)) {