b43: N-PHY: add needed struct definitions

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6b995b92af7af09d3f1e7424acf8b623a4587e22..cb784a2504a6f19f7184aecf7bf8ec3ff301eadc 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -29,6 +29,30 @@
 #include "phy_n.h"
 #include "tables_nphy.h"
 
+struct nphy_txgains {
+       u16 txgm[2];
+       u16 pga[2];
+       u16 pad[2];
+       u16 ipa[2];
+};
+
+struct nphy_iqcal_params {
+       u16 txgm;
+       u16 pga;
+       u16 pad;
+       u16 ipa;
+       u16 cal_gain;
+       u16 ncorr[5];
+};
+
+struct nphy_iq_est {
+       s32 iq0_prod;
+       u32 i0_pwr;
+       u32 q0_pwr;
+       s32 iq1_prod;
+       u32 i1_pwr;
+       u32 q1_pwr;
+};
 
 void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
 {//TODO

diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 1749aef4147d45891604e41439e46ec40232a44a..f829e4e397e8c96b2321b6f5ba1584cdc3e6b9e0 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -919,6 +919,44 @@
 
 struct b43_wldev;
 
+struct b43_phy_n_iq_comp {
+       s16 a0;
+       s16 b0;
+       s16 a1;
+       s16 b1;
+};
+
+struct b43_phy_n_rssical_cache {
+       u16 rssical_radio_regs_2G[2];
+       u16 rssical_phy_regs_2G[12];
+
+       u16 rssical_radio_regs_5G[2];
+       u16 rssical_phy_regs_5G[12];
+};
+
+struct b43_phy_n_cal_cache {
+       u16 txcal_radio_regs_2G[8];
+       u16 txcal_coeffs_2G[8];
+       struct b43_phy_n_iq_comp rxcal_coeffs_2G;
+
+       u16 txcal_radio_regs_5G[8];
+       u16 txcal_coeffs_5G[8];
+       struct b43_phy_n_iq_comp rxcal_coeffs_5G;
+};
+
+struct b43_phy_n_txpwrindex {
+       s8 index;
+       s8 index_internal;
+       s8 index_internal_save;
+       u16 AfectrlOverride;
+       u16 AfeCtrlDacGain;
+       u16 rad_gain;
+       u8 bbmult;
+       u16 iqcomp_a;
+       u16 iqcomp_b;
+       u16 locomp;
+};
+
 struct b43_phy_n {
        //TODO lots of missing stuff
 };

diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index 1f0a602fd2478115e70fe72f7b7e5d461a7ac88a..f6753c4b96b2a0d055e580ad6d10884be83a178d 100644 (file)
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -46,6 +46,11 @@ struct b43_nphy_channeltab_entry {
 
 struct b43_wldev;
 
+struct nphy_txiqcal_ladder {
+       u8 percent;
+       u8 g_env;
+};
+
 /* Upload the default register value table.
  * If "ghz5" is true, we upload the 5Ghz table. Otherwise the 2.4Ghz
  * table is uploaded. If "ignore_uploadflag" is true, we upload any value