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

Commit 3cc8ff9f authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files

b43: N-PHY: move tables init function to tables file 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
parent 9a98979e

drivers/net/wireless/b43/phy_n.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -4858,18 +4858,6 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) 
 * N-PHY init

 * N-PHY init

 **************************************************/

 **************************************************/





/*

 * Upload the N-PHY tables.

 * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables

 */

static void b43_nphy_tables_init(struct b43_wldev *dev)

{

	if (dev->phy.rev < 3)

		b43_nphy_rev0_1_2_tables_init(dev);

	else

		b43_nphy_rev3plus_tables_init(dev);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */

/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */

static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)

static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)

{

{

drivers/net/wireless/b43/tables_nphy.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -3097,7 +3097,7 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset, 
#define ntab_upload(dev, offset, data) do { \

#define ntab_upload(dev, offset, data) do { \

		b43_ntab_write_bulk(dev, offset, offset##_SIZE, data);	\

		b43_ntab_write_bulk(dev, offset, offset##_SIZE, data);	\

	} while (0)

	} while (0)

void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)

static void b43_nphy_tables_init_rev0(struct b43_wldev *dev)

{

{

	/* Static tables */

	/* Static tables */

	ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct);

	ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct);
@@ -3133,7 +3133,7 @@ void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev) 
#define ntab_upload_r3(dev, offset, data) do { \

#define ntab_upload_r3(dev, offset, data) do { \

		b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \

		b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \

	} while (0)

	} while (0)

void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)

static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)

{

{

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	struct ssb_sprom *sprom = dev->dev->bus_sprom;
@@ -3174,6 +3174,15 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev) 
		B43_WARN_ON(1);

		B43_WARN_ON(1);

}

}





/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */

void b43_nphy_tables_init(struct b43_wldev *dev)

{

	if (dev->phy.rev >= 3)

		b43_nphy_tables_init_rev3(dev);

	else

		b43_nphy_tables_init_rev0(dev);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */

/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */

static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)

static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)

{

{

drivers/net/wireless/b43/tables_nphy.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -182,8 +182,7 @@ void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value); 
void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,

void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,

			  unsigned int nr_elements, const void *_data);

			  unsigned int nr_elements, const void *_data);





void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev);

void b43_nphy_tables_init(struct b43_wldev *dev);

void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev);





const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev);

const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev);