summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/tables_nphy.h
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-03-29 02:53:15 +0400
committerJohn W. Linville <linville@tuxdriver.com>2010-03-31 22:39:19 +0400
commitf19ebe7d772a3b48743fa798ad979a4ee3cb64e2 (patch)
tree7f0216e4dc449edda0f2d6b7a8676ddb53cbf594 /drivers/net/wireless/b43/tables_nphy.h
parentffd2d9bdac1a0a5d3184e085ea1bd3060b4166fe (diff)
downloadlinux-f19ebe7d772a3b48743fa798ad979a4ee3cb64e2.tar.xz
b43: N-PHY: prepare for rev3+ channel tables
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/tables_nphy.h')
-rw-r--r--drivers/net/wireless/b43/tables_nphy.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index 84dea356d856..8fc1da9f8fe5 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -13,7 +13,7 @@ struct b43_phy_n_sfo_cfg {
u16 phy_bw6;
};
-struct b43_nphy_channeltab_entry {
+struct b43_nphy_channeltab_entry_rev2 {
/* The channel number */
u8 channel;
/* The channel frequency in MHz */
@@ -47,6 +47,17 @@ struct b43_nphy_channeltab_entry {
struct b43_phy_n_sfo_cfg phy_regs;
};
+struct b43_nphy_channeltab_entry_rev3 {
+ /* The channel number */
+ u8 channel;
+ /* The channel frequency in MHz */
+ u16 freq;
+ /* Radio register values on channelswitch */
+ /* TODO */
+ /* PHY register values on channelswitch */
+ struct b43_phy_n_sfo_cfg phy_regs;
+};
+
struct b43_wldev;
@@ -81,8 +92,8 @@ void b2055_upload_inittab(struct b43_wldev *dev,
/* Get the NPHY Channel Switch Table entry for a channel number.
* Returns NULL on failure to find an entry. */
-const struct b43_nphy_channeltab_entry *
-b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel);
+const struct b43_nphy_channeltab_entry_rev2 *
+b43_nphy_get_chantabent_rev2(struct b43_wldev *dev, u8 channel);
/* The N-PHY tables. */