diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2015-01-06 10:58:06 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-09 08:48:12 -0500 |
commit | 3424a00fd559debf402559c226d9b1d895b94a5f (patch) | |
tree | 19bc50827f8079622a08d0e8f2fa2afc7015ad98 /drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | |
parent | b5d4478dc35e0cd9ef482d22aba069a19fe04a04 (diff) |
rtlwifi: rtl8192c-common: Convert driver to use common DM table initialization
These changes convert both rtl8192ce and rtl8192cu to use the new routine.
Some additional definitions are needed in the core, thus several of the
headers for other drivers are affected, but no other executable code is
changed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c index dabe18f168e0..f5ee67cda73a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | |||
@@ -195,36 +195,6 @@ void dm_savepowerindex(struct ieee80211_hw *hw) | |||
195 | } | 195 | } |
196 | EXPORT_SYMBOL_GPL(dm_savepowerindex); | 196 | EXPORT_SYMBOL_GPL(dm_savepowerindex); |
197 | 197 | ||
198 | static void rtl92c_dm_diginit(struct ieee80211_hw *hw) | ||
199 | { | ||
200 | struct rtl_priv *rtlpriv = rtl_priv(hw); | ||
201 | struct dig_t *dm_digtable = &rtlpriv->dm_digtable; | ||
202 | |||
203 | dm_digtable->dig_enable_flag = true; | ||
204 | dm_digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX; | ||
205 | dm_digtable->cur_igvalue = 0x20; | ||
206 | dm_digtable->pre_igvalue = 0x0; | ||
207 | dm_digtable->cursta_cstate = DIG_STA_DISCONNECT; | ||
208 | dm_digtable->presta_cstate = DIG_STA_DISCONNECT; | ||
209 | dm_digtable->curmultista_cstate = DIG_MULTISTA_DISCONNECT; | ||
210 | dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW; | ||
211 | dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH; | ||
212 | dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW; | ||
213 | dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH; | ||
214 | dm_digtable->rx_gain_max = DM_DIG_MAX; | ||
215 | dm_digtable->rx_gain_min = DM_DIG_MIN; | ||
216 | dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT; | ||
217 | dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX; | ||
218 | dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN; | ||
219 | dm_digtable->pre_cck_pd_state = CCK_PD_STAGE_MAX; | ||
220 | dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_LowRssi; | ||
221 | |||
222 | dm_digtable->forbidden_igi = DM_DIG_MIN; | ||
223 | dm_digtable->large_fa_hit = 0; | ||
224 | dm_digtable->recover_cnt = 0; | ||
225 | dm_digtable->dig_min_0 = 0x25; | ||
226 | } | ||
227 | |||
228 | static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw) | 198 | static u8 rtl92c_dm_initial_gain_min_pwdb(struct ieee80211_hw *hw) |
229 | { | 199 | { |
230 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 200 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
@@ -508,27 +478,27 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw) | |||
508 | if (dm_digtable->rssi_val_min > 100) | 478 | if (dm_digtable->rssi_val_min > 100) |
509 | dm_digtable->rssi_val_min = 100; | 479 | dm_digtable->rssi_val_min = 100; |
510 | 480 | ||
511 | if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LowRssi) { | 481 | if (dm_digtable->pre_cck_pd_state == CCK_PD_STAGE_LOWRSSI) { |
512 | if (dm_digtable->rssi_val_min <= 25) | 482 | if (dm_digtable->rssi_val_min <= 25) |
513 | dm_digtable->cur_cck_pd_state = | 483 | dm_digtable->cur_cck_pd_state = |
514 | CCK_PD_STAGE_LowRssi; | 484 | CCK_PD_STAGE_LOWRSSI; |
515 | else | 485 | else |
516 | dm_digtable->cur_cck_pd_state = | 486 | dm_digtable->cur_cck_pd_state = |
517 | CCK_PD_STAGE_HighRssi; | 487 | CCK_PD_STAGE_HIGHRSSI; |
518 | } else { | 488 | } else { |
519 | if (dm_digtable->rssi_val_min <= 20) | 489 | if (dm_digtable->rssi_val_min <= 20) |
520 | dm_digtable->cur_cck_pd_state = | 490 | dm_digtable->cur_cck_pd_state = |
521 | CCK_PD_STAGE_LowRssi; | 491 | CCK_PD_STAGE_LOWRSSI; |
522 | else | 492 | else |
523 | dm_digtable->cur_cck_pd_state = | 493 | dm_digtable->cur_cck_pd_state = |
524 | CCK_PD_STAGE_HighRssi; | 494 | CCK_PD_STAGE_HIGHRSSI; |
525 | } | 495 | } |
526 | } else { | 496 | } else { |
527 | dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX; | 497 | dm_digtable->cur_cck_pd_state = CCK_PD_STAGE_MAX; |
528 | } | 498 | } |
529 | 499 | ||
530 | if (dm_digtable->pre_cck_pd_state != dm_digtable->cur_cck_pd_state) { | 500 | if (dm_digtable->pre_cck_pd_state != dm_digtable->cur_cck_pd_state) { |
531 | if ((dm_digtable->cur_cck_pd_state == CCK_PD_STAGE_LowRssi) || | 501 | if ((dm_digtable->cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI) || |
532 | (dm_digtable->cur_cck_pd_state == CCK_PD_STAGE_MAX)) | 502 | (dm_digtable->cur_cck_pd_state == CCK_PD_STAGE_MAX)) |
533 | rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0x83); | 503 | rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0x83); |
534 | else | 504 | else |
@@ -1375,7 +1345,7 @@ void rtl92c_dm_init(struct ieee80211_hw *hw) | |||
1375 | rtlpriv->dm.undec_sm_pwdb = -1; | 1345 | rtlpriv->dm.undec_sm_pwdb = -1; |
1376 | rtlpriv->dm.undec_sm_cck = -1; | 1346 | rtlpriv->dm.undec_sm_cck = -1; |
1377 | rtlpriv->dm.dm_initialgain_enable = true; | 1347 | rtlpriv->dm.dm_initialgain_enable = true; |
1378 | rtl92c_dm_diginit(hw); | 1348 | rtl_dm_diginit(hw, 0x20); |
1379 | 1349 | ||
1380 | rtlpriv->dm.dm_flag |= HAL_DM_HIPWR_DISABLE; | 1350 | rtlpriv->dm.dm_flag |= HAL_DM_HIPWR_DISABLE; |
1381 | rtl92c_dm_init_dynamic_txpower(hw); | 1351 | rtl92c_dm_init_dynamic_txpower(hw); |