diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-01-15 06:34:21 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-15 17:05:30 -0500 |
| commit | f8187b5b9780a9ac3c12c70413615a0fdf321cd5 (patch) | |
| tree | 958642e56b1c5190d7c6ef7dcaec608a9c23a9fc /drivers | |
| parent | 76a4db303d06066792bbc0e886def2cf99b232ef (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 24 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.h | 38 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/tables_nphy.h | 5 |
3 files changed, 67 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 6b995b92af7a..cb784a2504a6 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
| @@ -29,6 +29,30 @@ | |||
| 29 | #include "phy_n.h" | 29 | #include "phy_n.h" |
| 30 | #include "tables_nphy.h" | 30 | #include "tables_nphy.h" |
| 31 | 31 | ||
| 32 | struct nphy_txgains { | ||
| 33 | u16 txgm[2]; | ||
| 34 | u16 pga[2]; | ||
| 35 | u16 pad[2]; | ||
| 36 | u16 ipa[2]; | ||
| 37 | }; | ||
| 38 | |||
| 39 | struct nphy_iqcal_params { | ||
| 40 | u16 txgm; | ||
| 41 | u16 pga; | ||
| 42 | u16 pad; | ||
| 43 | u16 ipa; | ||
| 44 | u16 cal_gain; | ||
| 45 | u16 ncorr[5]; | ||
| 46 | }; | ||
| 47 | |||
| 48 | struct nphy_iq_est { | ||
| 49 | s32 iq0_prod; | ||
| 50 | u32 i0_pwr; | ||
| 51 | u32 q0_pwr; | ||
| 52 | s32 iq1_prod; | ||
| 53 | u32 i1_pwr; | ||
| 54 | u32 q1_pwr; | ||
| 55 | }; | ||
| 32 | 56 | ||
| 33 | void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna) | 57 | void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna) |
| 34 | {//TODO | 58 | {//TODO |
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h index 1749aef4147d..f829e4e397e8 100644 --- a/drivers/net/wireless/b43/phy_n.h +++ b/drivers/net/wireless/b43/phy_n.h | |||
| @@ -919,6 +919,44 @@ | |||
| 919 | 919 | ||
| 920 | struct b43_wldev; | 920 | struct b43_wldev; |
| 921 | 921 | ||
| 922 | struct b43_phy_n_iq_comp { | ||
| 923 | s16 a0; | ||
| 924 | s16 b0; | ||
| 925 | s16 a1; | ||
| 926 | s16 b1; | ||
| 927 | }; | ||
| 928 | |||
| 929 | struct b43_phy_n_rssical_cache { | ||
| 930 | u16 rssical_radio_regs_2G[2]; | ||
| 931 | u16 rssical_phy_regs_2G[12]; | ||
| 932 | |||
| 933 | u16 rssical_radio_regs_5G[2]; | ||
| 934 | u16 rssical_phy_regs_5G[12]; | ||
| 935 | }; | ||
| 936 | |||
| 937 | struct b43_phy_n_cal_cache { | ||
| 938 | u16 txcal_radio_regs_2G[8]; | ||
| 939 | u16 txcal_coeffs_2G[8]; | ||
| 940 | struct b43_phy_n_iq_comp rxcal_coeffs_2G; | ||
| 941 | |||
| 942 | u16 txcal_radio_regs_5G[8]; | ||
| 943 | u16 txcal_coeffs_5G[8]; | ||
| 944 | struct b43_phy_n_iq_comp rxcal_coeffs_5G; | ||
| 945 | }; | ||
| 946 | |||
| 947 | struct b43_phy_n_txpwrindex { | ||
| 948 | s8 index; | ||
| 949 | s8 index_internal; | ||
| 950 | s8 index_internal_save; | ||
| 951 | u16 AfectrlOverride; | ||
| 952 | u16 AfeCtrlDacGain; | ||
| 953 | u16 rad_gain; | ||
| 954 | u8 bbmult; | ||
| 955 | u16 iqcomp_a; | ||
| 956 | u16 iqcomp_b; | ||
| 957 | u16 locomp; | ||
| 958 | }; | ||
| 959 | |||
| 922 | struct b43_phy_n { | 960 | struct b43_phy_n { |
| 923 | //TODO lots of missing stuff | 961 | //TODO lots of missing stuff |
| 924 | }; | 962 | }; |
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h index 1f0a602fd247..f6753c4b96b2 100644 --- 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 { | |||
| 46 | 46 | ||
| 47 | struct b43_wldev; | 47 | struct b43_wldev; |
| 48 | 48 | ||
| 49 | struct nphy_txiqcal_ladder { | ||
| 50 | u8 percent; | ||
| 51 | u8 g_env; | ||
| 52 | }; | ||
| 53 | |||
| 49 | /* Upload the default register value table. | 54 | /* Upload the default register value table. |
| 50 | * If "ghz5" is true, we upload the 5Ghz table. Otherwise the 2.4Ghz | 55 | * If "ghz5" is true, we upload the 5Ghz table. Otherwise the 2.4Ghz |
| 51 | * table is uploaded. If "ignore_uploadflag" is true, we upload any value | 56 | * table is uploaded. If "ignore_uploadflag" is true, we upload any value |
