Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / rtlwifi / rtl8192c / dm_common.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index b08b780..bb02327 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#include "dm_common.h"
+
 struct dig_t dm_digtable;
 static struct ps_t dm_pstable;
 
@@ -306,13 +308,13 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        long rssi_strength = rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
-       bool b_multi_sta = false;
+       bool multi_sta = false;
 
        if (mac->opmode == NL80211_IFTYPE_ADHOC)
-               b_multi_sta = true;
+               multi_sta = true;
 
-       if ((b_multi_sta == false) || (dm_digtable.cursta_connectctate !=
-                                      DIG_STA_DISCONNECT)) {
+       if ((multi_sta == false) || (dm_digtable.cursta_connectctate !=
+                                    DIG_STA_DISCONNECT)) {
                binitialized = false;
                dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
                return;
@@ -479,7 +481,7 @@ static void rtl92c_dm_dig(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-       if (rtlpriv->dm.b_dm_initialgain_enable == false)
+       if (rtlpriv->dm.dm_initialgain_enable == false)
                return;
        if (dm_digtable.dig_enable_flag == false)
                return;
@@ -492,7 +494,7 @@ static void rtl92c_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-       rtlpriv->dm.bdynamic_txpower_enable = false;
+       rtlpriv->dm.dynamic_txpower_enable = false;
 
        rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
        rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
@@ -517,6 +519,7 @@ void rtl92c_dm_write_dig(struct ieee80211_hw *hw)
                dm_digtable.pre_igvalue = dm_digtable.cur_igvalue;
        }
 }
+EXPORT_SYMBOL(rtl92c_dm_write_dig);
 
 static void rtl92c_dm_pwdb_monitor(struct ieee80211_hw *hw)
 {
@@ -550,10 +553,11 @@ static void rtl92c_dm_pwdb_monitor(struct ieee80211_hw *hw)
 void rtl92c_dm_init_edca_turbo(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
-       rtlpriv->dm.bcurrent_turbo_edca = false;
-       rtlpriv->dm.bis_any_nonbepkts = false;
-       rtlpriv->dm.bis_cur_rdlstate = false;
+       rtlpriv->dm.current_turbo_edca = false;
+       rtlpriv->dm.is_any_nonbepkts = false;
+       rtlpriv->dm.is_cur_rdlstate = false;
 }
+EXPORT_SYMBOL(rtl92c_dm_init_edca_turbo);
 
 static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
 {
@@ -570,7 +574,7 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
                goto dm_checkedcaturbo_exit;
 
        if (mac->link_state != MAC80211_LINKED) {
-               rtlpriv->dm.bcurrent_turbo_edca = false;
+               rtlpriv->dm.current_turbo_edca = false;
                return;
        }
 
@@ -582,40 +586,40 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
                        edca_be_dl |= 0x005e0000;
        }
 
-       if ((!rtlpriv->dm.bis_any_nonbepkts) &&
-           (!rtlpriv->dm.b_disable_framebursting)) {
+       if ((!rtlpriv->dm.is_any_nonbepkts) &&
+           (!rtlpriv->dm.disable_framebursting)) {
                cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
                cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
                if (cur_rxok_cnt > 4 * cur_txok_cnt) {
-                       if (!rtlpriv->dm.bis_cur_rdlstate ||
-                           !rtlpriv->dm.bcurrent_turbo_edca) {
+                       if (!rtlpriv->dm.is_cur_rdlstate ||
+                           !rtlpriv->dm.current_turbo_edca) {
                                rtl_write_dword(rtlpriv,
                                                REG_EDCA_BE_PARAM,
                                                edca_be_dl);
-                               rtlpriv->dm.bis_cur_rdlstate = true;
+                               rtlpriv->dm.is_cur_rdlstate = true;
                        }
                } else {
-                       if (rtlpriv->dm.bis_cur_rdlstate ||
-                           !rtlpriv->dm.bcurrent_turbo_edca) {
+                       if (rtlpriv->dm.is_cur_rdlstate ||
+                           !rtlpriv->dm.current_turbo_edca) {
                                rtl_write_dword(rtlpriv,
                                                REG_EDCA_BE_PARAM,
                                                edca_be_ul);
-                               rtlpriv->dm.bis_cur_rdlstate = false;
+                               rtlpriv->dm.is_cur_rdlstate = false;
                        }
                }
-               rtlpriv->dm.bcurrent_turbo_edca = true;
+               rtlpriv->dm.current_turbo_edca = true;
        } else {
-               if (rtlpriv->dm.bcurrent_turbo_edca) {
+               if (rtlpriv->dm.current_turbo_edca) {
                        u8 tmp = AC0_BE;
                        rtlpriv->cfg->ops->set_hw_reg(hw,
                                                      HW_VAR_AC_PARAM,
                                                      (u8 *) (&tmp));
-                       rtlpriv->dm.bcurrent_turbo_edca = false;
+                       rtlpriv->dm.current_turbo_edca = false;
                }
        }
 
 dm_checkedcaturbo_exit:
-       rtlpriv->dm.bis_any_nonbepkts = false;
+       rtlpriv->dm.is_any_nonbepkts = false;
        last_txok_cnt = rtlpriv->stats.txbytesunicast;
        last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
 }
@@ -636,7 +640,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
        u8 txpwr_level[2] = {0, 0};
        u8 ofdm_min_index = 6, rf;
 
-       rtlpriv->dm.btxpower_trackingInit = true;
+       rtlpriv->dm.txpower_trackingInit = true;
        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                 ("rtl92c_dm_txpower_tracking_callback_thermalmeter\n"));
 
@@ -696,7 +700,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                    rtl_get_bbreg(hw, RCCK0_TXFILTER2, MASKDWORD) & MASKCCK;
 
                for (i = 0; i < CCK_TABLE_LENGTH; i++) {
-                       if (rtlpriv->dm.b_cck_inch14) {
+                       if (rtlpriv->dm.cck_inch14) {
                                if (memcmp((void *)&temp_cck,
                                           (void *)&cckswing_table_ch14[i][2],
                                           4) == 0) {
@@ -708,7 +712,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                                  "cck_index=0x%x, ch 14 %d\n",
                                                  RCCK0_TXFILTER2, temp_cck,
                                                  cck_index_old,
-                                                 rtlpriv->dm.b_cck_inch14));
+                                                 rtlpriv->dm.cck_inch14));
                                        break;
                                }
                        } else {
@@ -724,7 +728,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                                  "cck_index=0x%x, ch14 %d\n",
                                                  RCCK0_TXFILTER2, temp_cck,
                                                  cck_index_old,
-                                                 rtlpriv->dm.b_cck_inch14));
+                                                 rtlpriv->dm.cck_inch14));
                                        break;
                                }
                        }
@@ -937,7 +941,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                              BIT(31) | BIT(29), 0x00);
                        }
 
-                       if (!rtlpriv->dm.b_cck_inch14) {
+                       if (!rtlpriv->dm.cck_inch14) {
                                rtl_write_byte(rtlpriv, 0xa22,
                                               cckswing_table_ch1ch13[cck_index]
                                               [0]);
@@ -1057,12 +1061,12 @@ static void rtl92c_dm_initialize_txpower_tracking_thermalmeter(
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-       rtlpriv->dm.btxpower_tracking = true;
-       rtlpriv->dm.btxpower_trackingInit = false;
+       rtlpriv->dm.txpower_tracking = true;
+       rtlpriv->dm.txpower_trackingInit = false;
 
        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                ("pMgntInfo->btxpower_tracking = %d\n",
-                 rtlpriv->dm.btxpower_tracking));
+                ("pMgntInfo->txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking));
 }
 
 static void rtl92c_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1081,7 +1085,7 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter(
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        static u8 tm_trigger;
 
-       if (!rtlpriv->dm.btxpower_tracking)
+       if (!rtlpriv->dm.txpower_tracking)
                return;
 
        if (!tm_trigger) {
@@ -1103,6 +1107,7 @@ void rtl92c_dm_check_txpower_tracking(struct ieee80211_hw *hw)
 {
        rtl92c_dm_check_txpower_tracking_thermal_meter(hw);
 }
+EXPORT_SYMBOL(rtl92c_dm_check_txpower_tracking);
 
 void rtl92c_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
 {
@@ -1113,11 +1118,12 @@ void rtl92c_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
        p_ra->pre_ratr_state = DM_RATR_STA_INIT;
 
        if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
-               rtlpriv->dm.b_useramask = true;
+               rtlpriv->dm.useramask = true;
        else
-               rtlpriv->dm.b_useramask = false;
+               rtlpriv->dm.useramask = false;
 
 }
+EXPORT_SYMBOL(rtl92c_dm_init_rate_adaptive_mask);
 
 static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 {
@@ -1133,7 +1139,7 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                return;
        }
 
-       if (!rtlpriv->dm.b_useramask) {
+       if (!rtlpriv->dm.useramask) {
                RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                        ("<---- driver does not control rate adaptive mask\n"));
                return;
@@ -1307,6 +1313,7 @@ void rtl92c_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal)
                dm_pstable.pre_rfstate = dm_pstable.cur_rfstate;
        }
 }
+EXPORT_SYMBOL(rtl92c_dm_rf_saving);
 
 static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
 {
@@ -1360,29 +1367,32 @@ void rtl92c_dm_init(struct ieee80211_hw *hw)
        rtl92c_dm_initialize_txpower_tracking(hw);
        rtl92c_dm_init_dynamic_bb_powersaving(hw);
 }
+EXPORT_SYMBOL(rtl92c_dm_init);
 
 void rtl92c_dm_watchdog(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       bool b_fw_current_inpsmode = false;
-       bool b_fw_ps_awake = true;
+       bool fw_current_inpsmode = false;
+       bool fw_ps_awake = true;
 
        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
-                                     (u8 *) (&b_fw_current_inpsmode));
+                                     (u8 *) (&fw_current_inpsmode));
        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
-                                     (u8 *) (&b_fw_ps_awake));
+                                     (u8 *) (&fw_ps_awake));
 
-       if ((ppsc->rfpwr_state == ERFON) && ((!b_fw_current_inpsmode) &&
-                                            b_fw_ps_awake)
+       if ((ppsc->rfpwr_state == ERFON) && ((!fw_current_inpsmode) &&
+                                            fw_ps_awake)
            && (!ppsc->rfchange_inprogress)) {
                rtl92c_dm_pwdb_monitor(hw);
                rtl92c_dm_dig(hw);
                rtl92c_dm_false_alarm_counter_statistics(hw);
                rtl92c_dm_dynamic_bb_powersaving(hw);
-               rtl92c_dm_dynamic_txpower(hw);
+               rtlpriv->cfg->ops->dm_dynamic_txpower(hw);
                rtl92c_dm_check_txpower_tracking(hw);
                rtl92c_dm_refresh_rate_adaptive_mask(hw);
                rtl92c_dm_check_edca_turbo(hw);
+
        }
 }
+EXPORT_SYMBOL(rtl92c_dm_watchdog);