rtlwifi: Move common routines to core
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
f3355dd9f7
commit
25b13dbc38
@@ -30,6 +30,7 @@
|
||||
#include "../wifi.h"
|
||||
#include "../pci.h"
|
||||
#include "../ps.h"
|
||||
#include "../core.h"
|
||||
#include "reg.h"
|
||||
#include "def.h"
|
||||
#include "hw.h"
|
||||
@@ -198,18 +199,7 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
|
||||
}
|
||||
if (configtype == BASEBAND_CONFIG_PHY_REG) {
|
||||
for (i = 0; i < phy_reg_arraylen; i = i + 2) {
|
||||
if (phy_regarray_table[i] == 0xfe)
|
||||
mdelay(50);
|
||||
else if (phy_regarray_table[i] == 0xfd)
|
||||
mdelay(5);
|
||||
else if (phy_regarray_table[i] == 0xfc)
|
||||
mdelay(1);
|
||||
else if (phy_regarray_table[i] == 0xfb)
|
||||
udelay(50);
|
||||
else if (phy_regarray_table[i] == 0xfa)
|
||||
udelay(5);
|
||||
else if (phy_regarray_table[i] == 0xf9)
|
||||
udelay(1);
|
||||
rtl_addr_delay(phy_regarray_table[i]);
|
||||
rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD,
|
||||
phy_regarray_table[i + 1]);
|
||||
udelay(1);
|
||||
@@ -245,18 +235,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
|
||||
|
||||
if (configtype == BASEBAND_CONFIG_PHY_REG) {
|
||||
for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
|
||||
if (phy_regarray_table_pg[i] == 0xfe)
|
||||
mdelay(50);
|
||||
else if (phy_regarray_table_pg[i] == 0xfd)
|
||||
mdelay(5);
|
||||
else if (phy_regarray_table_pg[i] == 0xfc)
|
||||
mdelay(1);
|
||||
else if (phy_regarray_table_pg[i] == 0xfb)
|
||||
udelay(50);
|
||||
else if (phy_regarray_table_pg[i] == 0xfa)
|
||||
udelay(5);
|
||||
else if (phy_regarray_table_pg[i] == 0xf9)
|
||||
udelay(1);
|
||||
rtl_addr_delay(phy_regarray_table_pg[i]);
|
||||
|
||||
_rtl92c_store_pwrIndex_diffrate_offset(hw,
|
||||
phy_regarray_table_pg[i],
|
||||
@@ -305,46 +284,16 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
|
||||
switch (rfpath) {
|
||||
case RF90_PATH_A:
|
||||
for (i = 0; i < radioa_arraylen; i = i + 2) {
|
||||
if (radioa_array_table[i] == 0xfe)
|
||||
mdelay(50);
|
||||
else if (radioa_array_table[i] == 0xfd)
|
||||
mdelay(5);
|
||||
else if (radioa_array_table[i] == 0xfc)
|
||||
mdelay(1);
|
||||
else if (radioa_array_table[i] == 0xfb)
|
||||
udelay(50);
|
||||
else if (radioa_array_table[i] == 0xfa)
|
||||
udelay(5);
|
||||
else if (radioa_array_table[i] == 0xf9)
|
||||
udelay(1);
|
||||
else {
|
||||
rtl_set_rfreg(hw, rfpath, radioa_array_table[i],
|
||||
RFREG_OFFSET_MASK,
|
||||
radioa_array_table[i + 1]);
|
||||
udelay(1);
|
||||
}
|
||||
rtl_rfreg_delay(hw, rfpath, radioa_array_table[i],
|
||||
RFREG_OFFSET_MASK,
|
||||
radioa_array_table[i + 1]);
|
||||
}
|
||||
break;
|
||||
case RF90_PATH_B:
|
||||
for (i = 0; i < radiob_arraylen; i = i + 2) {
|
||||
if (radiob_array_table[i] == 0xfe) {
|
||||
mdelay(50);
|
||||
} else if (radiob_array_table[i] == 0xfd)
|
||||
mdelay(5);
|
||||
else if (radiob_array_table[i] == 0xfc)
|
||||
mdelay(1);
|
||||
else if (radiob_array_table[i] == 0xfb)
|
||||
udelay(50);
|
||||
else if (radiob_array_table[i] == 0xfa)
|
||||
udelay(5);
|
||||
else if (radiob_array_table[i] == 0xf9)
|
||||
udelay(1);
|
||||
else {
|
||||
rtl_set_rfreg(hw, rfpath, radiob_array_table[i],
|
||||
RFREG_OFFSET_MASK,
|
||||
radiob_array_table[i + 1]);
|
||||
udelay(1);
|
||||
}
|
||||
rtl_rfreg_delay(hw, rfpath, radiob_array_table[i],
|
||||
RFREG_OFFSET_MASK,
|
||||
radiob_array_table[i + 1]);
|
||||
}
|
||||
break;
|
||||
case RF90_PATH_C:
|
||||
@@ -355,6 +304,8 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
"switch case not processed\n");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user