mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2024-11-01 03:05:34 +00:00
Merge pull request #136 from mbuzdalov/realtek-4.4.x
Enable power management. Close #80
This commit is contained in:
commit
89a8c35a18
@ -462,7 +462,7 @@ void rtl8192e_init_dm_priv(IN PADAPTER Adapter)
|
||||
Init_ODM_ComInfo_8192e(Adapter);
|
||||
ODM_InitAllTimers(podmpriv);
|
||||
PHYDM_InitDebugSetting(podmpriv);
|
||||
|
||||
pHalData->CurrentTxPwrIdx = 20;
|
||||
}
|
||||
|
||||
void rtl8192e_deinit_dm_priv(IN PADAPTER Adapter)
|
||||
|
@ -503,17 +503,8 @@ PHY_GetTxPowerLevel8192E(
|
||||
OUT s32* powerlevel
|
||||
)
|
||||
{
|
||||
#if 0
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
|
||||
PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
|
||||
s4Byte TxPwrDbm = 13;
|
||||
RT_TRACE(COMP_TXAGC, DBG_LOUD, ("PHY_GetTxPowerLevel8192E(): TxPowerLevel: %#x\n", TxPwrDbm));
|
||||
|
||||
if ( pMgntInfo->ClientConfigPwrInDbm != UNSPECIFIED_PWR_DBM )
|
||||
*powerlevel = pMgntInfo->ClientConfigPwrInDbm;
|
||||
else
|
||||
*powerlevel = TxPwrDbm;
|
||||
#endif
|
||||
*powerlevel = pHalData->CurrentTxPwrIdx;
|
||||
}
|
||||
|
||||
VOID
|
||||
@ -697,11 +688,11 @@ PHY_GetTxPowerIndex_8192E(
|
||||
powerDiffByRate = powerDiffByRate > limit ? limit : powerDiffByRate;
|
||||
|
||||
txPower += powerDiffByRate;
|
||||
|
||||
txPower += tpt_offset;
|
||||
txPower += pHalData->CurrentTxPwrIdx - 20;
|
||||
if (txPower > RF6052_MAX_TX_PWR) txPower = RF6052_MAX_TX_PWR;
|
||||
if (txPower > MAX_POWER_INDEX) txPower = MAX_POWER_INDEX;
|
||||
|
||||
if(txPower > MAX_POWER_INDEX)
|
||||
txPower = MAX_POWER_INDEX;
|
||||
#if defined(DBG_TX_POWER_IDX)
|
||||
DBG_871X("Final Tx Power(RF-%c, Channel: %d) = %d(0x%X)\n\n", ((RFPath==0)?'A':'B'), Channel, txPower, txPower);
|
||||
#endif
|
||||
|
@ -402,6 +402,7 @@ typedef struct hal_com_data
|
||||
u8 CurrentOfdm24GTxPwrIdx;
|
||||
u8 CurrentBW2024GTxPwrIdx;
|
||||
u8 CurrentBW4024GTxPwrIdx;
|
||||
u8 CurrentTxPwrIdx;
|
||||
|
||||
// Read/write are allow for following hardware information variables
|
||||
u8 pwrGroupCnt;
|
||||
|
@ -46,6 +46,7 @@
|
||||
#endif /* Linux kernel >= 4.7.0 */
|
||||
|
||||
#include <rtw_wifi_regd.h>
|
||||
#include <hal_data.h>
|
||||
|
||||
#define RTW_MAX_MGMT_TX_CNT (8)
|
||||
#define RTW_MAX_MGMT_TX_MS_GAS (500)
|
||||
@ -3464,39 +3465,28 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy,
|
||||
struct wireless_dev *wdev,
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
enum nl80211_tx_power_setting type, int mbm)
|
||||
enum nl80211_tx_power_setting type,
|
||||
#else
|
||||
enum tx_power_setting type, int dbm)
|
||||
enum tx_power_setting type,
|
||||
#endif
|
||||
int value)
|
||||
{
|
||||
#if 0
|
||||
struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
|
||||
int ret;
|
||||
_adapter *padapter = wiphy_to_adapter(wiphy);
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
value /= 100;
|
||||
#endif
|
||||
|
||||
switch (type) {
|
||||
case NL80211_TX_POWER_AUTOMATIC:
|
||||
if (value < 0) value = 0;
|
||||
if (value > 20) value = 20;
|
||||
|
||||
if (type == NL80211_TX_POWER_FIXED) {
|
||||
pHalData->CurrentTxPwrIdx = value;
|
||||
rtw_hal_set_tx_power_level(padapter, pHalData->CurrentChannel);
|
||||
return 0;
|
||||
case NL80211_TX_POWER_FIXED:
|
||||
if (mbm < 0 || (mbm % 100))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!test_bit(IWM_STATUS_READY, &iwm->status))
|
||||
return 0;
|
||||
|
||||
ret = iwm_umac_set_config_fix(iwm, UMAC_PARAM_TBL_CFG_FIX,
|
||||
CFG_TX_PWR_LIMIT_USR,
|
||||
MBM_TO_DBM(mbm) * 2);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return iwm_tx_power_trigger(iwm);
|
||||
default:
|
||||
IWM_ERR(iwm, "Unsupported power type: %d\n", type);
|
||||
} else {
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
#endif
|
||||
DBG_8192C("%s\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
|
||||
@ -3505,10 +3495,9 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
|
||||
#endif
|
||||
int *dbm)
|
||||
{
|
||||
DBG_8192C("%s\n", __func__);
|
||||
|
||||
*dbm = (12);
|
||||
|
||||
_adapter *padapter = wiphy_to_adapter(wiphy);
|
||||
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
|
||||
*dbm = pHalData->CurrentTxPwrIdx;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user