diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-02-08 21:56:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:47:38 -0500 |
commit | 02b6ab0ab936b058632cf0cfdf226778a1005882 (patch) | |
tree | 6a32c7592e6014c8dc2a90ec75b0ff511d43d836 /drivers/net/wireless/rtlwifi | |
parent | b6df7f1d3b0513529c496b7ef70f0f14b5177407 (diff) |
rtlwifi: rtl8192c-common: rtl8192se: rtl8192de: Simplify if statements
Devendra Naga <devendra.aaru@gmail.com> submitted a patch for rtl8192c_common
to change the tests in _rtl92c_store_pwrIndex_diffrate_offset(). This patch
improves on those changes and applies similar modifications to drivers rtl8192se
and rtl8192de.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 154 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 187 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 40 |
3 files changed, 104 insertions, 277 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c index a76b22387e3..cdd71f5e77a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | |||
@@ -253,121 +253,51 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, | |||
253 | { | 253 | { |
254 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 254 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
255 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 255 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
256 | int index; | ||
257 | |||
258 | if (regaddr == RTXAGC_A_RATE18_06) | ||
259 | index = 0; | ||
260 | else if (regaddr == RTXAGC_A_RATE54_24) | ||
261 | index = 1; | ||
262 | else if (regaddr == RTXAGC_A_CCK1_MCS32) | ||
263 | index = 6; | ||
264 | else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) | ||
265 | index = 7; | ||
266 | else if (regaddr == RTXAGC_A_MCS03_MCS00) | ||
267 | index = 2; | ||
268 | else if (regaddr == RTXAGC_A_MCS07_MCS04) | ||
269 | index = 3; | ||
270 | else if (regaddr == RTXAGC_A_MCS11_MCS08) | ||
271 | index = 4; | ||
272 | else if (regaddr == RTXAGC_A_MCS15_MCS12) | ||
273 | index = 5; | ||
274 | else if (regaddr == RTXAGC_B_RATE18_06) | ||
275 | index = 8; | ||
276 | else if (regaddr == RTXAGC_B_RATE54_24) | ||
277 | index = 9; | ||
278 | else if (regaddr == RTXAGC_B_CCK1_55_MCS32) | ||
279 | index = 14; | ||
280 | else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) | ||
281 | index = 15; | ||
282 | else if (regaddr == RTXAGC_B_MCS03_MCS00) | ||
283 | index = 10; | ||
284 | else if (regaddr == RTXAGC_B_MCS07_MCS04) | ||
285 | index = 11; | ||
286 | else if (regaddr == RTXAGC_B_MCS11_MCS08) | ||
287 | index = 12; | ||
288 | else if (regaddr == RTXAGC_B_MCS15_MCS12) | ||
289 | index = 13; | ||
290 | else | ||
291 | return; | ||
256 | 292 | ||
257 | if (regaddr == RTXAGC_A_RATE18_06) { | 293 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][index] = data; |
258 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0] = data; | 294 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
259 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 295 | "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n", |
260 | "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n", | 296 | rtlphy->pwrgroup_cnt, index, |
261 | rtlphy->pwrgroup_cnt, | 297 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][index]); |
262 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0]); | ||
263 | } | ||
264 | if (regaddr == RTXAGC_A_RATE54_24) { | ||
265 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1] = data; | ||
266 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
267 | "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n", | ||
268 | rtlphy->pwrgroup_cnt, | ||
269 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1]); | ||
270 | } | ||
271 | if (regaddr == RTXAGC_A_CCK1_MCS32) { | ||
272 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6] = data; | ||
273 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
274 | "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n", | ||
275 | rtlphy->pwrgroup_cnt, | ||
276 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6]); | ||
277 | } | ||
278 | if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) { | ||
279 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7] = data; | ||
280 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
281 | "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n", | ||
282 | rtlphy->pwrgroup_cnt, | ||
283 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7]); | ||
284 | } | ||
285 | if (regaddr == RTXAGC_A_MCS03_MCS00) { | ||
286 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2] = data; | ||
287 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
288 | "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n", | ||
289 | rtlphy->pwrgroup_cnt, | ||
290 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2]); | ||
291 | } | ||
292 | if (regaddr == RTXAGC_A_MCS07_MCS04) { | ||
293 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3] = data; | ||
294 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
295 | "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n", | ||
296 | rtlphy->pwrgroup_cnt, | ||
297 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3]); | ||
298 | } | ||
299 | if (regaddr == RTXAGC_A_MCS11_MCS08) { | ||
300 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4] = data; | ||
301 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
302 | "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n", | ||
303 | rtlphy->pwrgroup_cnt, | ||
304 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4]); | ||
305 | } | ||
306 | if (regaddr == RTXAGC_A_MCS15_MCS12) { | ||
307 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5] = data; | ||
308 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
309 | "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n", | ||
310 | rtlphy->pwrgroup_cnt, | ||
311 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5]); | ||
312 | } | ||
313 | if (regaddr == RTXAGC_B_RATE18_06) { | ||
314 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8] = data; | ||
315 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
316 | "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n", | ||
317 | rtlphy->pwrgroup_cnt, | ||
318 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8]); | ||
319 | } | ||
320 | if (regaddr == RTXAGC_B_RATE54_24) { | ||
321 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9] = data; | ||
322 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
323 | "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n", | ||
324 | rtlphy->pwrgroup_cnt, | ||
325 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9]); | ||
326 | } | ||
327 | if (regaddr == RTXAGC_B_CCK1_55_MCS32) { | ||
328 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14] = data; | ||
329 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
330 | "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n", | ||
331 | rtlphy->pwrgroup_cnt, | ||
332 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14]); | ||
333 | } | ||
334 | if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) { | ||
335 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15] = data; | ||
336 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
337 | "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n", | ||
338 | rtlphy->pwrgroup_cnt, | ||
339 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15]); | ||
340 | } | ||
341 | if (regaddr == RTXAGC_B_MCS03_MCS00) { | ||
342 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10] = data; | ||
343 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
344 | "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n", | ||
345 | rtlphy->pwrgroup_cnt, | ||
346 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10]); | ||
347 | } | ||
348 | if (regaddr == RTXAGC_B_MCS07_MCS04) { | ||
349 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11] = data; | ||
350 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
351 | "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n", | ||
352 | rtlphy->pwrgroup_cnt, | ||
353 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11]); | ||
354 | } | ||
355 | if (regaddr == RTXAGC_B_MCS11_MCS08) { | ||
356 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12] = data; | ||
357 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
358 | "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n", | ||
359 | rtlphy->pwrgroup_cnt, | ||
360 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12]); | ||
361 | } | ||
362 | if (regaddr == RTXAGC_B_MCS15_MCS12) { | ||
363 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13] = data; | ||
364 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
365 | "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n", | ||
366 | rtlphy->pwrgroup_cnt, | ||
367 | rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13]); | ||
368 | 298 | ||
299 | if (index == 13) | ||
369 | rtlphy->pwrgroup_cnt++; | 300 | rtlphy->pwrgroup_cnt++; |
370 | } | ||
371 | } | 301 | } |
372 | EXPORT_SYMBOL(_rtl92c_store_pwrIndex_diffrate_offset); | 302 | EXPORT_SYMBOL(_rtl92c_store_pwrIndex_diffrate_offset); |
373 | 303 | ||
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c index 9581a19c254..96dc71746ea 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c | |||
@@ -665,152 +665,51 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw, | |||
665 | { | 665 | { |
666 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 666 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
667 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 667 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
668 | int index; | ||
669 | |||
670 | if (regaddr == RTXAGC_A_RATE18_06) | ||
671 | index = 0; | ||
672 | else if (regaddr == RTXAGC_A_RATE54_24) | ||
673 | index = 1; | ||
674 | else if (regaddr == RTXAGC_A_CCK1_MCS32) | ||
675 | index = 6; | ||
676 | else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) | ||
677 | index = 7; | ||
678 | else if (regaddr == RTXAGC_A_MCS03_MCS00) | ||
679 | index = 2; | ||
680 | else if (regaddr == RTXAGC_A_MCS07_MCS04) | ||
681 | index = 3; | ||
682 | else if (regaddr == RTXAGC_A_MCS11_MCS08) | ||
683 | index = 4; | ||
684 | else if (regaddr == RTXAGC_A_MCS15_MCS12) | ||
685 | index = 5; | ||
686 | else if (regaddr == RTXAGC_B_RATE18_06) | ||
687 | index = 8; | ||
688 | else if (regaddr == RTXAGC_B_RATE54_24) | ||
689 | index = 9; | ||
690 | else if (regaddr == RTXAGC_B_CCK1_55_MCS32) | ||
691 | index = 14; | ||
692 | else if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) | ||
693 | index = 15; | ||
694 | else if (regaddr == RTXAGC_B_MCS03_MCS00) | ||
695 | index = 10; | ||
696 | else if (regaddr == RTXAGC_B_MCS07_MCS04) | ||
697 | index = 11; | ||
698 | else if (regaddr == RTXAGC_B_MCS11_MCS08) | ||
699 | index = 12; | ||
700 | else if (regaddr == RTXAGC_B_MCS15_MCS12) | ||
701 | index = 13; | ||
702 | else | ||
703 | return; | ||
668 | 704 | ||
669 | if (regaddr == RTXAGC_A_RATE18_06) { | 705 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][index] = data; |
670 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] = | 706 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
671 | data; | 707 | "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n", |
672 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 708 | rtlphy->pwrgroup_cnt, index, |
673 | "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%ulx\n", | 709 | rtlphy->mcs_txpwrlevel_origoffset |
674 | rtlphy->pwrgroup_cnt, | 710 | [rtlphy->pwrgroup_cnt][index]); |
675 | rtlphy->mcs_txpwrlevel_origoffset | 711 | if (index == 13) |
676 | [rtlphy->pwrgroup_cnt][0]); | ||
677 | } | ||
678 | if (regaddr == RTXAGC_A_RATE54_24) { | ||
679 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] = | ||
680 | data; | ||
681 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
682 | "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%ulx\n", | ||
683 | rtlphy->pwrgroup_cnt, | ||
684 | rtlphy->mcs_txpwrlevel_origoffset | ||
685 | [rtlphy->pwrgroup_cnt][1]); | ||
686 | } | ||
687 | if (regaddr == RTXAGC_A_CCK1_MCS32) { | ||
688 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] = | ||
689 | data; | ||
690 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
691 | "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%ulx\n", | ||
692 | rtlphy->pwrgroup_cnt, | ||
693 | rtlphy->mcs_txpwrlevel_origoffset | ||
694 | [rtlphy->pwrgroup_cnt][6]); | ||
695 | } | ||
696 | if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) { | ||
697 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][7] = | ||
698 | data; | ||
699 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
700 | "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%ulx\n", | ||
701 | rtlphy->pwrgroup_cnt, | ||
702 | rtlphy->mcs_txpwrlevel_origoffset | ||
703 | [rtlphy->pwrgroup_cnt][7]); | ||
704 | } | ||
705 | if (regaddr == RTXAGC_A_MCS03_MCS00) { | ||
706 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] = | ||
707 | data; | ||
708 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
709 | "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%ulx\n", | ||
710 | rtlphy->pwrgroup_cnt, | ||
711 | rtlphy->mcs_txpwrlevel_origoffset | ||
712 | [rtlphy->pwrgroup_cnt][2]); | ||
713 | } | ||
714 | if (regaddr == RTXAGC_A_MCS07_MCS04) { | ||
715 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] = | ||
716 | data; | ||
717 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
718 | "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%ulx\n", | ||
719 | rtlphy->pwrgroup_cnt, | ||
720 | rtlphy->mcs_txpwrlevel_origoffset | ||
721 | [rtlphy->pwrgroup_cnt][3]); | ||
722 | } | ||
723 | if (regaddr == RTXAGC_A_MCS11_MCS08) { | ||
724 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] = | ||
725 | data; | ||
726 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
727 | "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%ulx\n", | ||
728 | rtlphy->pwrgroup_cnt, | ||
729 | rtlphy->mcs_txpwrlevel_origoffset | ||
730 | [rtlphy->pwrgroup_cnt][4]); | ||
731 | } | ||
732 | if (regaddr == RTXAGC_A_MCS15_MCS12) { | ||
733 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] = | ||
734 | data; | ||
735 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
736 | "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%ulx\n", | ||
737 | rtlphy->pwrgroup_cnt, | ||
738 | rtlphy->mcs_txpwrlevel_origoffset | ||
739 | [rtlphy->pwrgroup_cnt][5]); | ||
740 | } | ||
741 | if (regaddr == RTXAGC_B_RATE18_06) { | ||
742 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][8] = | ||
743 | data; | ||
744 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
745 | "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%ulx\n", | ||
746 | rtlphy->pwrgroup_cnt, | ||
747 | rtlphy->mcs_txpwrlevel_origoffset | ||
748 | [rtlphy->pwrgroup_cnt][8]); | ||
749 | } | ||
750 | if (regaddr == RTXAGC_B_RATE54_24) { | ||
751 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][9] = | ||
752 | data; | ||
753 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
754 | "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%ulx\n", | ||
755 | rtlphy->pwrgroup_cnt, | ||
756 | rtlphy->mcs_txpwrlevel_origoffset | ||
757 | [rtlphy->pwrgroup_cnt][9]); | ||
758 | } | ||
759 | if (regaddr == RTXAGC_B_CCK1_55_MCS32) { | ||
760 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][14] = | ||
761 | data; | ||
762 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
763 | "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%ulx\n", | ||
764 | rtlphy->pwrgroup_cnt, | ||
765 | rtlphy->mcs_txpwrlevel_origoffset | ||
766 | [rtlphy->pwrgroup_cnt][14]); | ||
767 | } | ||
768 | if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) { | ||
769 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][15] = | ||
770 | data; | ||
771 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
772 | "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%ulx\n", | ||
773 | rtlphy->pwrgroup_cnt, | ||
774 | rtlphy->mcs_txpwrlevel_origoffset | ||
775 | [rtlphy->pwrgroup_cnt][15]); | ||
776 | } | ||
777 | if (regaddr == RTXAGC_B_MCS03_MCS00) { | ||
778 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][10] = | ||
779 | data; | ||
780 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
781 | "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%ulx\n", | ||
782 | rtlphy->pwrgroup_cnt, | ||
783 | rtlphy->mcs_txpwrlevel_origoffset | ||
784 | [rtlphy->pwrgroup_cnt][10]); | ||
785 | } | ||
786 | if (regaddr == RTXAGC_B_MCS07_MCS04) { | ||
787 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][11] = | ||
788 | data; | ||
789 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
790 | "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%ulx\n", | ||
791 | rtlphy->pwrgroup_cnt, | ||
792 | rtlphy->mcs_txpwrlevel_origoffset | ||
793 | [rtlphy->pwrgroup_cnt][11]); | ||
794 | } | ||
795 | if (regaddr == RTXAGC_B_MCS11_MCS08) { | ||
796 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][12] = | ||
797 | data; | ||
798 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
799 | "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%ulx\n", | ||
800 | rtlphy->pwrgroup_cnt, | ||
801 | rtlphy->mcs_txpwrlevel_origoffset | ||
802 | [rtlphy->pwrgroup_cnt][12]); | ||
803 | } | ||
804 | if (regaddr == RTXAGC_B_MCS15_MCS12) { | ||
805 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][13] = | ||
806 | data; | ||
807 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
808 | "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%ulx\n", | ||
809 | rtlphy->pwrgroup_cnt, | ||
810 | rtlphy->mcs_txpwrlevel_origoffset | ||
811 | [rtlphy->pwrgroup_cnt][13]); | ||
812 | rtlphy->pwrgroup_cnt++; | 712 | rtlphy->pwrgroup_cnt++; |
813 | } | ||
814 | } | 713 | } |
815 | 714 | ||
816 | static bool _rtl92d_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, | 715 | static bool _rtl92d_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c index 05b4e2790e9..6d5bbd0e4d3 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c | |||
@@ -678,30 +678,28 @@ static void _rtl92s_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw, | |||
678 | { | 678 | { |
679 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 679 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
680 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 680 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
681 | int index; | ||
681 | 682 | ||
682 | if (reg_addr == RTXAGC_RATE18_06) | 683 | if (reg_addr == RTXAGC_RATE18_06) |
683 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] = | 684 | index = 0; |
684 | data; | 685 | else if (reg_addr == RTXAGC_RATE54_24) |
685 | if (reg_addr == RTXAGC_RATE54_24) | 686 | index = 1; |
686 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] = | 687 | else if (reg_addr == RTXAGC_CCK_MCS32) |
687 | data; | 688 | index = 6; |
688 | if (reg_addr == RTXAGC_CCK_MCS32) | 689 | else if (reg_addr == RTXAGC_MCS03_MCS00) |
689 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] = | 690 | index = 2; |
690 | data; | 691 | else if (reg_addr == RTXAGC_MCS07_MCS04) |
691 | if (reg_addr == RTXAGC_MCS03_MCS00) | 692 | index = 3; |
692 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] = | 693 | else if (reg_addr == RTXAGC_MCS11_MCS08) |
693 | data; | 694 | index = 4; |
694 | if (reg_addr == RTXAGC_MCS07_MCS04) | 695 | else if (reg_addr == RTXAGC_MCS15_MCS12) |
695 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] = | 696 | index = 5; |
696 | data; | 697 | else |
697 | if (reg_addr == RTXAGC_MCS11_MCS08) | 698 | return; |
698 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] = | 699 | |
699 | data; | 700 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][index] = data; |
700 | if (reg_addr == RTXAGC_MCS15_MCS12) { | 701 | if (index == 5) |
701 | rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] = | ||
702 | data; | ||
703 | rtlphy->pwrgroup_cnt++; | 702 | rtlphy->pwrgroup_cnt++; |
704 | } | ||
705 | } | 703 | } |
706 | 704 | ||
707 | static void _rtl92s_phy_init_register_definition(struct ieee80211_hw *hw) | 705 | static void _rtl92s_phy_init_register_definition(struct ieee80211_hw *hw) |