Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177c3732 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: LCN-PHY: minor clean ups 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 93dbd828

drivers/net/wireless/b43/phy_lcn.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,7 @@ static void b43_phy_lcn_sense_setup(struct b43_wldev *dev, 
	b43_phy_set(dev, 0x4d0, 0x20);

	b43_phy_set(dev, 0x4d0, 0x20);

	b43_radio_write(dev, 0x112, 0x6);

	b43_radio_write(dev, 0x112, 0x6);





	/* TODO: dummy transmission? */

	b43_dummy_transmission(dev, true, false);

	/* Wait if not done */

	/* Wait if not done */

	if (!(b43_phy_read(dev, 0x476) & 0x8000))

	if (!(b43_phy_read(dev, 0x476) & 0x8000))

		udelay(10);

		udelay(10);

drivers/net/wireless/b43/tables_phy_lcn.c

+21 −4
Original line number Original line Diff line number Diff line
@@ -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 */

/* 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;

	int i;

	u32 tmp;

	u32 tmp;
@@ -685,7 +702,7 @@ void b43_phy_lcn_tables_init(struct b43_wldev *dev) 
	b43_phy_lcn_upload_static_tables(dev);

	b43_phy_lcn_upload_static_tables(dev);





	if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {

	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_phy_lcn_load_tx_gain_tab(dev,

				b43_lcntab_tx_gain_tbl_2ghz_ext_pa_rev0);

				b43_lcntab_tx_gain_tbl_2ghz_ext_pa_rev0);

		else

		else
@@ -701,7 +718,7 @@ void b43_phy_lcn_tables_init(struct b43_wldev *dev) 
	else

	else

		b43err(dev->wl, "SW ctl table is unknown for this card\n");

		b43err(dev->wl, "SW ctl table is unknown for this card\n");





	/* TODO: various tables ops here */

	b43_phy_lcn_load_rfpower(dev);

	b43_phy_lcn_rewrite_tables(dev);

	b43_phy_lcn_rewrite_rfpower_table(dev);

	b43_phy_lcn_clean_papd_comp_table(dev);

	b43_phy_lcn_clean_papd_comp_table(dev);

}
 
}