From 9525de16dcc5a85b8cefb929a408d07cadd1a6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Fri, 15 Jan 2010 13:40:58 +0100
Subject: [PATCH] --- yaml --- r: 183674 b: refs/heads/master c:
 4cb9977516d0f52a779d12a430ccf263d35802fc h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 31 +++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 869c91faf263..78927453fd3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a933c8566da3e2b164ea74b1632bf2f43c8ee9b
+refs/heads/master: 4cb9977516d0f52a779d12a430ccf263d35802fc
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index c9d2b7738aef..30b9dacb666c 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/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)) {