diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu/phy.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 71 |
1 files changed, 11 insertions, 60 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c index 0c09240eadcc..9831ff1128ca 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "../wifi.h" | 30 | #include "../wifi.h" |
31 | #include "../pci.h" | 31 | #include "../pci.h" |
32 | #include "../ps.h" | 32 | #include "../ps.h" |
33 | #include "../core.h" | ||
33 | #include "reg.h" | 34 | #include "reg.h" |
34 | #include "def.h" | 35 | #include "def.h" |
35 | #include "phy.h" | 36 | #include "phy.h" |
@@ -188,18 +189,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw, | |||
188 | } | 189 | } |
189 | if (configtype == BASEBAND_CONFIG_PHY_REG) { | 190 | if (configtype == BASEBAND_CONFIG_PHY_REG) { |
190 | for (i = 0; i < phy_reg_arraylen; i = i + 2) { | 191 | for (i = 0; i < phy_reg_arraylen; i = i + 2) { |
191 | if (phy_regarray_table[i] == 0xfe) | 192 | rtl_addr_delay(phy_regarray_table[i]); |
192 | mdelay(50); | ||
193 | else if (phy_regarray_table[i] == 0xfd) | ||
194 | mdelay(5); | ||
195 | else if (phy_regarray_table[i] == 0xfc) | ||
196 | mdelay(1); | ||
197 | else if (phy_regarray_table[i] == 0xfb) | ||
198 | udelay(50); | ||
199 | else if (phy_regarray_table[i] == 0xfa) | ||
200 | udelay(5); | ||
201 | else if (phy_regarray_table[i] == 0xf9) | ||
202 | udelay(1); | ||
203 | rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD, | 193 | rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD, |
204 | phy_regarray_table[i + 1]); | 194 | phy_regarray_table[i + 1]); |
205 | udelay(1); | 195 | udelay(1); |
@@ -236,18 +226,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, | |||
236 | phy_regarray_table_pg = rtlphy->hwparam_tables[PHY_REG_PG].pdata; | 226 | phy_regarray_table_pg = rtlphy->hwparam_tables[PHY_REG_PG].pdata; |
237 | if (configtype == BASEBAND_CONFIG_PHY_REG) { | 227 | if (configtype == BASEBAND_CONFIG_PHY_REG) { |
238 | for (i = 0; i < phy_regarray_pg_len; i = i + 3) { | 228 | for (i = 0; i < phy_regarray_pg_len; i = i + 3) { |
239 | if (phy_regarray_table_pg[i] == 0xfe) | 229 | rtl_addr_delay(phy_regarray_table_pg[i]); |
240 | mdelay(50); | ||
241 | else if (phy_regarray_table_pg[i] == 0xfd) | ||
242 | mdelay(5); | ||
243 | else if (phy_regarray_table_pg[i] == 0xfc) | ||
244 | mdelay(1); | ||
245 | else if (phy_regarray_table_pg[i] == 0xfb) | ||
246 | udelay(50); | ||
247 | else if (phy_regarray_table_pg[i] == 0xfa) | ||
248 | udelay(5); | ||
249 | else if (phy_regarray_table_pg[i] == 0xf9) | ||
250 | udelay(1); | ||
251 | _rtl92c_store_pwrIndex_diffrate_offset(hw, | 230 | _rtl92c_store_pwrIndex_diffrate_offset(hw, |
252 | phy_regarray_table_pg[i], | 231 | phy_regarray_table_pg[i], |
253 | phy_regarray_table_pg[i + 1], | 232 | phy_regarray_table_pg[i + 1], |
@@ -294,46 +273,16 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, | |||
294 | switch (rfpath) { | 273 | switch (rfpath) { |
295 | case RF90_PATH_A: | 274 | case RF90_PATH_A: |
296 | for (i = 0; i < radioa_arraylen; i = i + 2) { | 275 | for (i = 0; i < radioa_arraylen; i = i + 2) { |
297 | if (radioa_array_table[i] == 0xfe) | 276 | rtl_rfreg_delay(hw, rfpath, radioa_array_table[i], |
298 | mdelay(50); | 277 | RFREG_OFFSET_MASK, |
299 | else if (radioa_array_table[i] == 0xfd) | 278 | radioa_array_table[i + 1]); |
300 | mdelay(5); | ||
301 | else if (radioa_array_table[i] == 0xfc) | ||
302 | mdelay(1); | ||
303 | else if (radioa_array_table[i] == 0xfb) | ||
304 | udelay(50); | ||
305 | else if (radioa_array_table[i] == 0xfa) | ||
306 | udelay(5); | ||
307 | else if (radioa_array_table[i] == 0xf9) | ||
308 | udelay(1); | ||
309 | else { | ||
310 | rtl_set_rfreg(hw, rfpath, radioa_array_table[i], | ||
311 | RFREG_OFFSET_MASK, | ||
312 | radioa_array_table[i + 1]); | ||
313 | udelay(1); | ||
314 | } | ||
315 | } | 279 | } |
316 | break; | 280 | break; |
317 | case RF90_PATH_B: | 281 | case RF90_PATH_B: |
318 | for (i = 0; i < radiob_arraylen; i = i + 2) { | 282 | for (i = 0; i < radiob_arraylen; i = i + 2) { |
319 | if (radiob_array_table[i] == 0xfe) { | 283 | rtl_rfreg_delay(hw, rfpath, radiob_array_table[i], |
320 | mdelay(50); | 284 | RFREG_OFFSET_MASK, |
321 | } else if (radiob_array_table[i] == 0xfd) | 285 | radiob_array_table[i + 1]); |
322 | mdelay(5); | ||
323 | else if (radiob_array_table[i] == 0xfc) | ||
324 | mdelay(1); | ||
325 | else if (radiob_array_table[i] == 0xfb) | ||
326 | udelay(50); | ||
327 | else if (radiob_array_table[i] == 0xfa) | ||
328 | udelay(5); | ||
329 | else if (radiob_array_table[i] == 0xf9) | ||
330 | udelay(1); | ||
331 | else { | ||
332 | rtl_set_rfreg(hw, rfpath, radiob_array_table[i], | ||
333 | RFREG_OFFSET_MASK, | ||
334 | radiob_array_table[i + 1]); | ||
335 | udelay(1); | ||
336 | } | ||
337 | } | 286 | } |
338 | break; | 287 | break; |
339 | case RF90_PATH_C: | 288 | case RF90_PATH_C: |
@@ -344,6 +293,8 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, | |||
344 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 293 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
345 | "switch case not processed\n"); | 294 | "switch case not processed\n"); |
346 | break; | 295 | break; |
296 | default: | ||
297 | break; | ||
347 | } | 298 | } |
348 | return true; | 299 | return true; |
349 | } | 300 | } |