diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2013-03-30 19:40:21 -0400 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2013-04-23 06:27:58 -0400 |
commit | 3cc8ff9f2feb12810f7d49465ad9bc2f054822aa (patch) | |
tree | f28516007aa007054849d944fe9c9c488cd5b8ee /drivers/net | |
parent | 9a98979ead67c141fbe71edf525486af92ea5d6a (diff) |
b43: N-PHY: move tables init function to tables file
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/b43/tables_nphy.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/b43/tables_nphy.h | 3 |
3 files changed, 12 insertions, 16 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index c1dedec94864..22316d570271 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -4858,18 +4858,6 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) | |||
4858 | * N-PHY init | 4858 | * N-PHY init |
4859 | **************************************************/ | 4859 | **************************************************/ |
4860 | 4860 | ||
4861 | /* | ||
4862 | * Upload the N-PHY tables. | ||
4863 | * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables | ||
4864 | */ | ||
4865 | static void b43_nphy_tables_init(struct b43_wldev *dev) | ||
4866 | { | ||
4867 | if (dev->phy.rev < 3) | ||
4868 | b43_nphy_rev0_1_2_tables_init(dev); | ||
4869 | else | ||
4870 | b43_nphy_rev3plus_tables_init(dev); | ||
4871 | } | ||
4872 | |||
4873 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */ | 4861 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */ |
4874 | static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble) | 4862 | static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble) |
4875 | { | 4863 | { |
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c index 110510d53958..0977fa0278c9 100644 --- a/drivers/net/wireless/b43/tables_nphy.c +++ b/drivers/net/wireless/b43/tables_nphy.c | |||
@@ -3097,7 +3097,7 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset, | |||
3097 | #define ntab_upload(dev, offset, data) do { \ | 3097 | #define ntab_upload(dev, offset, data) do { \ |
3098 | b43_ntab_write_bulk(dev, offset, offset##_SIZE, data); \ | 3098 | b43_ntab_write_bulk(dev, offset, offset##_SIZE, data); \ |
3099 | } while (0) | 3099 | } while (0) |
3100 | void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev) | 3100 | static void b43_nphy_tables_init_rev0(struct b43_wldev *dev) |
3101 | { | 3101 | { |
3102 | /* Static tables */ | 3102 | /* Static tables */ |
3103 | ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct); | 3103 | 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) | |||
3133 | #define ntab_upload_r3(dev, offset, data) do { \ | 3133 | #define ntab_upload_r3(dev, offset, data) do { \ |
3134 | b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \ | 3134 | b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \ |
3135 | } while (0) | 3135 | } while (0) |
3136 | void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev) | 3136 | static void b43_nphy_tables_init_rev3(struct b43_wldev *dev) |
3137 | { | 3137 | { |
3138 | struct ssb_sprom *sprom = dev->dev->bus_sprom; | 3138 | struct ssb_sprom *sprom = dev->dev->bus_sprom; |
3139 | 3139 | ||
@@ -3174,6 +3174,15 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev) | |||
3174 | B43_WARN_ON(1); | 3174 | B43_WARN_ON(1); |
3175 | } | 3175 | } |
3176 | 3176 | ||
3177 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */ | ||
3178 | void b43_nphy_tables_init(struct b43_wldev *dev) | ||
3179 | { | ||
3180 | if (dev->phy.rev >= 3) | ||
3181 | b43_nphy_tables_init_rev3(dev); | ||
3182 | else | ||
3183 | b43_nphy_tables_init_rev0(dev); | ||
3184 | } | ||
3185 | |||
3177 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */ | 3186 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */ |
3178 | static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev) | 3187 | static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev) |
3179 | { | 3188 | { |
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h index c600700ceedc..df6c828e3a7e 100644 --- a/drivers/net/wireless/b43/tables_nphy.h +++ b/drivers/net/wireless/b43/tables_nphy.h | |||
@@ -182,8 +182,7 @@ void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value); | |||
182 | void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset, | 182 | void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset, |
183 | unsigned int nr_elements, const void *_data); | 183 | unsigned int nr_elements, const void *_data); |
184 | 184 | ||
185 | void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev); | 185 | void b43_nphy_tables_init(struct b43_wldev *dev); |
186 | void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev); | ||
187 | 186 | ||
188 | const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev); | 187 | const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev); |
189 | 188 | ||