b43: LCN-PHY: minor clean ups

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_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index bffeb44b4a4088c3ff22765e55cfd2be81b45871..a13e28ef6246af2dd344025d1b394403572fd5f3 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -433,7 +433,7 @@ static void b43_phy_lcn_sense_setup(struct b43_wldev *dev,
        b43_phy_set(dev, 0x4d0, 0x20);
        b43_radio_write(dev, 0x112, 0x6);
 
-       /* TODO: dummy transmission? */
+       b43_dummy_transmission(dev, true, false);
        /* Wait if not done */
        if (!(b43_phy_read(dev, 0x476) & 0x8000))
                udelay(10);

diff --git a/drivers/net/wireless/b43/tables_phy_lcn.c b/drivers/net/wireless/b43/tables_phy_lcn.c
index 9d484e2f79bfd96f5ad2dd60b25c1334ce173e7f..5176363cadf297f720d7ddca09293a8c96cb5f8e 100644 (file)
--- a/drivers/net/wireless/b43/tables_phy_lcn.c
+++ b/drivers/net/wireless/b43/tables_phy_lcn.c
@@ -657,8 +657,25 @@ void b43_phy_lcn_load_tx_gain_tab(struct b43_wldev *dev,
        }
 }
 
+/* wlc_lcnphy_load_rfpower */
+static void b43_phy_lcn_load_rfpower(struct b43_wldev *dev)
+{
+       u32 bbmult, rfgain;
+       u8 i;
+
+       for (i = 0; i < 128; i++) {
+               bbmult = b43_lcntab_read(dev, B43_LCNTAB32(0x7, 0x140 + i));
+               bbmult >>= 20;
+               rfgain = b43_lcntab_read(dev, B43_LCNTAB32(0x7, 0xc0 + i));
+
+               /* TODO: calculate value for 0x240 + i table offset
+                * b43_lcntab_write(dev, B43_LCNTAB32(0x7, 0x240 + i), val);
+                */
+       }
+}
+
 /* Not implemented in brcmsmac, noticed in wl in MMIO dump */
-static void b43_phy_lcn_rewrite_tables(struct b43_wldev *dev)
+static void b43_phy_lcn_rewrite_rfpower_table(struct b43_wldev *dev)
 {
        int i;
        u32 tmp;
@@ -685,7 +702,7 @@ void b43_phy_lcn_tables_init(struct b43_wldev *dev)
        b43_phy_lcn_upload_static_tables(dev);
 
        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
-               if (sprom->boardflags_lo & B43_BFL_EXTLNA)
+               if (sprom->boardflags_lo & B43_BFL_FEM)
                        b43_phy_lcn_load_tx_gain_tab(dev,
                                b43_lcntab_tx_gain_tbl_2ghz_ext_pa_rev0);
                else
@@ -701,7 +718,7 @@ void b43_phy_lcn_tables_init(struct b43_wldev *dev)
        else
                b43err(dev->wl, "SW ctl table is unknown for this card\n");
 
-       /* TODO: various tables ops here */
-       b43_phy_lcn_rewrite_tables(dev);
+       b43_phy_lcn_load_rfpower(dev);
+       b43_phy_lcn_rewrite_rfpower_table(dev);
        b43_phy_lcn_clean_papd_comp_table(dev);
 }