aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-06-19 07:30:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-22 16:09:43 -0400
commit9c803a03bc07553f8148d024c15c784b28c1d9ee (patch)
treefe79b15bb87a5aab19f276e773fd586410af48e2 /drivers/net/wireless/b43
parent2a870831776dd37577c6aec7b86189645183e152 (diff)
b43: N-PHY: move declarations of chantables functions to correct files
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r--drivers/net/wireless/b43/radio_2055.h5
-rw-r--r--drivers/net/wireless/b43/radio_2056.h5
-rw-r--r--drivers/net/wireless/b43/tables_nphy.h8
3 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/wireless/b43/radio_2055.h b/drivers/net/wireless/b43/radio_2055.h
index d9bfa0f21b72..67f96122f8d8 100644
--- a/drivers/net/wireless/b43/radio_2055.h
+++ b/drivers/net/wireless/b43/radio_2055.h
@@ -251,4 +251,9 @@ struct b43_nphy_channeltab_entry_rev2 {
251void b2055_upload_inittab(struct b43_wldev *dev, 251void b2055_upload_inittab(struct b43_wldev *dev,
252 bool ghz5, bool ignore_uploadflag); 252 bool ghz5, bool ignore_uploadflag);
253 253
254/* Get the NPHY Channel Switch Table entry for a channel.
255 * Returns NULL on failure to find an entry. */
256const struct b43_nphy_channeltab_entry_rev2 *
257b43_nphy_get_chantabent_rev2(struct b43_wldev *dev, u8 channel);
258
254#endif /* B43_RADIO_2055_H_ */ 259#endif /* B43_RADIO_2055_H_ */
diff --git a/drivers/net/wireless/b43/radio_2056.h b/drivers/net/wireless/b43/radio_2056.h
index d601f6e7e313..d52df6be705a 100644
--- a/drivers/net/wireless/b43/radio_2056.h
+++ b/drivers/net/wireless/b43/radio_2056.h
@@ -1117,4 +1117,9 @@ struct b43_nphy_channeltab_entry_rev3 {
1117void b2056_upload_inittabs(struct b43_wldev *dev, 1117void b2056_upload_inittabs(struct b43_wldev *dev,
1118 bool ghz5, bool ignore_uploadflag); 1118 bool ghz5, bool ignore_uploadflag);
1119 1119
1120/* Get the NPHY Channel Switch Table entry for a channel.
1121 * Returns NULL on failure to find an entry. */
1122const struct b43_nphy_channeltab_entry_rev3 *
1123b43_nphy_get_chantabent_rev3(struct b43_wldev *dev, u16 freq);
1124
1120#endif /* B43_RADIO_2056_H_ */ 1125#endif /* B43_RADIO_2056_H_ */
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index 18569367ce43..a81696bff0ed 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -60,16 +60,8 @@ struct nphy_gain_ctl_workaround_entry {
60struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent( 60struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
61 struct b43_wldev *dev, bool ghz5, bool ext_lna); 61 struct b43_wldev *dev, bool ghz5, bool ext_lna);
62 62
63/* Get the NPHY Channel Switch Table entry for a channel.
64 * Returns NULL on failure to find an entry. */
65const struct b43_nphy_channeltab_entry_rev2 *
66b43_nphy_get_chantabent_rev2(struct b43_wldev *dev, u8 channel);
67const struct b43_nphy_channeltab_entry_rev3 *
68b43_nphy_get_chantabent_rev3(struct b43_wldev *dev, u16 freq);
69
70 63
71/* The N-PHY tables. */ 64/* The N-PHY tables. */
72
73#define B43_NTAB_TYPEMASK 0xF0000000 65#define B43_NTAB_TYPEMASK 0xF0000000
74#define B43_NTAB_8BIT 0x10000000 66#define B43_NTAB_8BIT 0x10000000
75#define B43_NTAB_16BIT 0x20000000 67#define B43_NTAB_16BIT 0x20000000