Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 b448b0cc 编写于 作者: L Larry Finger 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: rtl8192e: Cleanup checkpatch -f errors - Part X 

With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.
Signed-off-by: NLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 cffa5bd9
隐藏空白更改
内联 并排
Showing with 1120 addition and 1367 deletion
drivers/staging/rtl8192e/rtl_dm.c
浏览文件 @ b448b0cc
...@@ -25,37 +25,37 @@ ...@@ -25,37 +25,37 @@
#include "r8192E_cmdpkt.h" #include "r8192E_cmdpkt.h"
/*---------------------------Define Local Constant---------------------------*/ /*---------------------------Define Local Constant---------------------------*/
static u32 edca_setting_DL[HT_IOT_PEER_MAX] = static u32 edca_setting_DL[HT_IOT_PEER_MAX] = {
{ 0x5e4322, 0x5e4322,
0x5e4322, 0x5e4322,
0x5ea44f, 0x5ea44f,
0x5e4322, 0x5e4322,
0x604322, 0x604322,
0xa44f, 0xa44f,
0x5e4322, 0x5e4322,
0x5e4332 0x5e4332
};
static u32 edca_setting_DL_GMode[HT_IOT_PEER_MAX] =
{ 0x5e4322,
0x5e4322,
0x5e4322,
0x5e4322,
0x604322,
0xa44f,
0x5e4322,
0x5e4322
}; };
static u32 edca_setting_UL[HT_IOT_PEER_MAX] = static u32 edca_setting_DL_GMode[HT_IOT_PEER_MAX] = {
{ 0x5e4322, 0x5e4322,
0xa44f, 0x5e4322,
0x5ea44f, 0x5e4322,
0x5e4322, 0x5e4322,
0x604322, 0x604322,
0x5e4322, 0xa44f,
0x5e4322, 0x5e4322,
0x5e4332 0x5e4322
};
static u32 edca_setting_UL[HT_IOT_PEER_MAX] = {
0x5e4322,
0xa44f,
0x5ea44f,
0x5e4322,
0x604322,
0x5e4322,
0x5e4322,
0x5e4332
}; };
#define RTK_UL_EDCA 0xa44f #define RTK_UL_EDCA 0xa44f
...@@ -65,7 +65,10 @@ static u32 edca_setting_UL[HT_IOT_PEER_MAX] = ...@@ -65,7 +65,10 @@ static u32 edca_setting_UL[HT_IOT_PEER_MAX] =
/*------------------------Define global variable-----------------------------*/ /*------------------------Define global variable-----------------------------*/
struct dig_t dm_digtable; struct dig_t dm_digtable;
u8 dm_shadow[16][256] = {{0}}; u8 dm_shadow[16][256] = {
{0}
};
struct drx_path_sel DM_RxPathSelTable; struct drx_path_sel DM_RxPathSelTable;
/*------------------------Define global variable-----------------------------*/ /*------------------------Define global variable-----------------------------*/
...@@ -74,46 +77,12 @@ struct drx_path_sel DM_RxPathSelTable; ...@@ -74,46 +77,12 @@ struct drx_path_sel DM_RxPathSelTable;
/*------------------------Define local variable------------------------------*/ /*------------------------Define local variable------------------------------*/
/*--------------------Define export function prototype-----------------------*/
extern void init_hal_dm(struct net_device *dev);
extern void deinit_hal_dm(struct net_device *dev);
extern void hal_dm_watchdog(struct net_device *dev);
extern void init_rate_adaptive(struct net_device *dev);
extern void dm_txpower_trackingcallback(void *data);
extern void dm_restore_dynamic_mechanism_state(struct net_device *dev);
extern void dm_backup_dynamic_mechanism_state(struct net_device *dev);
extern void dm_change_dynamic_initgain_thresh(struct net_device *dev,
u32 dm_type,
u32 dm_value);
extern void DM_ChangeFsyncSetting(struct net_device *dev,
s32 DM_Type,
s32 DM_Value);
extern void dm_force_tx_fw_info(struct net_device *dev,
u32 force_type,
u32 force_value);
extern void dm_init_edca_turbo(struct net_device *dev);
extern void dm_rf_operation_test_callback(unsigned long data);
extern void dm_rf_pathcheck_workitemcallback(void *data);
extern void dm_fsync_timer_callback(unsigned long data);
extern void dm_check_fsync(struct net_device *dev);
extern void dm_shadow_init(struct net_device *dev);
extern void dm_initialize_txpower_tracking(struct net_device *dev);
extern void dm_CheckRfCtrlGPIO(void *data);
/*--------------------Define export function prototype-----------------------*/
/*---------------------Define local function prototype-----------------------*/ /*---------------------Define local function prototype-----------------------*/
static void dm_check_rate_adaptive(struct net_device *dev); static void dm_check_rate_adaptive(struct net_device *dev);
static void dm_init_bandwidth_autoswitch (struct net_device *dev); static void dm_init_bandwidth_autoswitch(struct net_device *dev);
static void dm_bandwidth_autoswitch ( struct net_device *dev); static void dm_bandwidth_autoswitch(struct net_device *dev);
static void dm_check_txpower_tracking(struct net_device *dev); static void dm_check_txpower_tracking(struct net_device *dev);
...@@ -130,7 +99,7 @@ static void dm_bb_initialgain_backup(struct net_device *dev); ...@@ -130,7 +99,7 @@ static void dm_bb_initialgain_backup(struct net_device *dev);
static void dm_dig_init(struct net_device *dev); static void dm_dig_init(struct net_device *dev);
static void dm_ctrl_initgain_byrssi(struct net_device *dev); static void dm_ctrl_initgain_byrssi(struct net_device *dev);
static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev); static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev);
static void dm_ctrl_initgain_byrssi_by_driverrssi( struct net_device *dev); static void dm_ctrl_initgain_byrssi_by_driverrssi(struct net_device *dev);
static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(struct net_device *dev); static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(struct net_device *dev);
static void dm_initial_gain(struct net_device *dev); static void dm_initial_gain(struct net_device *dev);
static void dm_pd_th(struct net_device *dev); static void dm_pd_th(struct net_device *dev);
...@@ -179,14 +148,14 @@ init_hal_dm(struct net_device *dev) ...@@ -179,14 +148,14 @@ init_hal_dm(struct net_device *dev)
dm_dig_init(dev); dm_dig_init(dev);
dm_init_edca_turbo(dev); dm_init_edca_turbo(dev);
dm_init_bandwidth_autoswitch (dev); dm_init_bandwidth_autoswitch(dev);
dm_init_fsync(dev); dm_init_fsync(dev);
dm_init_rxpath_selection(dev); dm_init_rxpath_selection(dev);
dm_init_ctstoself(dev); dm_init_ctstoself(dev);
if (IS_HARDWARE_TYPE_8192SE(dev)) if (IS_HARDWARE_TYPE_8192SE(dev))
dm_Init_WA_Broadcom_IOT(dev); dm_Init_WA_Broadcom_IOT(dev);
INIT_DELAYED_WORK_RSL(&priv->gpio_change_rf_wq, (void *)dm_CheckRfCtrlGPIO,dev); INIT_DELAYED_WORK_RSL(&priv->gpio_change_rf_wq, (void *)dm_CheckRfCtrlGPIO, dev);
} }
extern void deinit_hal_dm(struct net_device *dev) extern void deinit_hal_dm(struct net_device *dev)
...@@ -213,7 +182,7 @@ extern void hal_dm_watchdog(struct net_device *dev) ...@@ -213,7 +182,7 @@ extern void hal_dm_watchdog(struct net_device *dev)
dm_check_txpower_tracking(dev); dm_check_txpower_tracking(dev);
dm_ctrl_initgain_byrssi(dev); dm_ctrl_initgain_byrssi(dev);
dm_bandwidth_autoswitch (dev); dm_bandwidth_autoswitch(dev);
dm_check_rx_path_selection(dev); dm_check_rx_path_selection(dev);
dm_check_fsync(dev); dm_check_fsync(dev);
...@@ -226,28 +195,27 @@ void dm_check_ac_dc_power(struct net_device *dev) ...@@ -226,28 +195,27 @@ void dm_check_ac_dc_power(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static char *ac_dc_check_script_path = "/etc/acpi/wireless-rtl-ac-dc-power.sh"; static char *ac_dc_check_script_path = "/etc/acpi/wireless-rtl-ac-dc-power.sh";
char *argv[] = {ac_dc_check_script_path,DRV_NAME,NULL}; char *argv[] = {ac_dc_check_script_path, DRV_NAME, NULL};
static char *envp[] = {"HOME=/", static char *envp[] = {"HOME=/",
"TERM=linux", "TERM=linux",
"PATH=/usr/bin:/bin", "PATH=/usr/bin:/bin",
NULL}; NULL};
if (priv->ResetProgress == RESET_TYPE_SILENT) if (priv->ResetProgress == RESET_TYPE_SILENT) {
{ RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF),
RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF), "GPIOChangeRFWorkItemCallBack(): Silent Reseting!!!!!!!\n"); "GPIOChangeRFWorkItemCallBack(): Silent Reseting!!!!!!!\n");
return; return;
} }
if (priv->rtllib->state != RTLLIB_LINKED) { if (priv->rtllib->state != RTLLIB_LINKED)
return; return;
} call_usermodehelper(ac_dc_check_script_path, argv, envp, 1);
call_usermodehelper(ac_dc_check_script_path,argv,envp,1);
return; return;
}; };
extern void init_rate_adaptive(struct net_device * dev) extern void init_rate_adaptive(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -269,17 +237,14 @@ extern void init_rate_adaptive(struct net_device * dev) ...@@ -269,17 +237,14 @@ extern void init_rate_adaptive(struct net_device * dev)
pra->ping_rssi_thresh_for_ra = 15; pra->ping_rssi_thresh_for_ra = 15;
if (priv->rf_type == RF_2T4R) if (priv->rf_type == RF_2T4R) {
{
pra->upper_rssi_threshold_ratr = 0x8f0f0000; pra->upper_rssi_threshold_ratr = 0x8f0f0000;
pra->middle_rssi_threshold_ratr = 0x8f0ff000; pra->middle_rssi_threshold_ratr = 0x8f0ff000;
pra->low_rssi_threshold_ratr = 0x8f0ff001; pra->low_rssi_threshold_ratr = 0x8f0ff001;
pra->low_rssi_threshold_ratr_40M = 0x8f0ff005; pra->low_rssi_threshold_ratr_40M = 0x8f0ff005;
pra->low_rssi_threshold_ratr_20M = 0x8f0ff001; pra->low_rssi_threshold_ratr_20M = 0x8f0ff001;
pra->ping_rssi_ratr = 0x0000000d; pra->ping_rssi_ratr = 0x0000000d;
} } else if (priv->rf_type == RF_1T2R) {
else if (priv->rf_type == RF_1T2R)
{
pra->upper_rssi_threshold_ratr = 0x000fc000; pra->upper_rssi_threshold_ratr = 0x000fc000;
pra->middle_rssi_threshold_ratr = 0x000ff000; pra->middle_rssi_threshold_ratr = 0x000ff000;
pra->low_rssi_threshold_ratr = 0x000ff001; pra->low_rssi_threshold_ratr = 0x000ff001;
...@@ -291,17 +256,17 @@ extern void init_rate_adaptive(struct net_device * dev) ...@@ -291,17 +256,17 @@ extern void init_rate_adaptive(struct net_device * dev)
} }
static void dm_check_rate_adaptive(struct net_device * dev) static void dm_check_rate_adaptive(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo; struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;
struct rate_adaptive *pra = (struct rate_adaptive *)&priv->rate_adaptive; struct rate_adaptive *pra = (struct rate_adaptive *)&priv->rate_adaptive;
u32 currentRATR, targetRATR = 0; u32 currentRATR, targetRATR = 0;
u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0; u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
bool bshort_gi_enabled = false; bool bshort_gi_enabled = false;
static u8 ping_rssi_state=0; static u8 ping_rssi_state;
if (IS_NIC_DOWN(priv)){ if (IS_NIC_DOWN(priv)) {
RT_TRACE(COMP_RATE, "<---- dm_check_rate_adaptive(): driver is going to unload\n"); RT_TRACE(COMP_RATE, "<---- dm_check_rate_adaptive(): driver is going to unload\n");
return; return;
} }
...@@ -309,83 +274,66 @@ static void dm_check_rate_adaptive(struct net_device * dev) ...@@ -309,83 +274,66 @@ static void dm_check_rate_adaptive(struct net_device * dev)
if (pra->rate_adaptive_disabled) if (pra->rate_adaptive_disabled)
return; return;
if ( !(priv->rtllib->mode == WIRELESS_MODE_N_24G || if (!(priv->rtllib->mode == WIRELESS_MODE_N_24G ||
priv->rtllib->mode == WIRELESS_MODE_N_5G)) priv->rtllib->mode == WIRELESS_MODE_N_5G))
return; return;
if ( priv->rtllib->state == RTLLIB_LINKED ) if (priv->rtllib->state == RTLLIB_LINKED) {
{
bshort_gi_enabled = (pHTInfo->bCurTxBW40MHz && pHTInfo->bCurShortGI40MHz) || bshort_gi_enabled = (pHTInfo->bCurTxBW40MHz && pHTInfo->bCurShortGI40MHz) ||
(!pHTInfo->bCurTxBW40MHz && pHTInfo->bCurShortGI20MHz); (!pHTInfo->bCurTxBW40MHz && pHTInfo->bCurShortGI20MHz);
pra->upper_rssi_threshold_ratr = pra->upper_rssi_threshold_ratr =
(pra->upper_rssi_threshold_ratr & (~BIT31)) | ((bshort_gi_enabled)? BIT31:0) ; (pra->upper_rssi_threshold_ratr & (~BIT31)) | ((bshort_gi_enabled) ? BIT31 : 0);
pra->middle_rssi_threshold_ratr = pra->middle_rssi_threshold_ratr =
(pra->middle_rssi_threshold_ratr & (~BIT31)) | ((bshort_gi_enabled)? BIT31:0) ; (pra->middle_rssi_threshold_ratr & (~BIT31)) | ((bshort_gi_enabled) ? BIT31 : 0);
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) {
{
pra->low_rssi_threshold_ratr = pra->low_rssi_threshold_ratr =
(pra->low_rssi_threshold_ratr_40M & (~BIT31)) | ((bshort_gi_enabled)? BIT31:0) ; (pra->low_rssi_threshold_ratr_40M & (~BIT31)) | ((bshort_gi_enabled) ? BIT31 : 0);
} } else {
else
{
pra->low_rssi_threshold_ratr = pra->low_rssi_threshold_ratr =
(pra->low_rssi_threshold_ratr_20M & (~BIT31)) | ((bshort_gi_enabled)? BIT31:0) ; (pra->low_rssi_threshold_ratr_20M & (~BIT31)) | ((bshort_gi_enabled) ? BIT31 : 0);
} }
pra->ping_rssi_ratr = pra->ping_rssi_ratr =
(pra->ping_rssi_ratr & (~BIT31)) | ((bshort_gi_enabled)? BIT31:0) ; (pra->ping_rssi_ratr & (~BIT31)) | ((bshort_gi_enabled) ? BIT31 : 0);
if (pra->ratr_state == DM_RATR_STA_HIGH) if (pra->ratr_state == DM_RATR_STA_HIGH) {
{
HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra; HighRSSIThreshForRA = pra->high2low_rssi_thresh_for_ra;
LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)? LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
(pra->low_rssi_thresh_for_ra40M):(pra->low_rssi_thresh_for_ra20M); (pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
} } else if (pra->ratr_state == DM_RATR_STA_LOW) {
else if (pra->ratr_state == DM_RATR_STA_LOW)
{
HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra; HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)? LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
(pra->low2high_rssi_thresh_for_ra40M):(pra->low2high_rssi_thresh_for_ra20M); (pra->low2high_rssi_thresh_for_ra40M) : (pra->low2high_rssi_thresh_for_ra20M);
} } else {
else
{
HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra; HighRSSIThreshForRA = pra->high_rssi_thresh_for_ra;
LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)? LowRSSIThreshForRA = (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) ?
(pra->low_rssi_thresh_for_ra40M):(pra->low_rssi_thresh_for_ra20M); (pra->low_rssi_thresh_for_ra40M) : (pra->low_rssi_thresh_for_ra20M);
} }
if (priv->undecorated_smoothed_pwdb >= (long)HighRSSIThreshForRA) if (priv->undecorated_smoothed_pwdb >= (long)HighRSSIThreshForRA) {
{
pra->ratr_state = DM_RATR_STA_HIGH; pra->ratr_state = DM_RATR_STA_HIGH;
targetRATR = pra->upper_rssi_threshold_ratr; targetRATR = pra->upper_rssi_threshold_ratr;
}else if (priv->undecorated_smoothed_pwdb >= (long)LowRSSIThreshForRA) } else if (priv->undecorated_smoothed_pwdb >= (long)LowRSSIThreshForRA) {
{
pra->ratr_state = DM_RATR_STA_MIDDLE; pra->ratr_state = DM_RATR_STA_MIDDLE;
targetRATR = pra->middle_rssi_threshold_ratr; targetRATR = pra->middle_rssi_threshold_ratr;
}else } else {
{
pra->ratr_state = DM_RATR_STA_LOW; pra->ratr_state = DM_RATR_STA_LOW;
targetRATR = pra->low_rssi_threshold_ratr; targetRATR = pra->low_rssi_threshold_ratr;
} }
if (pra->ping_rssi_enable) if (pra->ping_rssi_enable) {
{ if (priv->undecorated_smoothed_pwdb < (long)(pra->ping_rssi_thresh_for_ra+5)) {
if (priv->undecorated_smoothed_pwdb < (long)(pra->ping_rssi_thresh_for_ra+5)) if ((priv->undecorated_smoothed_pwdb < (long)pra->ping_rssi_thresh_for_ra) ||
{ ping_rssi_state) {
if ( (priv->undecorated_smoothed_pwdb < (long)pra->ping_rssi_thresh_for_ra) ||
ping_rssi_state )
{
pra->ratr_state = DM_RATR_STA_LOW; pra->ratr_state = DM_RATR_STA_LOW;
targetRATR = pra->ping_rssi_ratr; targetRATR = pra->ping_rssi_ratr;
ping_rssi_state = 1; ping_rssi_state = 1;
} }
} } else {
else
{
ping_rssi_state = 0; ping_rssi_state = 0;
} }
} }
...@@ -394,30 +342,26 @@ static void dm_check_rate_adaptive(struct net_device * dev) ...@@ -394,30 +342,26 @@ static void dm_check_rate_adaptive(struct net_device * dev)
targetRATR &= 0xf00fffff; targetRATR &= 0xf00fffff;
currentRATR = read_nic_dword(dev, RATR0); currentRATR = read_nic_dword(dev, RATR0);
if ( targetRATR != currentRATR ) if (targetRATR != currentRATR) {
{
u32 ratr_value; u32 ratr_value;
ratr_value = targetRATR; ratr_value = targetRATR;
RT_TRACE(COMP_RATE,"currentRATR = %x, targetRATR = %x\n", currentRATR, targetRATR); RT_TRACE(COMP_RATE,
"currentRATR = %x, targetRATR = %x\n",
currentRATR, targetRATR);
if (priv->rf_type == RF_1T2R) if (priv->rf_type == RF_1T2R)
{
ratr_value &= ~(RATE_ALL_OFDM_2SS); ratr_value &= ~(RATE_ALL_OFDM_2SS);
}
write_nic_dword(dev, RATR0, ratr_value); write_nic_dword(dev, RATR0, ratr_value);
write_nic_byte(dev, UFWP, 1); write_nic_byte(dev, UFWP, 1);
pra->last_ratr = targetRATR; pra->last_ratr = targetRATR;
} }
} } else {
else
{
pra->ratr_state = DM_RATR_STA_MAX; pra->ratr_state = DM_RATR_STA_MAX;
} }
} }
static void dm_init_bandwidth_autoswitch (struct net_device * dev) static void dm_init_bandwidth_autoswitch(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -425,22 +369,23 @@ static void dm_init_bandwidth_autoswitch (struct net_device * dev) ...@@ -425,22 +369,23 @@ static void dm_init_bandwidth_autoswitch (struct net_device * dev)
priv->rtllib->bandwidth_auto_switch.threshold_40Mhzto20Mhz = BW_AUTO_SWITCH_HIGH_LOW; priv->rtllib->bandwidth_auto_switch.threshold_40Mhzto20Mhz = BW_AUTO_SWITCH_HIGH_LOW;
priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = false; priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = false;
priv->rtllib->bandwidth_auto_switch.bautoswitch_enable = false; priv->rtllib->bandwidth_auto_switch.bautoswitch_enable = false;
} }
static void dm_bandwidth_autoswitch(struct net_device *dev)
static void dm_bandwidth_autoswitch (struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ||!priv->rtllib->bandwidth_auto_switch.bautoswitch_enable){ if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ||
!priv->rtllib->bandwidth_auto_switch.bautoswitch_enable) {
return; return;
}else{ } else {
if (priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz == false){ if (priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz == false) {
if (priv->undecorated_smoothed_pwdb <= priv->rtllib->bandwidth_auto_switch.threshold_40Mhzto20Mhz) if (priv->undecorated_smoothed_pwdb <=
priv->rtllib->bandwidth_auto_switch.threshold_40Mhzto20Mhz)
priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = true; priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = true;
}else{ } else {
if (priv->undecorated_smoothed_pwdb >= priv->rtllib->bandwidth_auto_switch.threshold_20Mhzto40Mhz) if (priv->undecorated_smoothed_pwdb >=
priv->rtllib->bandwidth_auto_switch.threshold_20Mhzto40Mhz)
priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = false; priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = false;
} }
...@@ -468,6 +413,7 @@ static u32 OFDMSwingTable[OFDM_Table_Length] = { ...@@ -468,6 +413,7 @@ static u32 OFDMSwingTable[OFDM_Table_Length] = {
0x12000048, 0x12000048,
0x10000040 0x10000040
}; };
static u8 CCKSwingTable_Ch1_Ch13[CCK_Table_length][8] = { static u8 CCKSwingTable_Ch1_Ch13[CCK_Table_length][8] = {
{0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04}, {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04},
{0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03},
...@@ -497,25 +443,27 @@ static u8 CCKSwingTable_Ch14[CCK_Table_length][8] = { ...@@ -497,25 +443,27 @@ static u8 CCKSwingTable_Ch14[CCK_Table_length][8] = {
{0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00}, {0x11, 0x11, 0x0f, 0x09, 0x00, 0x00, 0x00, 0x00},
{0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00} {0x0f, 0x0f, 0x0d, 0x08, 0x00, 0x00, 0x00, 0x00}
}; };
#define Pw_Track_Flag 0x11d #define Pw_Track_Flag 0x11d
#define Tssi_Mea_Value 0x13c #define Tssi_Mea_Value 0x13c
#define Tssi_Report_Value1 0x134 #define Tssi_Report_Value1 0x134
#define Tssi_Report_Value2 0x13e #define Tssi_Report_Value2 0x13e
#define FW_Busy_Flag 0x13f #define FW_Busy_Flag 0x13f
static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev) static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
bool bHighpowerstate, viviflag = false; bool bHighpowerstate, viviflag = false;
struct dcmd_txcmd tx_cmd; struct dcmd_txcmd tx_cmd;
u8 powerlevelOFDM24G; u8 powerlevelOFDM24G;
int i =0, j = 0, k = 0; int i = 0, j = 0, k = 0;
u8 RF_Type, tmp_report[5]={0, 0, 0, 0, 0}; u8 RF_Type, tmp_report[5] = {0, 0, 0, 0, 0};
u32 Value; u32 Value;
u8 Pwr_Flag; u8 Pwr_Flag;
u16 Avg_TSSI_Meas, TSSI_13dBm, Avg_TSSI_Meas_from_driver=0; u16 Avg_TSSI_Meas, TSSI_13dBm, Avg_TSSI_Meas_from_driver = 0;
u32 delta=0; u32 delta = 0;
RT_TRACE(COMP_POWER_TRACKING,"%s()\n",__func__);
RT_TRACE(COMP_POWER_TRACKING, "%s()\n", __func__);
write_nic_byte(dev, Pw_Track_Flag, 0); write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0); write_nic_byte(dev, FW_Busy_Flag, 0);
priv->rtllib->bdynamic_txpower_enable = false; priv->rtllib->bdynamic_txpower_enable = false;
...@@ -525,305 +473,312 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev) ...@@ -525,305 +473,312 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev)
RF_Type = priv->rf_type; RF_Type = priv->rf_type;
Value = (RF_Type<<8) | powerlevelOFDM24G; Value = (RF_Type<<8) | powerlevelOFDM24G;
RT_TRACE(COMP_POWER_TRACKING, "powerlevelOFDM24G = %x\n", powerlevelOFDM24G); RT_TRACE(COMP_POWER_TRACKING, "powerlevelOFDM24G = %x\n",
powerlevelOFDM24G);
for (j = 0; j<=30; j++) for (j = 0; j <= 30; j++) {
{
tx_cmd.Op = TXCMD_SET_TX_PWR_TRACKING; tx_cmd.Op = TXCMD_SET_TX_PWR_TRACKING;
tx_cmd.Length = 4; tx_cmd.Length = 4;
tx_cmd.Value = Value; tx_cmd.Value = Value;
cmpk_message_handle_tx(dev, (u8*)&tx_cmd, DESC_PACKET_TYPE_INIT, sizeof(struct dcmd_txcmd)); cmpk_message_handle_tx(dev, (u8 *)&tx_cmd,
mdelay(1); DESC_PACKET_TYPE_INIT,
for (i = 0;i <= 30; i++) sizeof(struct dcmd_txcmd));
{ mdelay(1);
Pwr_Flag = read_nic_byte(dev, Pw_Track_Flag); for (i = 0; i <= 30; i++) {
Pwr_Flag = read_nic_byte(dev, Pw_Track_Flag);
if (Pwr_Flag == 0) if (Pwr_Flag == 0) {
{ mdelay(1);
mdelay(1);
if (priv->bResetInProgress) if (priv->bResetInProgress) {
{ RT_TRACE(COMP_POWER_TRACKING,
RT_TRACE(COMP_POWER_TRACKING, "we are in slient reset progress, so return\n"); "we are in slient reset progress, so return\n");
write_nic_byte(dev, Pw_Track_Flag, 0); write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0); write_nic_byte(dev, FW_Busy_Flag, 0);
return; return;
}
if ((priv->rtllib->eRFPowerState != eRfOn)) {
RT_TRACE(COMP_POWER_TRACKING,
"we are in power save, so return\n");
write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0);
return;
}
continue;
} }
if ((priv->rtllib->eRFPowerState != eRfOn))
{ Avg_TSSI_Meas = read_nic_word(dev, Tssi_Mea_Value);
RT_TRACE(COMP_POWER_TRACKING, "we are in power save, so return\n");
if (Avg_TSSI_Meas == 0) {
write_nic_byte(dev, Pw_Track_Flag, 0); write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0); write_nic_byte(dev, FW_Busy_Flag, 0);
return; return;
} }
continue; for (k = 0; k < 5; k++) {
} if (k != 4)
tmp_report[k] = read_nic_byte(dev,
Avg_TSSI_Meas = read_nic_word(dev, Tssi_Mea_Value); Tssi_Report_Value1+k);
else
if (Avg_TSSI_Meas == 0) tmp_report[k] = read_nic_byte(dev,
{ Tssi_Report_Value2);
write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0);
return;
}
for (k = 0;k < 5; k++) RT_TRACE(COMP_POWER_TRACKING,
{ "TSSI_report_value = %d\n",
if (k !=4) tmp_report[k]);
tmp_report[k] = read_nic_byte(dev, Tssi_Report_Value1+k);
else
tmp_report[k] = read_nic_byte(dev, Tssi_Report_Value2);
RT_TRACE(COMP_POWER_TRACKING, "TSSI_report_value = %d\n", tmp_report[k]); if (tmp_report[k] <= 20) {
viviflag = true;
break;
}
}
{ if (viviflag == true) {
if (tmp_report[k] <= 20) write_nic_byte(dev, Pw_Track_Flag, 0);
{ viviflag = false;
viviflag =true; RT_TRACE(COMP_POWER_TRACKING, "we filted this data\n");
break; for (k = 0; k < 5; k++)
} tmp_report[k] = 0;
} break;
} }
if (viviflag ==true) for (k = 0; k < 5; k++)
{ Avg_TSSI_Meas_from_driver += tmp_report[k];
write_nic_byte(dev, Pw_Track_Flag, 0);
viviflag = false;
RT_TRACE(COMP_POWER_TRACKING, "we filted this data\n");
for (k = 0;k < 5; k++)
tmp_report[k] = 0;
break;
}
for (k = 0;k < 5; k++) Avg_TSSI_Meas_from_driver = Avg_TSSI_Meas_from_driver*100/5;
{ RT_TRACE(COMP_POWER_TRACKING,
Avg_TSSI_Meas_from_driver += tmp_report[k]; "Avg_TSSI_Meas_from_driver = %d\n",
} Avg_TSSI_Meas_from_driver);
TSSI_13dBm = priv->TSSI_13dBm;
RT_TRACE(COMP_POWER_TRACKING, "TSSI_13dBm = %d\n", TSSI_13dBm);
Avg_TSSI_Meas_from_driver = Avg_TSSI_Meas_from_driver*100/5; if (Avg_TSSI_Meas_from_driver > TSSI_13dBm)
RT_TRACE(COMP_POWER_TRACKING, "Avg_TSSI_Meas_from_driver = %d\n", Avg_TSSI_Meas_from_driver); delta = Avg_TSSI_Meas_from_driver - TSSI_13dBm;
TSSI_13dBm = priv->TSSI_13dBm; else
RT_TRACE(COMP_POWER_TRACKING, "TSSI_13dBm = %d\n", TSSI_13dBm); delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver;
if (Avg_TSSI_Meas_from_driver > TSSI_13dBm) if (delta <= E_FOR_TX_POWER_TRACK) {
delta = Avg_TSSI_Meas_from_driver - TSSI_13dBm; priv->rtllib->bdynamic_txpower_enable = true;
else write_nic_byte(dev, Pw_Track_Flag, 0);
delta = TSSI_13dBm - Avg_TSSI_Meas_from_driver; write_nic_byte(dev, FW_Busy_Flag, 0);
RT_TRACE(COMP_POWER_TRACKING,
"tx power track is done\n");
RT_TRACE(COMP_POWER_TRACKING,
"priv->rfa_txpowertrackingindex = %d\n",
priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING,
"priv->rfa_txpowertrackingindex_real = %d\n",
priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation_difference = %d\n",
priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation = %d\n",
priv->CCKPresentAttentuation);
return;
} else {
if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) {
if (RF_Type == RF_2T4R) {
if ((priv->rfa_txpowertrackingindex > 0) &&
(priv->rfc_txpowertrackingindex > 0)) {
priv->rfa_txpowertrackingindex--;
if (priv->rfa_txpowertrackingindex_real > 4) {
priv->rfa_txpowertrackingindex_real--;
rtl8192_setBBreg(dev,
rOFDM0_XATxIQImbalance,
bMaskDWord,
priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
}
if (delta <= E_FOR_TX_POWER_TRACK) priv->rfc_txpowertrackingindex--;
{ if (priv->rfc_txpowertrackingindex_real > 4) {
priv->rtllib->bdynamic_txpower_enable = true; priv->rfc_txpowertrackingindex_real--;
write_nic_byte(dev, Pw_Track_Flag, 0); rtl8192_setBBreg(dev,
write_nic_byte(dev, FW_Busy_Flag, 0); rOFDM0_XCTxIQImbalance,
RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n"); bMaskDWord,
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex); priv->txbbgain_table[priv->rfc_txpowertrackingindex_real].txbbgain_value);
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real = %d\n", priv->rfa_txpowertrackingindex_real); }
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_difference = %d\n", priv->CCKPresentAttentuation_difference); } else {
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation = %d\n", priv->CCKPresentAttentuation); rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance,
return; bMaskDWord,
} priv->txbbgain_table[4].txbbgain_value);
else rtl8192_setBBreg(dev,
{ rOFDM0_XCTxIQImbalance,
if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) bMaskDWord, priv->txbbgain_table[4].txbbgain_value);
{ }
if (RF_Type == RF_2T4R) } else {
{ if (priv->rfa_txpowertrackingindex > 0) {
priv->rfa_txpowertrackingindex--;
if ((priv->rfa_txpowertrackingindex > 0) &&(priv->rfc_txpowertrackingindex > 0)) if (priv->rfa_txpowertrackingindex_real > 4) {
{ priv->rfa_txpowertrackingindex_real--;
priv->rfa_txpowertrackingindex--; rtl8192_setBBreg(dev,
if (priv->rfa_txpowertrackingindex_real > 4) rOFDM0_XATxIQImbalance,
{ bMaskDWord,
priv->rfa_txpowertrackingindex_real--; priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value); }
} } else
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance,
bMaskDWord, priv->txbbgain_table[4].txbbgain_value);
priv->rfc_txpowertrackingindex--;
if (priv->rfc_txpowertrackingindex_real > 4)
{
priv->rfc_txpowertrackingindex_real--;
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfc_txpowertrackingindex_real].txbbgain_value);
} }
} else {
if (RF_Type == RF_2T4R) {
if ((priv->rfa_txpowertrackingindex <
TxBBGainTableLength - 1) &&
(priv->rfc_txpowertrackingindex <
TxBBGainTableLength - 1)) {
priv->rfa_txpowertrackingindex++;
priv->rfa_txpowertrackingindex_real++;
rtl8192_setBBreg(dev,
rOFDM0_XATxIQImbalance,
bMaskDWord,
priv->txbbgain_table
[priv->rfa_txpowertrackingindex_real].txbbgain_value);
priv->rfc_txpowertrackingindex++;
priv->rfc_txpowertrackingindex_real++;
rtl8192_setBBreg(dev,
rOFDM0_XCTxIQImbalance,
bMaskDWord,
priv->txbbgain_table[priv->rfc_txpowertrackingindex_real].txbbgain_value);
} else {
rtl8192_setBBreg(dev,
rOFDM0_XATxIQImbalance,
bMaskDWord,
priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
rtl8192_setBBreg(dev,
rOFDM0_XCTxIQImbalance,
bMaskDWord, priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
} }
else } else {
{ if (priv->rfa_txpowertrackingindex < (TxBBGainTableLength - 1)) {
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[4].txbbgain_value); priv->rfa_txpowertrackingindex++;
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[4].txbbgain_value); priv->rfa_txpowertrackingindex_real++;
} rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance,
} bMaskDWord,
else priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
{ } else
{ rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance,
{ bMaskDWord,
if (priv->rfa_txpowertrackingindex > 0) priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
{
priv->rfa_txpowertrackingindex--;
if (priv->rfa_txpowertrackingindex_real > 4)
{
priv->rfa_txpowertrackingindex_real--;
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
}
}
else
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[4].txbbgain_value);
}
}
}
}
else
{
if (RF_Type == RF_2T4R)
{
if ((priv->rfa_txpowertrackingindex < TxBBGainTableLength - 1) &&(priv->rfc_txpowertrackingindex < TxBBGainTableLength - 1))
{
priv->rfa_txpowertrackingindex++;
priv->rfa_txpowertrackingindex_real++;
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
priv->rfc_txpowertrackingindex++;
priv->rfc_txpowertrackingindex_real++;
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfc_txpowertrackingindex_real].txbbgain_value);
}
else
{
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
}
}
else
{
{
{
if (priv->rfa_txpowertrackingindex < (TxBBGainTableLength - 1))
{
priv->rfa_txpowertrackingindex++;
priv->rfa_txpowertrackingindex_real++;
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfa_txpowertrackingindex_real].txbbgain_value);
}
else
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[TxBBGainTableLength - 1].txbbgain_value);
}
} }
} }
} if (RF_Type == RF_2T4R) {
if (RF_Type == RF_2T4R){ priv->CCKPresentAttentuation_difference
priv->CCKPresentAttentuation_difference = priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default;
= priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default; } else {
}else{ priv->CCKPresentAttentuation_difference
{ = priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
priv->CCKPresentAttentuation_difference
= priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
} }
}
if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
priv->CCKPresentAttentuation priv->CCKPresentAttentuation =
= priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference; priv->CCKPresentAttentuation_20Mdefault +
else priv->CCKPresentAttentuation_difference;
priv->CCKPresentAttentuation else
= priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; priv->CCKPresentAttentuation =
priv->CCKPresentAttentuation_40Mdefault +
priv->CCKPresentAttentuation_difference;
if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1)) if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1))
priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1; priv->CCKPresentAttentuation = CCKTxBBGainTableLength-1;
if (priv->CCKPresentAttentuation < 0) if (priv->CCKPresentAttentuation < 0)
priv->CCKPresentAttentuation = 0; priv->CCKPresentAttentuation = 0;
if (priv->CCKPresentAttentuation > -1&&priv->CCKPresentAttentuation < CCKTxBBGainTableLength) if (priv->CCKPresentAttentuation > -1 &&
{ priv->CCKPresentAttentuation < CCKTxBBGainTableLength) {
if (priv->rtllib->current_network.channel == 14 && !priv->bcck_in_ch14) if (priv->rtllib->current_network.channel == 14 &&
{ !priv->bcck_in_ch14) {
priv->bcck_in_ch14 = true; priv->bcck_in_ch14 = true;
dm_cck_txpower_adjust(dev,priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) {
priv->bcck_in_ch14 = false;
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} else
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} }
else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) RT_TRACE(COMP_POWER_TRACKING,
{ "priv->rfa_txpowertrackingindex = %d\n",
priv->bcck_in_ch14 = false; priv->rfa_txpowertrackingindex);
dm_cck_txpower_adjust(dev,priv->bcck_in_ch14); RT_TRACE(COMP_POWER_TRACKING,
"priv->rfa_txpowertrackingindex_real = %d\n",
priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation_difference = %d\n",
priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING,
"priv->CCKPresentAttentuation = %d\n",
priv->CCKPresentAttentuation);
if (priv->CCKPresentAttentuation_difference <= -12 || priv->CCKPresentAttentuation_difference >= 24) {
priv->rtllib->bdynamic_txpower_enable = true;
write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0);
RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
return;
} }
else
dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);
} }
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real = %d\n", priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_difference = %d\n", priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation = %d\n", priv->CCKPresentAttentuation);
if (priv->CCKPresentAttentuation_difference <= -12||priv->CCKPresentAttentuation_difference >= 24)
{
priv->rtllib->bdynamic_txpower_enable = true;
write_nic_byte(dev, Pw_Track_Flag, 0); write_nic_byte(dev, Pw_Track_Flag, 0);
write_nic_byte(dev, FW_Busy_Flag, 0); Avg_TSSI_Meas_from_driver = 0;
RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n"); for (k = 0; k < 5; k++)
return; tmp_report[k] = 0;
break;
} }
write_nic_byte(dev, FW_Busy_Flag, 0);
}
write_nic_byte(dev, Pw_Track_Flag, 0);
Avg_TSSI_Meas_from_driver = 0;
for (k = 0;k < 5; k++)
tmp_report[k] = 0;
break;
} }
write_nic_byte(dev, FW_Busy_Flag, 0); priv->rtllib->bdynamic_txpower_enable = true;
} write_nic_byte(dev, Pw_Track_Flag, 0);
priv->rtllib->bdynamic_txpower_enable = true;
write_nic_byte(dev, Pw_Track_Flag, 0);
} }
static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
{ {
#define ThermalMeterVal 9 #define ThermalMeterVal 9
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 tmpRegA, TempCCk; u32 tmpRegA, TempCCk;
u8 tmpOFDMindex, tmpCCKindex, tmpCCK20Mindex, tmpCCK40Mindex, tmpval; u8 tmpOFDMindex, tmpCCKindex, tmpCCK20Mindex, tmpCCK40Mindex, tmpval;
int i =0, CCKSwingNeedUpdate=0; int i = 0, CCKSwingNeedUpdate = 0;
if (!priv->btxpower_trackingInit) if (!priv->btxpower_trackingInit) {
{ tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord);
tmpRegA= rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); for (i = 0; i < OFDM_Table_Length; i++) {
for (i=0; i<OFDM_Table_Length; i++) if (tmpRegA == OFDMSwingTable[i]) {
{ priv->OFDM_index[0] = (u8)i;
if (tmpRegA == OFDMSwingTable[i]) RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x = 0x%x, OFDM_index = 0x%x\n",
{
priv->OFDM_index[0]= (u8)i;
RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x = 0x%x, OFDM_index=0x%x\n",
rOFDM0_XATxIQImbalance, tmpRegA, priv->OFDM_index[0]); rOFDM0_XATxIQImbalance, tmpRegA, priv->OFDM_index[0]);
} }
} }
TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2); TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
for (i=0 ; i<CCK_Table_length ; i++) for (i = 0; i < CCK_Table_length; i++) {
{ if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) priv->CCK_index = (u8) i;
{ RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x"
priv->CCK_index =(u8) i; " = 0x%x, CCK_index = 0x%x\n",
RT_TRACE(COMP_POWER_TRACKING, "Initial reg0x%x = 0x%x, CCK_index=0x%x\n", rCCK0_TxFilter1, TempCCk,
rCCK0_TxFilter1, TempCCk, priv->CCK_index); priv->CCK_index);
break; break;
} }
} }
priv->btxpower_trackingInit = true; priv->btxpower_trackingInit = true;
return; return;
} }
tmpRegA = rtl8192_phy_QueryRFReg(dev, RF90_PATH_A, 0x12, 0x078); tmpRegA = rtl8192_phy_QueryRFReg(dev, RF90_PATH_A, 0x12, 0x078);
RT_TRACE(COMP_POWER_TRACKING, "Readback ThermalMeterA = %d \n", tmpRegA); RT_TRACE(COMP_POWER_TRACKING, "Readback ThermalMeterA = %d\n", tmpRegA);
if (tmpRegA < 3 || tmpRegA > 13) if (tmpRegA < 3 || tmpRegA > 13)
return; return;
if (tmpRegA >= 12) if (tmpRegA >= 12)
tmpRegA = 12; tmpRegA = 12;
RT_TRACE(COMP_POWER_TRACKING, "Valid ThermalMeterA = %d \n", tmpRegA); RT_TRACE(COMP_POWER_TRACKING, "Valid ThermalMeterA = %d\n", tmpRegA);
priv->ThermalMeter[0] = ThermalMeterVal; priv->ThermalMeter[0] = ThermalMeterVal;
priv->ThermalMeter[1] = ThermalMeterVal; priv->ThermalMeter[1] = ThermalMeterVal;
if (priv->ThermalMeter[0] >= (u8)tmpRegA) if (priv->ThermalMeter[0] >= (u8)tmpRegA) {
{ tmpOFDMindex = tmpCCK20Mindex = 6+(priv->ThermalMeter[0] -
tmpOFDMindex = tmpCCK20Mindex = 6+(priv->ThermalMeter[0]-(u8)tmpRegA); (u8)tmpRegA);
tmpCCK40Mindex = tmpCCK20Mindex - 6; tmpCCK40Mindex = tmpCCK20Mindex - 6;
if (tmpOFDMindex >= OFDM_Table_Length) if (tmpOFDMindex >= OFDM_Table_Length)
tmpOFDMindex = OFDM_Table_Length-1; tmpOFDMindex = OFDM_Table_Length-1;
...@@ -831,9 +786,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) ...@@ -831,9 +786,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev)
tmpCCK20Mindex = CCK_Table_length-1; tmpCCK20Mindex = CCK_Table_length-1;
if (tmpCCK40Mindex >= CCK_Table_length) if (tmpCCK40Mindex >= CCK_Table_length)
tmpCCK40Mindex = CCK_Table_length-1; tmpCCK40Mindex = CCK_Table_length-1;
} } else {
else
{
tmpval = ((u8)tmpRegA - priv->ThermalMeter[0]); tmpval = ((u8)tmpRegA - priv->ThermalMeter[0]);
if (tmpval >= 6) if (tmpval >= 6)
tmpOFDMindex = tmpCCK20Mindex = 0; tmpOFDMindex = tmpCCK20Mindex = 0;
...@@ -848,43 +801,42 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) ...@@ -848,43 +801,42 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev)
priv->Record_CCK_20Mindex = tmpCCK20Mindex; priv->Record_CCK_20Mindex = tmpCCK20Mindex;
priv->Record_CCK_40Mindex = tmpCCK40Mindex; priv->Record_CCK_40Mindex = tmpCCK40Mindex;
RT_TRACE(COMP_POWER_TRACKING, "Record_CCK_20Mindex / Record_CCK_40Mindex = %d / %d.\n", RT_TRACE(COMP_POWER_TRACKING, "Record_CCK_20Mindex / Record_CCK_40"
priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex); "Mindex = %d / %d.\n",
priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex);
if (priv->rtllib->current_network.channel == 14 && !priv->bcck_in_ch14) if (priv->rtllib->current_network.channel == 14 &&
{ !priv->bcck_in_ch14) {
priv->bcck_in_ch14 = true; priv->bcck_in_ch14 = true;
CCKSwingNeedUpdate = 1; CCKSwingNeedUpdate = 1;
} } else if (priv->rtllib->current_network.channel != 14 &&
else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) priv->bcck_in_ch14) {
{
priv->bcck_in_ch14 = false; priv->bcck_in_ch14 = false;
CCKSwingNeedUpdate = 1; CCKSwingNeedUpdate = 1;
} }
if (priv->CCK_index != tmpCCKindex) if (priv->CCK_index != tmpCCKindex) {
{
priv->CCK_index = tmpCCKindex; priv->CCK_index = tmpCCKindex;
CCKSwingNeedUpdate = 1; CCKSwingNeedUpdate = 1;
} }
if (CCKSwingNeedUpdate) if (CCKSwingNeedUpdate)
{
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} if (priv->OFDM_index[0] != tmpOFDMindex) {
if (priv->OFDM_index[0] != tmpOFDMindex)
{
priv->OFDM_index[0] = tmpOFDMindex; priv->OFDM_index[0] = tmpOFDMindex;
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, OFDMSwingTable[priv->OFDM_index[0]]); rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord,
OFDMSwingTable[priv->OFDM_index[0]]);
RT_TRACE(COMP_POWER_TRACKING, "Update OFDMSwing[%d] = 0x%x\n", RT_TRACE(COMP_POWER_TRACKING, "Update OFDMSwing[%d] = 0x%x\n",
priv->OFDM_index[0], OFDMSwingTable[priv->OFDM_index[0]]); priv->OFDM_index[0],
OFDMSwingTable[priv->OFDM_index[0]]);
} }
priv->txpower_count = 0; priv->txpower_count = 0;
} }
void dm_txpower_trackingcallback(void *data) void dm_txpower_trackingcallback(void *data)
{ {
struct r8192_priv *priv = container_of_dwork_rsl(data, struct r8192_priv,txpower_tracking_wq); struct r8192_priv *priv = container_of_dwork_rsl(data,
struct r8192_priv, txpower_tracking_wq);
struct net_device *dev = priv->rtllib->dev; struct net_device *dev = priv->rtllib->dev;
if (priv->IC_Cut >= IC_VersionCut_D) if (priv->IC_Cut >= IC_VersionCut_D)
...@@ -898,80 +850,80 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev) ...@@ -898,80 +850,80 @@ static void dm_InitializeTXPowerTracking_TSSI(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
priv->txbbgain_table[0].txbb_iq_amplifygain = 12; priv->txbbgain_table[0].txbb_iq_amplifygain = 12;
priv->txbbgain_table[0].txbbgain_value=0x7f8001fe; priv->txbbgain_table[0].txbbgain_value = 0x7f8001fe;
priv->txbbgain_table[1].txbb_iq_amplifygain = 11; priv->txbbgain_table[1].txbb_iq_amplifygain = 11;
priv->txbbgain_table[1].txbbgain_value=0x788001e2; priv->txbbgain_table[1].txbbgain_value = 0x788001e2;
priv->txbbgain_table[2].txbb_iq_amplifygain = 10; priv->txbbgain_table[2].txbb_iq_amplifygain = 10;
priv->txbbgain_table[2].txbbgain_value=0x71c001c7; priv->txbbgain_table[2].txbbgain_value = 0x71c001c7;
priv->txbbgain_table[3].txbb_iq_amplifygain = 9; priv->txbbgain_table[3].txbb_iq_amplifygain = 9;
priv->txbbgain_table[3].txbbgain_value=0x6b8001ae; priv->txbbgain_table[3].txbbgain_value = 0x6b8001ae;
priv->txbbgain_table[4].txbb_iq_amplifygain = 8; priv->txbbgain_table[4].txbb_iq_amplifygain = 8;
priv->txbbgain_table[4].txbbgain_value=0x65400195; priv->txbbgain_table[4].txbbgain_value = 0x65400195;
priv->txbbgain_table[5].txbb_iq_amplifygain = 7; priv->txbbgain_table[5].txbb_iq_amplifygain = 7;
priv->txbbgain_table[5].txbbgain_value=0x5fc0017f; priv->txbbgain_table[5].txbbgain_value = 0x5fc0017f;
priv->txbbgain_table[6].txbb_iq_amplifygain = 6; priv->txbbgain_table[6].txbb_iq_amplifygain = 6;
priv->txbbgain_table[6].txbbgain_value=0x5a400169; priv->txbbgain_table[6].txbbgain_value = 0x5a400169;
priv->txbbgain_table[7].txbb_iq_amplifygain = 5; priv->txbbgain_table[7].txbb_iq_amplifygain = 5;
priv->txbbgain_table[7].txbbgain_value=0x55400155; priv->txbbgain_table[7].txbbgain_value = 0x55400155;
priv->txbbgain_table[8].txbb_iq_amplifygain = 4; priv->txbbgain_table[8].txbb_iq_amplifygain = 4;
priv->txbbgain_table[8].txbbgain_value=0x50800142; priv->txbbgain_table[8].txbbgain_value = 0x50800142;
priv->txbbgain_table[9].txbb_iq_amplifygain = 3; priv->txbbgain_table[9].txbb_iq_amplifygain = 3;
priv->txbbgain_table[9].txbbgain_value=0x4c000130; priv->txbbgain_table[9].txbbgain_value = 0x4c000130;
priv->txbbgain_table[10].txbb_iq_amplifygain = 2; priv->txbbgain_table[10].txbb_iq_amplifygain = 2;
priv->txbbgain_table[10].txbbgain_value=0x47c0011f; priv->txbbgain_table[10].txbbgain_value = 0x47c0011f;
priv->txbbgain_table[11].txbb_iq_amplifygain = 1; priv->txbbgain_table[11].txbb_iq_amplifygain = 1;
priv->txbbgain_table[11].txbbgain_value=0x43c0010f; priv->txbbgain_table[11].txbbgain_value = 0x43c0010f;
priv->txbbgain_table[12].txbb_iq_amplifygain = 0; priv->txbbgain_table[12].txbb_iq_amplifygain = 0;
priv->txbbgain_table[12].txbbgain_value=0x40000100; priv->txbbgain_table[12].txbbgain_value = 0x40000100;
priv->txbbgain_table[13].txbb_iq_amplifygain = -1; priv->txbbgain_table[13].txbb_iq_amplifygain = -1;
priv->txbbgain_table[13].txbbgain_value=0x3c8000f2; priv->txbbgain_table[13].txbbgain_value = 0x3c8000f2;
priv->txbbgain_table[14].txbb_iq_amplifygain = -2; priv->txbbgain_table[14].txbb_iq_amplifygain = -2;
priv->txbbgain_table[14].txbbgain_value=0x390000e4; priv->txbbgain_table[14].txbbgain_value = 0x390000e4;
priv->txbbgain_table[15].txbb_iq_amplifygain = -3; priv->txbbgain_table[15].txbb_iq_amplifygain = -3;
priv->txbbgain_table[15].txbbgain_value=0x35c000d7; priv->txbbgain_table[15].txbbgain_value = 0x35c000d7;
priv->txbbgain_table[16].txbb_iq_amplifygain = -4; priv->txbbgain_table[16].txbb_iq_amplifygain = -4;
priv->txbbgain_table[16].txbbgain_value=0x32c000cb; priv->txbbgain_table[16].txbbgain_value = 0x32c000cb;
priv->txbbgain_table[17].txbb_iq_amplifygain = -5; priv->txbbgain_table[17].txbb_iq_amplifygain = -5;
priv->txbbgain_table[17].txbbgain_value=0x300000c0; priv->txbbgain_table[17].txbbgain_value = 0x300000c0;
priv->txbbgain_table[18].txbb_iq_amplifygain = -6; priv->txbbgain_table[18].txbb_iq_amplifygain = -6;
priv->txbbgain_table[18].txbbgain_value=0x2d4000b5; priv->txbbgain_table[18].txbbgain_value = 0x2d4000b5;
priv->txbbgain_table[19].txbb_iq_amplifygain = -7; priv->txbbgain_table[19].txbb_iq_amplifygain = -7;
priv->txbbgain_table[19].txbbgain_value=0x2ac000ab; priv->txbbgain_table[19].txbbgain_value = 0x2ac000ab;
priv->txbbgain_table[20].txbb_iq_amplifygain = -8; priv->txbbgain_table[20].txbb_iq_amplifygain = -8;
priv->txbbgain_table[20].txbbgain_value=0x288000a2; priv->txbbgain_table[20].txbbgain_value = 0x288000a2;
priv->txbbgain_table[21].txbb_iq_amplifygain = -9; priv->txbbgain_table[21].txbb_iq_amplifygain = -9;
priv->txbbgain_table[21].txbbgain_value=0x26000098; priv->txbbgain_table[21].txbbgain_value = 0x26000098;
priv->txbbgain_table[22].txbb_iq_amplifygain = -10; priv->txbbgain_table[22].txbb_iq_amplifygain = -10;
priv->txbbgain_table[22].txbbgain_value=0x24000090; priv->txbbgain_table[22].txbbgain_value = 0x24000090;
priv->txbbgain_table[23].txbb_iq_amplifygain = -11; priv->txbbgain_table[23].txbb_iq_amplifygain = -11;
priv->txbbgain_table[23].txbbgain_value=0x22000088; priv->txbbgain_table[23].txbbgain_value = 0x22000088;
priv->txbbgain_table[24].txbb_iq_amplifygain = -12; priv->txbbgain_table[24].txbb_iq_amplifygain = -12;
priv->txbbgain_table[24].txbbgain_value=0x20000080; priv->txbbgain_table[24].txbbgain_value = 0x20000080;
priv->txbbgain_table[25].txbb_iq_amplifygain = -13; priv->txbbgain_table[25].txbb_iq_amplifygain = -13;
priv->txbbgain_table[25].txbbgain_value=0x1a00006c; priv->txbbgain_table[25].txbbgain_value = 0x1a00006c;
priv->txbbgain_table[26].txbb_iq_amplifygain = -14; priv->txbbgain_table[26].txbb_iq_amplifygain = -14;
priv->txbbgain_table[26].txbbgain_value=0x1c800072; priv->txbbgain_table[26].txbbgain_value = 0x1c800072;
priv->txbbgain_table[27].txbb_iq_amplifygain = -15; priv->txbbgain_table[27].txbb_iq_amplifygain = -15;
priv->txbbgain_table[27].txbbgain_value=0x18000060; priv->txbbgain_table[27].txbbgain_value = 0x18000060;
priv->txbbgain_table[28].txbb_iq_amplifygain = -16; priv->txbbgain_table[28].txbb_iq_amplifygain = -16;
priv->txbbgain_table[28].txbbgain_value=0x19800066; priv->txbbgain_table[28].txbbgain_value = 0x19800066;
priv->txbbgain_table[29].txbb_iq_amplifygain = -17; priv->txbbgain_table[29].txbb_iq_amplifygain = -17;
priv->txbbgain_table[29].txbbgain_value=0x15800056; priv->txbbgain_table[29].txbbgain_value = 0x15800056;
priv->txbbgain_table[30].txbb_iq_amplifygain = -18; priv->txbbgain_table[30].txbb_iq_amplifygain = -18;
priv->txbbgain_table[30].txbbgain_value=0x26c0005b; priv->txbbgain_table[30].txbbgain_value = 0x26c0005b;
priv->txbbgain_table[31].txbb_iq_amplifygain = -19; priv->txbbgain_table[31].txbb_iq_amplifygain = -19;
priv->txbbgain_table[31].txbbgain_value=0x14400051; priv->txbbgain_table[31].txbbgain_value = 0x14400051;
priv->txbbgain_table[32].txbb_iq_amplifygain = -20; priv->txbbgain_table[32].txbb_iq_amplifygain = -20;
priv->txbbgain_table[32].txbbgain_value=0x24400051; priv->txbbgain_table[32].txbbgain_value = 0x24400051;
priv->txbbgain_table[33].txbb_iq_amplifygain = -21; priv->txbbgain_table[33].txbb_iq_amplifygain = -21;
priv->txbbgain_table[33].txbbgain_value=0x1300004c; priv->txbbgain_table[33].txbbgain_value = 0x1300004c;
priv->txbbgain_table[34].txbb_iq_amplifygain = -22; priv->txbbgain_table[34].txbb_iq_amplifygain = -22;
priv->txbbgain_table[34].txbbgain_value=0x12000048; priv->txbbgain_table[34].txbbgain_value = 0x12000048;
priv->txbbgain_table[35].txbb_iq_amplifygain = -23; priv->txbbgain_table[35].txbb_iq_amplifygain = -23;
priv->txbbgain_table[35].txbbgain_value=0x11000044; priv->txbbgain_table[35].txbbgain_value = 0x11000044;
priv->txbbgain_table[36].txbb_iq_amplifygain = -24; priv->txbbgain_table[36].txbb_iq_amplifygain = -24;
priv->txbbgain_table[36].txbbgain_value=0x10000040; priv->txbbgain_table[36].txbbgain_value = 0x10000040;
priv->cck_txbbgain_table[0].ccktxbb_valuearray[0] = 0x36; priv->cck_txbbgain_table[0].ccktxbb_valuearray[0] = 0x36;
priv->cck_txbbgain_table[0].ccktxbb_valuearray[1] = 0x35; priv->cck_txbbgain_table[0].ccktxbb_valuearray[1] = 0x35;
...@@ -1404,7 +1356,8 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev) ...@@ -1404,7 +1356,8 @@ static void dm_InitializeTXPowerTracking_ThermalMeter(struct net_device *dev)
priv->btxpower_tracking = false; priv->btxpower_tracking = false;
priv->txpower_count = 0; priv->txpower_count = 0;
priv->btxpower_trackingInit = false; priv->btxpower_trackingInit = false;
RT_TRACE(COMP_POWER_TRACKING, "pMgntInfo->bTXPowerTracking = %d\n", priv->btxpower_tracking); RT_TRACE(COMP_POWER_TRACKING, "pMgntInfo->bTXPowerTracking = %d\n",
priv->btxpower_tracking);
} }
void dm_initialize_txpower_tracking(struct net_device *dev) void dm_initialize_txpower_tracking(struct net_device *dev)
...@@ -1419,55 +1372,53 @@ void dm_initialize_txpower_tracking(struct net_device *dev) ...@@ -1419,55 +1372,53 @@ void dm_initialize_txpower_tracking(struct net_device *dev)
static void dm_CheckTXPowerTracking_TSSI(struct net_device *dev) static void dm_CheckTXPowerTracking_TSSI(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u32 tx_power_track_counter = 0; static u32 tx_power_track_counter;
RT_TRACE(COMP_POWER_TRACKING,"%s()\n",__func__); RT_TRACE(COMP_POWER_TRACKING, "%s()\n", __func__);
if (read_nic_byte(dev, 0x11e) ==1) if (read_nic_byte(dev, 0x11e) == 1)
return; return;
if (!priv->btxpower_tracking) if (!priv->btxpower_tracking)
return; return;
tx_power_track_counter++; tx_power_track_counter++;
if (tx_power_track_counter >= 180) if (tx_power_track_counter >= 180) {
{ queue_delayed_work_rsl(priv->priv_wq, &priv->txpower_tracking_wq, 0);
queue_delayed_work_rsl(priv->priv_wq,&priv->txpower_tracking_wq,0); tx_power_track_counter = 0;
tx_power_track_counter =0; }
}
} }
static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u8 TM_Trigger=0; static u8 TM_Trigger;
u8 TxPowerCheckCnt = 0; u8 TxPowerCheckCnt = 0;
if (IS_HARDWARE_TYPE_8192SE(dev)) if (IS_HARDWARE_TYPE_8192SE(dev))
TxPowerCheckCnt = 5; TxPowerCheckCnt = 5;
else else
TxPowerCheckCnt = 2; TxPowerCheckCnt = 2;
if (!priv->btxpower_tracking){ if (!priv->btxpower_tracking) {
return; return;
} else { } else {
if (priv->txpower_count <= TxPowerCheckCnt) { if (priv->txpower_count <= TxPowerCheckCnt) {
priv->txpower_count++; priv->txpower_count++;
return; return;
} }
} }
if (!TM_Trigger) if (!TM_Trigger) {
{ {
{
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f); rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
} }
TM_Trigger = 1; TM_Trigger = 1;
return; return;
} else { } else {
printk("===============>Schedule TxPowerTrackingWorkItem\n"); printk(KERN_INFO "===============>Schedule TxPowerTrackingWorkItem\n");
queue_delayed_work_rsl(priv->priv_wq,&priv->txpower_tracking_wq,0); queue_delayed_work_rsl(priv->priv_wq, &priv->txpower_tracking_wq, 0);
TM_Trigger = 0; TM_Trigger = 0;
} }
...@@ -1488,40 +1439,38 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14) ...@@ -1488,40 +1439,38 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14)
u32 TempVal; u32 TempVal;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
TempVal = 0; TempVal = 0;
if (!bInCH14){ if (!bInCH14) {
TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0] + TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0] +
(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1]<<8)) ; (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1]<<8)) ;
rtl8192_setBBreg(dev, rCCK0_TxFilter1,bMaskHWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
TempVal = 0; TempVal = 0;
TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] + TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] +
(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[3]<<8) + (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[3]<<8) +
(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[4]<<16 )+ (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[4]<<16)+
(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24)); (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24));
rtl8192_setBBreg(dev, rCCK0_TxFilter2,bMaskDWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
TempVal = 0; TempVal = 0;
TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6] + TempVal = (u32)(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6] +
(priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7]<<8)) ; (priv->cck_txbbgain_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7]<<8)) ;
rtl8192_setBBreg(dev, rCCK0_DebugPort,bMaskLWord, TempVal); rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
} } else {
else TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0] +
{ (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1]<<8)) ;
TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[0] +
(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[1]<<8)) ;
rtl8192_setBBreg(dev, rCCK0_TxFilter1,bMaskHWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
TempVal = 0; TempVal = 0;
TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] + TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[2] +
(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[3]<<8) + (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[3]<<8) +
(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[4]<<16 )+ (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[4]<<16)+
(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24)); (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[5]<<24));
rtl8192_setBBreg(dev, rCCK0_TxFilter2,bMaskDWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
TempVal = 0; TempVal = 0;
TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6] + TempVal = (u32)(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[6] +
(priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7]<<8)) ; (priv->cck_txbbgain_ch14_table[(u8)(priv->CCKPresentAttentuation)].ccktxbb_valuearray[7]<<8)) ;
rtl8192_setBBreg(dev, rCCK0_DebugPort,bMaskLWord, TempVal); rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
} }
...@@ -1533,8 +1482,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH ...@@ -1533,8 +1482,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
TempVal = 0; TempVal = 0;
if (!bInCH14) if (!bInCH14) {
{
TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][0] + TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][0] +
(CCKSwingTable_Ch1_Ch13[priv->CCK_index][1]<<8) ; (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1]<<8) ;
rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
...@@ -1543,7 +1491,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH ...@@ -1543,7 +1491,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH
TempVal = 0; TempVal = 0;
TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][2] + TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][2] +
(CCKSwingTable_Ch1_Ch13[priv->CCK_index][3]<<8) + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][3]<<8) +
(CCKSwingTable_Ch1_Ch13[priv->CCK_index][4]<<16 )+ (CCKSwingTable_Ch1_Ch13[priv->CCK_index][4]<<16)+
(CCKSwingTable_Ch1_Ch13[priv->CCK_index][5]<<24); (CCKSwingTable_Ch1_Ch13[priv->CCK_index][5]<<24);
rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
RT_TRACE(COMP_POWER_TRACKING, "CCK not chnl 14, reg 0x%x = 0x%x\n", RT_TRACE(COMP_POWER_TRACKING, "CCK not chnl 14, reg 0x%x = 0x%x\n",
...@@ -1555,9 +1503,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH ...@@ -1555,9 +1503,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH
rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
RT_TRACE(COMP_POWER_TRACKING, "CCK not chnl 14, reg 0x%x = 0x%x\n", RT_TRACE(COMP_POWER_TRACKING, "CCK not chnl 14, reg 0x%x = 0x%x\n",
rCCK0_DebugPort, TempVal); rCCK0_DebugPort, TempVal);
} } else {
else
{
TempVal = CCKSwingTable_Ch14[priv->CCK_index][0] + TempVal = CCKSwingTable_Ch14[priv->CCK_index][0] +
(CCKSwingTable_Ch14[priv->CCK_index][1]<<8) ; (CCKSwingTable_Ch14[priv->CCK_index][1]<<8) ;
...@@ -1567,7 +1513,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH ...@@ -1567,7 +1513,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH
TempVal = 0; TempVal = 0;
TempVal = CCKSwingTable_Ch14[priv->CCK_index][2] + TempVal = CCKSwingTable_Ch14[priv->CCK_index][2] +
(CCKSwingTable_Ch14[priv->CCK_index][3]<<8) + (CCKSwingTable_Ch14[priv->CCK_index][3]<<8) +
(CCKSwingTable_Ch14[priv->CCK_index][4]<<16 )+ (CCKSwingTable_Ch14[priv->CCK_index][4]<<16)+
(CCKSwingTable_Ch14[priv->CCK_index][5]<<24); (CCKSwingTable_Ch14[priv->CCK_index][5]<<24);
rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n", RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",
...@@ -1577,7 +1523,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH ...@@ -1577,7 +1523,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH
(CCKSwingTable_Ch14[priv->CCK_index][7]<<8) ; (CCKSwingTable_Ch14[priv->CCK_index][7]<<8) ;
rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
RT_TRACE(COMP_POWER_TRACKING,"CCK chnl 14, reg 0x%x = 0x%x\n", RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x = 0x%x\n",
rCCK0_DebugPort, TempVal); rCCK0_DebugPort, TempVal);
} }
} }
...@@ -1601,17 +1547,26 @@ static void dm_txpower_reset_recovery( ...@@ -1601,17 +1547,26 @@ static void dm_txpower_reset_recovery(
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
RT_TRACE(COMP_POWER_TRACKING, "Start Reset Recovery ==>\n"); RT_TRACE(COMP_POWER_TRACKING, "Start Reset Recovery ==>\n");
rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbbgain_value); rtl8192_setBBreg(dev, rOFDM0_XATxIQImbalance, bMaskDWord,
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc80 is %08x\n",priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbbgain_value); priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbbgain_value);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFA_txPowerTrackingIndex is %x\n",priv->rfa_txpowertrackingindex); RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc80 is %08x\n",
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF A I/Q Amplify Gain is %ld\n",priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbb_iq_amplifygain); priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbbgain_value);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: CCK Attenuation is %d dB\n",priv->CCKPresentAttentuation); RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFA_txPowerTrackingIndex is %x\n",
dm_cck_txpower_adjust(dev,priv->bcck_in_ch14); priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF A I/Q Amplify Gain is %ld\n",
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value); priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbb_iq_amplifygain);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc90 is %08x\n",priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value); RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: CCK Attenuation is %d dB\n",
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFC_txPowerTrackingIndex is %x\n",priv->rfc_txpowertrackingindex); priv->CCKPresentAttentuation);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF C I/Q Amplify Gain is %ld\n",priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbb_iq_amplifygain); dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord,
priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc90 is %08x\n",
priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFC_txPowerTrackingIndex is %x\n",
priv->rfc_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF C I/Q Amplify Gain is %ld\n",
priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbb_iq_amplifygain);
} }
...@@ -1619,30 +1574,25 @@ extern void dm_restore_dynamic_mechanism_state(struct net_device *dev) ...@@ -1619,30 +1574,25 @@ extern void dm_restore_dynamic_mechanism_state(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u32 reg_ratr = priv->rate_adaptive.last_ratr; u32 reg_ratr = priv->rate_adaptive.last_ratr;
u32 ratr_value;
if (IS_NIC_DOWN(priv)){ if (IS_NIC_DOWN(priv)) {
RT_TRACE(COMP_RATE, "<---- dm_restore_dynamic_mechanism_state(): driver is going to unload\n"); RT_TRACE(COMP_RATE, "<---- dm_restore_dynamic_mechanism_state(): driver is going to unload\n");
return; return;
} }
if (priv->rate_adaptive.rate_adaptive_disabled) if (priv->rate_adaptive.rate_adaptive_disabled)
return; return;
if ( !(priv->rtllib->mode==WIRELESS_MODE_N_24G || if (!(priv->rtllib->mode == WIRELESS_MODE_N_24G ||
priv->rtllib->mode==WIRELESS_MODE_N_5G)) priv->rtllib->mode == WIRELESS_MODE_N_5G))
return; return;
{ ratr_value = reg_ratr;
u32 ratr_value; if (priv->rf_type == RF_1T2R)
ratr_value = reg_ratr; ratr_value &= ~(RATE_ALL_OFDM_2SS);
if (priv->rf_type == RF_1T2R) write_nic_dword(dev, RATR0, ratr_value);
{ write_nic_byte(dev, UFWP, 1);
ratr_value &=~ (RATE_ALL_OFDM_2SS); if (priv->btxpower_trackingInit && priv->btxpower_tracking)
}
write_nic_dword(dev, RATR0, ratr_value);
write_nic_byte(dev, UFWP, 1);
}
if (priv->btxpower_trackingInit && priv->btxpower_tracking){
dm_txpower_reset_recovery(dev); dm_txpower_reset_recovery(dev);
}
dm_bb_initialgain_restore(dev); dm_bb_initialgain_restore(dev);
...@@ -1664,11 +1614,11 @@ static void dm_bb_initialgain_restore(struct net_device *dev) ...@@ -1664,11 +1614,11 @@ static void dm_bb_initialgain_restore(struct net_device *dev)
bit_mask = bMaskByte2; bit_mask = bMaskByte2;
rtl8192_setBBreg(dev, rCCK0_CCA, bit_mask, (u32)priv->initgain_backup.cca); rtl8192_setBBreg(dev, rCCK0_CCA, bit_mask, (u32)priv->initgain_backup.cca);
RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc50 is %x\n",priv->initgain_backup.xaagccore1); RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc50 is %x\n", priv->initgain_backup.xaagccore1);
RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc58 is %x\n",priv->initgain_backup.xbagccore1); RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc58 is %x\n", priv->initgain_backup.xbagccore1);
RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc60 is %x\n",priv->initgain_backup.xcagccore1); RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc60 is %x\n", priv->initgain_backup.xcagccore1);
RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc68 is %x\n",priv->initgain_backup.xdagccore1); RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc68 is %x\n", priv->initgain_backup.xdagccore1);
RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xa0a is %x\n",priv->initgain_backup.cca); RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xa0a is %x\n", priv->initgain_backup.cca);
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1);
} }
...@@ -1701,93 +1651,66 @@ static void dm_bb_initialgain_backup(struct net_device *dev) ...@@ -1701,93 +1651,66 @@ static void dm_bb_initialgain_backup(struct net_device *dev)
bit_mask = bMaskByte2; bit_mask = bMaskByte2;
priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bit_mask); priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bit_mask);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n",priv->initgain_backup.xaagccore1); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n", priv->initgain_backup.xaagccore1);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc58 is %x\n",priv->initgain_backup.xbagccore1); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc58 is %x\n", priv->initgain_backup.xbagccore1);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc60 is %x\n",priv->initgain_backup.xcagccore1); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc60 is %x\n", priv->initgain_backup.xcagccore1);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n",priv->initgain_backup.xdagccore1); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n", priv->initgain_backup.xdagccore1);
RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n",priv->initgain_backup.cca); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n", priv->initgain_backup.cca);
} }
extern void dm_change_dynamic_initgain_thresh(struct net_device *dev, extern void dm_change_dynamic_initgain_thresh(struct net_device *dev,
u32 dm_type, u32 dm_type, u32 dm_value)
u32 dm_value)
{ {
if (dm_type == DIG_TYPE_THRESH_HIGH) if (dm_type == DIG_TYPE_THRESH_HIGH) {
{
dm_digtable.rssi_high_thresh = dm_value; dm_digtable.rssi_high_thresh = dm_value;
} } else if (dm_type == DIG_TYPE_THRESH_LOW) {
else if (dm_type == DIG_TYPE_THRESH_LOW)
{
dm_digtable.rssi_low_thresh = dm_value; dm_digtable.rssi_low_thresh = dm_value;
} } else if (dm_type == DIG_TYPE_THRESH_HIGHPWR_HIGH) {
else if (dm_type == DIG_TYPE_THRESH_HIGHPWR_HIGH)
{
dm_digtable.rssi_high_power_highthresh = dm_value; dm_digtable.rssi_high_power_highthresh = dm_value;
} } else if (dm_type == DIG_TYPE_THRESH_HIGHPWR_HIGH) {
else if (dm_type == DIG_TYPE_THRESH_HIGHPWR_HIGH)
{
dm_digtable.rssi_high_power_highthresh = dm_value; dm_digtable.rssi_high_power_highthresh = dm_value;
} } else if (dm_type == DIG_TYPE_ENABLE) {
else if (dm_type == DIG_TYPE_ENABLE)
{
dm_digtable.dig_state = DM_STA_DIG_MAX; dm_digtable.dig_state = DM_STA_DIG_MAX;
dm_digtable.dig_enable_flag = true; dm_digtable.dig_enable_flag = true;
} } else if (dm_type == DIG_TYPE_DISABLE) {
else if (dm_type == DIG_TYPE_DISABLE)
{
dm_digtable.dig_state = DM_STA_DIG_MAX; dm_digtable.dig_state = DM_STA_DIG_MAX;
dm_digtable.dig_enable_flag = false; dm_digtable.dig_enable_flag = false;
} } else if (dm_type == DIG_TYPE_DBG_MODE) {
else if (dm_type == DIG_TYPE_DBG_MODE)
{
if (dm_value >= DM_DBG_MAX) if (dm_value >= DM_DBG_MAX)
dm_value = DM_DBG_OFF; dm_value = DM_DBG_OFF;
dm_digtable.dbg_mode = (u8)dm_value; dm_digtable.dbg_mode = (u8)dm_value;
} } else if (dm_type == DIG_TYPE_RSSI) {
else if (dm_type == DIG_TYPE_RSSI)
{
if (dm_value > 100) if (dm_value > 100)
dm_value = 30; dm_value = 30;
dm_digtable.rssi_val = (long)dm_value; dm_digtable.rssi_val = (long)dm_value;
} } else if (dm_type == DIG_TYPE_ALGORITHM) {
else if (dm_type == DIG_TYPE_ALGORITHM)
{
if (dm_value >= DIG_ALGO_MAX) if (dm_value >= DIG_ALGO_MAX)
dm_value = DIG_ALGO_BY_FALSE_ALARM; dm_value = DIG_ALGO_BY_FALSE_ALARM;
if (dm_digtable.dig_algorithm != (u8)dm_value) if (dm_digtable.dig_algorithm != (u8)dm_value)
dm_digtable.dig_algorithm_switch = 1; dm_digtable.dig_algorithm_switch = 1;
dm_digtable.dig_algorithm = (u8)dm_value; dm_digtable.dig_algorithm = (u8)dm_value;
} } else if (dm_type == DIG_TYPE_BACKOFF) {
else if (dm_type == DIG_TYPE_BACKOFF)
{
if (dm_value > 30) if (dm_value > 30)
dm_value = 30; dm_value = 30;
dm_digtable.backoff_val = (u8)dm_value; dm_digtable.backoff_val = (u8)dm_value;
} } else if (dm_type == DIG_TYPE_RX_GAIN_MIN) {
else if (dm_type == DIG_TYPE_RX_GAIN_MIN)
{
if (dm_value == 0) if (dm_value == 0)
dm_value = 0x1; dm_value = 0x1;
dm_digtable.rx_gain_range_min = (u8)dm_value; dm_digtable.rx_gain_range_min = (u8)dm_value;
} } else if (dm_type == DIG_TYPE_RX_GAIN_MAX) {
else if (dm_type == DIG_TYPE_RX_GAIN_MAX)
{
if (dm_value > 0x50) if (dm_value > 0x50)
dm_value = 0x50; dm_value = 0x50;
dm_digtable.rx_gain_range_max = (u8)dm_value; dm_digtable.rx_gain_range_max = (u8)dm_value;
} }
} }
extern void extern void dm_change_fsync_setting(struct net_device *dev,
dm_change_fsync_setting(
struct net_device *dev,
s32 DM_Type, s32 DM_Type,
s32 DM_Value) s32 DM_Value)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (DM_Type == 0) if (DM_Type == 0) {
{
if (DM_Value > 1) if (DM_Value > 1)
DM_Value = 1; DM_Value = 1;
priv->framesyncMonitor = (u8)DM_Value; priv->framesyncMonitor = (u8)DM_Value;
...@@ -1804,68 +1727,47 @@ dm_change_rxpath_selection_setting( ...@@ -1804,68 +1727,47 @@ dm_change_rxpath_selection_setting(
struct rate_adaptive *pRA = (struct rate_adaptive *)&(priv->rate_adaptive); struct rate_adaptive *pRA = (struct rate_adaptive *)&(priv->rate_adaptive);
if (DM_Type == 0) if (DM_Type == 0) {
{
if (DM_Value > 1) if (DM_Value > 1)
DM_Value = 1; DM_Value = 1;
DM_RxPathSelTable.Enable = (u8)DM_Value; DM_RxPathSelTable.Enable = (u8)DM_Value;
} } else if (DM_Type == 1) {
else if (DM_Type == 1)
{
if (DM_Value > 1) if (DM_Value > 1)
DM_Value = 1; DM_Value = 1;
DM_RxPathSelTable.DbgMode = (u8)DM_Value; DM_RxPathSelTable.DbgMode = (u8)DM_Value;
} } else if (DM_Type == 2) {
else if (DM_Type == 2)
{
if (DM_Value > 40) if (DM_Value > 40)
DM_Value = 40; DM_Value = 40;
DM_RxPathSelTable.SS_TH_low = (u8)DM_Value; DM_RxPathSelTable.SS_TH_low = (u8)DM_Value;
} } else if (DM_Type == 3) {
else if (DM_Type == 3)
{
if (DM_Value > 25) if (DM_Value > 25)
DM_Value = 25; DM_Value = 25;
DM_RxPathSelTable.diff_TH = (u8)DM_Value; DM_RxPathSelTable.diff_TH = (u8)DM_Value;
} } else if (DM_Type == 4) {
else if (DM_Type == 4)
{
if (DM_Value >= CCK_Rx_Version_MAX) if (DM_Value >= CCK_Rx_Version_MAX)
DM_Value = CCK_Rx_Version_1; DM_Value = CCK_Rx_Version_1;
DM_RxPathSelTable.cck_method= (u8)DM_Value; DM_RxPathSelTable.cck_method = (u8)DM_Value;
} } else if (DM_Type == 10) {
else if (DM_Type == 10)
{
if (DM_Value > 100) if (DM_Value > 100)
DM_Value = 50; DM_Value = 50;
DM_RxPathSelTable.rf_rssi[0] = (u8)DM_Value; DM_RxPathSelTable.rf_rssi[0] = (u8)DM_Value;
} } else if (DM_Type == 11) {
else if (DM_Type == 11)
{
if (DM_Value > 100) if (DM_Value > 100)
DM_Value = 50; DM_Value = 50;
DM_RxPathSelTable.rf_rssi[1] = (u8)DM_Value; DM_RxPathSelTable.rf_rssi[1] = (u8)DM_Value;
} } else if (DM_Type == 12) {
else if (DM_Type == 12)
{
if (DM_Value > 100) if (DM_Value > 100)
DM_Value = 50; DM_Value = 50;
DM_RxPathSelTable.rf_rssi[2] = (u8)DM_Value; DM_RxPathSelTable.rf_rssi[2] = (u8)DM_Value;
} } else if (DM_Type == 13) {
else if (DM_Type == 13)
{
if (DM_Value > 100) if (DM_Value > 100)
DM_Value = 50; DM_Value = 50;
DM_RxPathSelTable.rf_rssi[3] = (u8)DM_Value; DM_RxPathSelTable.rf_rssi[3] = (u8)DM_Value;
} } else if (DM_Type == 20) {
else if (DM_Type == 20)
{
if (DM_Value > 1) if (DM_Value > 1)
DM_Value = 1; DM_Value = 1;
pRA->ping_rssi_enable = (u8)DM_Value; pRA->ping_rssi_enable = (u8)DM_Value;
} } else if (DM_Type == 21) {
else if (DM_Type == 21)
{
if (DM_Value > 30) if (DM_Value > 30)
DM_Value = 30; DM_Value = 30;
pRA->ping_rssi_thresh_for_ra = DM_Value; pRA->ping_rssi_thresh_for_ra = DM_Value;
...@@ -1919,16 +1821,16 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev) ...@@ -1919,16 +1821,16 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev)
struct false_alarm_stats *FalseAlmCnt = &(priv->FalseAlmCnt); struct false_alarm_stats *FalseAlmCnt = &(priv->FalseAlmCnt);
ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter1, bMaskDWord); ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter1, bMaskDWord);
FalseAlmCnt->Cnt_Parity_Fail = ((ret_value&0xffff0000)>>16); FalseAlmCnt->Cnt_Parity_Fail = ((ret_value&0xffff0000)>>16);
ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter2, bMaskDWord); ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter2, bMaskDWord);
FalseAlmCnt->Cnt_Rate_Illegal = (ret_value&0xffff); FalseAlmCnt->Cnt_Rate_Illegal = (ret_value&0xffff);
FalseAlmCnt->Cnt_Crc8_fail = ((ret_value&0xffff0000)>>16); FalseAlmCnt->Cnt_Crc8_fail = ((ret_value&0xffff0000)>>16);
ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter3, bMaskDWord); ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter3, bMaskDWord);
FalseAlmCnt->Cnt_Mcs_fail = (ret_value&0xffff); FalseAlmCnt->Cnt_Mcs_fail = (ret_value&0xffff);
FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal + FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal +
FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail; FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail;
ret_value = rtl8192_QueryBBReg(dev, 0xc64, bMaskDWord); ret_value = rtl8192_QueryBBReg(dev, 0xc64, bMaskDWord);
FalseAlmCnt->Cnt_Cck_fail = (ret_value&0xffff); FalseAlmCnt->Cnt_Cck_fail = (ret_value&0xffff);
...@@ -1939,7 +1841,8 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev) ...@@ -1939,7 +1841,8 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev)
FalseAlmCnt->Cnt_Cck_fail); FalseAlmCnt->Cnt_Cck_fail);
RT_TRACE(COMP_DIG, "Cnt_Ofdm_fail = %d, Cnt_Cck_fail = %d, Cnt_all = %d\n", RT_TRACE(COMP_DIG, "Cnt_Ofdm_fail = %d, Cnt_Cck_fail = %d, Cnt_all = %d\n",
FalseAlmCnt->Cnt_Ofdm_fail, FalseAlmCnt->Cnt_Cck_fail , FalseAlmCnt->Cnt_all); FalseAlmCnt->Cnt_Ofdm_fail, FalseAlmCnt->Cnt_Cck_fail,
FalseAlmCnt->Cnt_all);
} }
static void dm_ctrl_initgain_byrssi(struct net_device *dev) static void dm_ctrl_initgain_byrssi(struct net_device *dev)
...@@ -1979,16 +1882,15 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi( ...@@ -1979,16 +1882,15 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi(
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 i; u8 i;
static u8 fw_dig=0; static u8 fw_dig;
if (dm_digtable.dig_enable_flag == false) if (dm_digtable.dig_enable_flag == false)
return; return;
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch)
fw_dig = 0; fw_dig = 0;
if (fw_dig <= 3) if (fw_dig <= 3) {
{ for (i = 0; i < 3; i++)
for (i=0; i<3; i++)
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
fw_dig++; fw_dig++;
dm_digtable.dig_state = DM_STA_DIG_OFF; dm_digtable.dig_state = DM_STA_DIG_OFF;
...@@ -2015,16 +1917,15 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( ...@@ -2015,16 +1917,15 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
struct net_device *dev) struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u32 reset_cnt = 0; static u32 reset_cnt;
u8 i; u8 i;
if (dm_digtable.dig_enable_flag == false) if (dm_digtable.dig_enable_flag == false)
return; return;
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch) {
{
dm_digtable.dig_state = DM_STA_DIG_MAX; dm_digtable.dig_state = DM_STA_DIG_MAX;
for (i=0; i<3; i++) for (i = 0; i < 3; i++)
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1);
dm_digtable.dig_algorithm_switch = 0; dm_digtable.dig_algorithm_switch = 0;
} }
...@@ -2034,20 +1935,13 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( ...@@ -2034,20 +1935,13 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) && if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) &&
(priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh)) (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh))
{
return; return;
} if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh)) {
if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh))
{
if (dm_digtable.dig_state == DM_STA_DIG_OFF && if (dm_digtable.dig_state == DM_STA_DIG_OFF &&
(priv->reset_count == reset_cnt)) (priv->reset_count == reset_cnt))
{
return; return;
}
else else
{
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
}
dm_digtable.dig_highpwr_state = DM_STA_DIG_MAX; dm_digtable.dig_highpwr_state = DM_STA_DIG_MAX;
dm_digtable.dig_state = DM_STA_DIG_OFF; dm_digtable.dig_state = DM_STA_DIG_OFF;
...@@ -2060,30 +1954,23 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( ...@@ -2060,30 +1954,23 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x17); write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x17);
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{ write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x00);
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x00);
}
else else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); write_nic_byte(dev, rOFDM0_RxDetector1, 0x42);
write_nic_byte(dev, 0xa0a, 0x08); write_nic_byte(dev, 0xa0a, 0x08);
return; return;
} }
if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) ) if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh)) {
{
u8 reset_flag = 0; u8 reset_flag = 0;
if (dm_digtable.dig_state == DM_STA_DIG_ON && if (dm_digtable.dig_state == DM_STA_DIG_ON &&
(priv->reset_count == reset_cnt)) (priv->reset_count == reset_cnt)) {
{
dm_ctrl_initgain_byrssi_highpwr(dev); dm_ctrl_initgain_byrssi_highpwr(dev);
return; return;
} } else {
else
{
if (priv->reset_count != reset_cnt) if (priv->reset_count != reset_cnt)
reset_flag = 1; reset_flag = 1;
...@@ -2092,54 +1979,41 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( ...@@ -2092,54 +1979,41 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(
dm_digtable.dig_state = DM_STA_DIG_ON; dm_digtable.dig_state = DM_STA_DIG_ON;
if (reset_flag == 1) if (reset_flag == 1) {
{
write_nic_byte(dev, rOFDM0_XAAGCCore1, 0x2c); write_nic_byte(dev, rOFDM0_XAAGCCore1, 0x2c);
write_nic_byte(dev, rOFDM0_XBAGCCore1, 0x2c); write_nic_byte(dev, rOFDM0_XBAGCCore1, 0x2c);
write_nic_byte(dev, rOFDM0_XCAGCCore1, 0x2c); write_nic_byte(dev, rOFDM0_XCAGCCore1, 0x2c);
write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x2c); write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x2c);
} } else {
else write_nic_byte(dev, rOFDM0_XAAGCCore1, 0x20);
{ write_nic_byte(dev, rOFDM0_XBAGCCore1, 0x20);
write_nic_byte(dev, rOFDM0_XAAGCCore1, 0x20); write_nic_byte(dev, rOFDM0_XCAGCCore1, 0x20);
write_nic_byte(dev, rOFDM0_XBAGCCore1, 0x20); write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x20);
write_nic_byte(dev, rOFDM0_XCAGCCore1, 0x20);
write_nic_byte(dev, rOFDM0_XDAGCCore1, 0x20);
} }
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{ write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
}
else else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x44); write_nic_byte(dev, rOFDM0_RxDetector1, 0x44);
write_nic_byte(dev, 0xa0a, 0xcd); write_nic_byte(dev, 0xa0a, 0xcd);
rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1); rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x1);
} }
dm_ctrl_initgain_byrssi_highpwr(dev); dm_ctrl_initgain_byrssi_highpwr(dev);
} }
static void dm_ctrl_initgain_byrssi_highpwr( static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev)
struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u32 reset_cnt_highpwr = 0; static u32 reset_cnt_highpwr;
if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_high_power_lowthresh) && if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_high_power_lowthresh) &&
(priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_highthresh)) (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_highthresh))
{
return; return;
}
if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh) if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_power_highthresh) {
{
if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON && if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON &&
(priv->reset_count == reset_cnt_highpwr)) (priv->reset_count == reset_cnt_highpwr))
return; return;
...@@ -2147,84 +2021,64 @@ static void dm_ctrl_initgain_byrssi_highpwr( ...@@ -2147,84 +2021,64 @@ static void dm_ctrl_initgain_byrssi_highpwr(
dm_digtable.dig_highpwr_state = DM_STA_DIG_ON; dm_digtable.dig_highpwr_state = DM_STA_DIG_ON;
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x10); write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x10);
}
else else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x43); write_nic_byte(dev, rOFDM0_RxDetector1, 0x43);
} } else {
else if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF &&
{
if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF&&
(priv->reset_count == reset_cnt_highpwr)) (priv->reset_count == reset_cnt_highpwr))
return; return;
else else
dm_digtable.dig_highpwr_state = DM_STA_DIG_OFF; dm_digtable.dig_highpwr_state = DM_STA_DIG_OFF;
if (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_lowthresh && if (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_lowthresh &&
priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) {
{
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{ write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
}
else else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x44); write_nic_byte(dev, rOFDM0_RxDetector1, 0x44);
} }
} }
reset_cnt_highpwr = priv->reset_count; reset_cnt_highpwr = priv->reset_count;
} }
static void dm_initial_gain(struct net_device *dev)
static void dm_initial_gain(
struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 initial_gain=0; u8 initial_gain = 0;
static u8 initialized=0, force_write=0; static u8 initialized, force_write;
static u32 reset_cnt=0; static u32 reset_cnt;
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch) {
{
initialized = 0; initialized = 0;
reset_cnt = 0; reset_cnt = 0;
} }
if (rtllib_act_scanning(priv->rtllib,true) == true) if (rtllib_act_scanning(priv->rtllib, true) == true) {
{
force_write = 1; force_write = 1;
return; return;
} }
if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) {
{ if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) {
if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT)
{
if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) > dm_digtable.rx_gain_range_max) if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) > dm_digtable.rx_gain_range_max)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max; dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max;
else if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min) else if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_min; dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_min;
else else
dm_digtable.cur_ig_value = dm_digtable.rssi_val+10-dm_digtable.backoff_val; dm_digtable.cur_ig_value = dm_digtable.rssi_val+10-dm_digtable.backoff_val;
} } else {
else
{
if (dm_digtable.cur_ig_value == 0) if (dm_digtable.cur_ig_value == 0)
dm_digtable.cur_ig_value = priv->DefaultInitialGain[0]; dm_digtable.cur_ig_value = priv->DefaultInitialGain[0];
else else
dm_digtable.cur_ig_value = dm_digtable.pre_ig_value; dm_digtable.cur_ig_value = dm_digtable.pre_ig_value;
} }
} } else {
else
{
dm_digtable.cur_ig_value = priv->DefaultInitialGain[0]; dm_digtable.cur_ig_value = priv->DefaultInitialGain[0];
dm_digtable.pre_ig_value = 0; dm_digtable.pre_ig_value = 0;
} }
if (priv->reset_count != reset_cnt) if (priv->reset_count != reset_cnt) {
{
force_write = 1; force_write = 1;
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
} }
...@@ -2232,82 +2086,70 @@ static void dm_initial_gain( ...@@ -2232,82 +2086,70 @@ static void dm_initial_gain(
if (dm_digtable.pre_ig_value != read_nic_byte(dev, rOFDM0_XAAGCCore1)) if (dm_digtable.pre_ig_value != read_nic_byte(dev, rOFDM0_XAAGCCore1))
force_write = 1; force_write = 1;
{ if ((dm_digtable.pre_ig_value != dm_digtable.cur_ig_value)
if ((dm_digtable.pre_ig_value != dm_digtable.cur_ig_value) || !initialized || force_write) {
|| !initialized || force_write) initial_gain = (u8)dm_digtable.cur_ig_value;
{ write_nic_byte(dev, rOFDM0_XAAGCCore1, initial_gain);
initial_gain = (u8)dm_digtable.cur_ig_value; write_nic_byte(dev, rOFDM0_XBAGCCore1, initial_gain);
write_nic_byte(dev, rOFDM0_XAAGCCore1, initial_gain); write_nic_byte(dev, rOFDM0_XCAGCCore1, initial_gain);
write_nic_byte(dev, rOFDM0_XBAGCCore1, initial_gain); write_nic_byte(dev, rOFDM0_XDAGCCore1, initial_gain);
write_nic_byte(dev, rOFDM0_XCAGCCore1, initial_gain); dm_digtable.pre_ig_value = dm_digtable.cur_ig_value;
write_nic_byte(dev, rOFDM0_XDAGCCore1, initial_gain); initialized = 1;
dm_digtable.pre_ig_value = dm_digtable.cur_ig_value; force_write = 0;
initialized = 1;
force_write = 0;
}
} }
} }
void dm_initial_gain_STABeforeConnect( void dm_initial_gain_STABeforeConnect(
struct net_device * dev) struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 initial_gain=0; u8 initial_gain = 0;
static u8 initialized=0, force_write=0; static u8 initialized, force_write;
RT_TRACE(COMP_DIG, "PreSTAConnectState = %x, CurSTAConnectState = %x\n", RT_TRACE(COMP_DIG, "PreSTAConnectState = %x, CurSTAConnectState = %x\n",
dm_digtable.PreSTAConnectState, dm_digtable.CurSTAConnectState); dm_digtable.PreSTAConnectState, dm_digtable.CurSTAConnectState);
if ((dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) || if ((dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) ||
(dm_digtable.CurSTAConnectState == DIG_STA_BEFORE_CONNECT)) (dm_digtable.CurSTAConnectState == DIG_STA_BEFORE_CONNECT)) {
{ if (dm_digtable.CurSTAConnectState == DIG_STA_BEFORE_CONNECT) {
if (dm_digtable.CurSTAConnectState == DIG_STA_BEFORE_CONNECT)
{
if (priv->rtllib->eRFPowerState != eRfOn) if (priv->rtllib->eRFPowerState != eRfOn)
return; return;
if (dm_digtable.Backoff_Enable_Flag == true) if (dm_digtable.Backoff_Enable_Flag == true) {
{ if (priv->FalseAlmCnt.Cnt_all > dm_digtable.FAHighThresh) {
if (priv->FalseAlmCnt.Cnt_all > dm_digtable.FAHighThresh) if ((dm_digtable.backoff_val - 6) < dm_digtable.BackoffVal_range_min)
{
if ((dm_digtable.backoff_val -6) < dm_digtable.BackoffVal_range_min)
dm_digtable.backoff_val = dm_digtable.BackoffVal_range_min; dm_digtable.backoff_val = dm_digtable.BackoffVal_range_min;
else else
dm_digtable.backoff_val -= 6; dm_digtable.backoff_val -= 6;
} } else if (priv->FalseAlmCnt.Cnt_all < dm_digtable.FALowThresh) {
else if (priv->FalseAlmCnt.Cnt_all < dm_digtable.FALowThresh) if ((dm_digtable.backoff_val + 6) > dm_digtable.BackoffVal_range_max)
{
if ((dm_digtable.backoff_val+6) > dm_digtable.BackoffVal_range_max)
dm_digtable.backoff_val = dm_digtable.BackoffVal_range_max; dm_digtable.backoff_val = dm_digtable.BackoffVal_range_max;
else else
dm_digtable.backoff_val +=6; dm_digtable.backoff_val += 6;
} }
} } else
else dm_digtable.backoff_val = DM_DIG_BACKOFF;
dm_digtable.backoff_val =DM_DIG_BACKOFF;
if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) > dm_digtable.rx_gain_range_max) if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) > dm_digtable.rx_gain_range_max)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max; dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max;
else if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min) else if ((dm_digtable.rssi_val+10-dm_digtable.backoff_val) < dm_digtable.rx_gain_range_min)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_min; dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_min;
else else
dm_digtable.cur_ig_value = dm_digtable.rssi_val+10-dm_digtable.backoff_val; dm_digtable.cur_ig_value = dm_digtable.rssi_val + 10 -
dm_digtable.backoff_val;
if (priv->FalseAlmCnt.Cnt_all > 10000) if (priv->FalseAlmCnt.Cnt_all > 10000)
dm_digtable.cur_ig_value = (dm_digtable.cur_ig_value>0x33)?dm_digtable.cur_ig_value:0x33; dm_digtable.cur_ig_value = (dm_digtable.cur_ig_value > 0x33) ?
dm_digtable.cur_ig_value : 0x33;
if (priv->FalseAlmCnt.Cnt_all > 16000) if (priv->FalseAlmCnt.Cnt_all > 16000)
dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max; dm_digtable.cur_ig_value = dm_digtable.rx_gain_range_max;
} } else {
else
{
return; return;
} }
} } else {
else
{
dm_digtable.Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX; dm_digtable.Dig_Ext_Port_Stage = DIG_EXT_PORT_STAGE_MAX;
priv->rtllib->SetFwCmdHandler(dev, FW_CMD_DIG_ENABLE); priv->rtllib->SetFwCmdHandler(dev, FW_CMD_DIG_ENABLE);
...@@ -2317,44 +2159,44 @@ void dm_initial_gain_STABeforeConnect( ...@@ -2317,44 +2159,44 @@ void dm_initial_gain_STABeforeConnect(
return; return;
} }
if (dm_digtable.pre_ig_value != rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, bMaskByte0)) if (dm_digtable.pre_ig_value != rtl8192_QueryBBReg(dev,
rOFDM0_XAAGCCore1, bMaskByte0))
force_write = 1; force_write = 1;
if ((dm_digtable.pre_ig_value != dm_digtable.cur_ig_value) || !initialized || force_write) if ((dm_digtable.pre_ig_value != dm_digtable.cur_ig_value) ||
{ !initialized || force_write) {
priv->rtllib->SetFwCmdHandler(dev, FW_CMD_DIG_DISABLE); priv->rtllib->SetFwCmdHandler(dev, FW_CMD_DIG_DISABLE);
initial_gain = (u8)dm_digtable.cur_ig_value; initial_gain = (u8)dm_digtable.cur_ig_value;
rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bMaskByte0, initial_gain); rtl8192_setBBreg(dev, rOFDM0_XAAGCCore1, bMaskByte0,
rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bMaskByte0, initial_gain); initial_gain);
rtl8192_setBBreg(dev, rOFDM0_XBAGCCore1, bMaskByte0,
initial_gain);
dm_digtable.pre_ig_value = dm_digtable.cur_ig_value; dm_digtable.pre_ig_value = dm_digtable.cur_ig_value;
initialized = 1; initialized = 1;
force_write = 0; force_write = 0;
} }
RT_TRACE(COMP_DIG, "CurIGValue = 0x%x, pre_ig_value = 0x%x, backoff_val = %d\n", RT_TRACE(COMP_DIG, "CurIGValue = 0x%x, pre_ig_value = 0x%x, "
dm_digtable.cur_ig_value, dm_digtable.pre_ig_value, dm_digtable.backoff_val); "backoff_val = %d\n", dm_digtable.cur_ig_value,
dm_digtable.pre_ig_value, dm_digtable.backoff_val);
} }
static void dm_pd_th( static void dm_pd_th(struct net_device *dev)
struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u8 initialized=0, force_write=0; static u8 initialized, force_write;
static u32 reset_cnt = 0; static u32 reset_cnt;
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch) {
{
initialized = 0; initialized = 0;
reset_cnt = 0; reset_cnt = 0;
} }
if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) {
{ if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) {
if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT)
{
if (dm_digtable.rssi_val >= dm_digtable.rssi_high_power_highthresh) if (dm_digtable.rssi_val >= dm_digtable.rssi_high_power_highthresh)
dm_digtable.curpd_thstate = DIG_PD_AT_HIGH_POWER; dm_digtable.curpd_thstate = DIG_PD_AT_HIGH_POWER;
else if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) else if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh))
...@@ -2364,123 +2206,88 @@ static void dm_pd_th( ...@@ -2364,123 +2206,88 @@ static void dm_pd_th(
dm_digtable.curpd_thstate = DIG_PD_AT_NORMAL_POWER; dm_digtable.curpd_thstate = DIG_PD_AT_NORMAL_POWER;
else else
dm_digtable.curpd_thstate = dm_digtable.prepd_thstate; dm_digtable.curpd_thstate = dm_digtable.prepd_thstate;
} } else {
else
{
dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER; dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER;
} }
} } else {
else
{
dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER; dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER;
} }
if (priv->reset_count != reset_cnt) if (priv->reset_count != reset_cnt) {
{
force_write = 1; force_write = 1;
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
} }
{ if ((dm_digtable.prepd_thstate != dm_digtable.curpd_thstate) ||
if ((dm_digtable.prepd_thstate != dm_digtable.curpd_thstate) || (initialized <= 3) || force_write) {
(initialized<=3) || force_write) if (dm_digtable.curpd_thstate == DIG_PD_AT_LOW_POWER) {
{ if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
if (dm_digtable.curpd_thstate == DIG_PD_AT_LOW_POWER) write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x00);
{ else
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) write_nic_byte(dev, rOFDM0_RxDetector1, 0x42);
{ } else if (dm_digtable.curpd_thstate == DIG_PD_AT_NORMAL_POWER) {
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x00); if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
} write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
else else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x42); write_nic_byte(dev, rOFDM0_RxDetector1, 0x44);
} } else if (dm_digtable.curpd_thstate == DIG_PD_AT_HIGH_POWER) {
else if (dm_digtable.curpd_thstate == DIG_PD_AT_NORMAL_POWER) if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{ write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x10);
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) else
{ write_nic_byte(dev, rOFDM0_RxDetector1, 0x43);
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x20);
}
else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x44);
}
else if (dm_digtable.curpd_thstate == DIG_PD_AT_HIGH_POWER)
{
if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
{
write_nic_byte(dev, (rOFDM0_XATxAFE+3), 0x10);
}
else
write_nic_byte(dev, rOFDM0_RxDetector1, 0x43);
}
dm_digtable.prepd_thstate = dm_digtable.curpd_thstate;
if (initialized <= 3)
initialized++;
force_write = 0;
} }
dm_digtable.prepd_thstate = dm_digtable.curpd_thstate;
if (initialized <= 3)
initialized++;
force_write = 0;
} }
} }
static void dm_cs_ratio( static void dm_cs_ratio(struct net_device *dev)
struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u8 initialized=0,force_write=0; static u8 initialized, force_write;
static u32 reset_cnt = 0; static u32 reset_cnt;
if (dm_digtable.dig_algorithm_switch) if (dm_digtable.dig_algorithm_switch) {
{
initialized = 0; initialized = 0;
reset_cnt = 0; reset_cnt = 0;
} }
if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) {
{ if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) {
if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT)
{
if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh))
dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER;
else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) ) else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh))
dm_digtable.curcs_ratio_state = DIG_CS_RATIO_HIGHER; dm_digtable.curcs_ratio_state = DIG_CS_RATIO_HIGHER;
else else
dm_digtable.curcs_ratio_state = dm_digtable.precs_ratio_state; dm_digtable.curcs_ratio_state = dm_digtable.precs_ratio_state;
} } else {
else
{
dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER;
} }
} } else {
else
{
dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER;
} }
if (priv->reset_count != reset_cnt) if (priv->reset_count != reset_cnt) {
{
force_write = 1; force_write = 1;
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
} }
{ if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) ||
if ((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) || !initialized || force_write) {
!initialized || force_write) if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER)
{ write_nic_byte(dev, 0xa0a, 0x08);
if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER) else if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_HIGHER)
{ write_nic_byte(dev, 0xa0a, 0xcd);
write_nic_byte(dev, 0xa0a, 0x08); dm_digtable.precs_ratio_state = dm_digtable.curcs_ratio_state;
} initialized = 1;
else if (dm_digtable.curcs_ratio_state == DIG_CS_RATIO_HIGHER) force_write = 0;
{
write_nic_byte(dev, 0xa0a, 0xcd);
}
dm_digtable.precs_ratio_state = dm_digtable.curcs_ratio_state;
initialized = 1;
force_write = 0;
}
} }
} }
extern void dm_init_edca_turbo(struct net_device * dev) extern void dm_init_edca_turbo(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -2489,98 +2296,89 @@ extern void dm_init_edca_turbo(struct net_device * dev) ...@@ -2489,98 +2296,89 @@ extern void dm_init_edca_turbo(struct net_device * dev)
priv->bis_cur_rdlstate = false; priv->bis_cur_rdlstate = false;
} }
static void dm_check_edca_turbo( static void dm_check_edca_turbo(struct net_device *dev)
struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo; struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;
static unsigned long lastTxOkCnt = 0; static unsigned long lastTxOkCnt;
static unsigned long lastRxOkCnt = 0; static unsigned long lastRxOkCnt;
unsigned long curTxOkCnt = 0; unsigned long curTxOkCnt = 0;
unsigned long curRxOkCnt = 0; unsigned long curRxOkCnt = 0;
if (priv->rtllib->iw_mode == IW_MODE_ADHOC) if (priv->rtllib->iw_mode == IW_MODE_ADHOC)
{
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
}
if (priv->rtllib->state != RTLLIB_LINKED) if (priv->rtllib->state != RTLLIB_LINKED)
{
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
}
if (priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO) if (priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO)
{
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
}
{ {
u8* peername[11] = {"unknown", "realtek_90", "realtek_92se","broadcom", "ralink", "atheros", "cisco", "marvell", "92u_softap", "self_softap"}; u8 *peername[11] = {
static int wb_tmp = 0; "unknown", "realtek_90", "realtek_92se", "broadcom",
if (wb_tmp == 0){ "ralink", "atheros", "cisco", "marvell", "92u_softap",
printk("%s():iot peer is %s, bssid:"MAC_FMT"\n",__func__,peername[pHTInfo->IOTPeer], MAC_ARG(priv->rtllib->current_network.bssid)); "self_softap"
};
static int wb_tmp;
if (wb_tmp == 0) {
printk(KERN_INFO "%s():iot peer is %s, bssid:"
MAC_FMT"\n", __func__,
peername[pHTInfo->IOTPeer],
MAC_ARG(priv->rtllib->current_network.bssid));
wb_tmp = 1; wb_tmp = 1;
} }
} }
if (!priv->rtllib->bis_any_nonbepkts) if (!priv->rtllib->bis_any_nonbepkts) {
{
curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;
curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;
if (pHTInfo->IOTAction & HT_IOT_ACT_EDCA_BIAS_ON_RX) if (pHTInfo->IOTAction & HT_IOT_ACT_EDCA_BIAS_ON_RX) {
{ if (curTxOkCnt > 4*curRxOkCnt) {
if (curTxOkCnt > 4*curRxOkCnt) if (priv->bis_cur_rdlstate ||
{ !priv->bcurrent_turbo_EDCA) {
if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) write_nic_dword(dev, EDCAPARA_BE,
{ edca_setting_UL[pHTInfo->IOTPeer]);
write_nic_dword(dev, EDCAPARA_BE, edca_setting_UL[pHTInfo->IOTPeer]);
priv->bis_cur_rdlstate = false; priv->bis_cur_rdlstate = false;
} }
} } else {
else if (!priv->bis_cur_rdlstate ||
{ !priv->bcurrent_turbo_EDCA) {
if (!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)
{
if (priv->rtllib->mode == WIRELESS_MODE_G) if (priv->rtllib->mode == WIRELESS_MODE_G)
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL_GMode[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE,
edca_setting_DL_GMode[pHTInfo->IOTPeer]);
else else
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE,
edca_setting_DL[pHTInfo->IOTPeer]);
priv->bis_cur_rdlstate = true; priv->bis_cur_rdlstate = true;
} }
} }
priv->bcurrent_turbo_EDCA = true; priv->bcurrent_turbo_EDCA = true;
} } else {
else if (curRxOkCnt > 4*curTxOkCnt) {
{ if (!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) {
if (curRxOkCnt > 4*curTxOkCnt) if (priv->rtllib->mode == WIRELESS_MODE_G)
{ write_nic_dword(dev, EDCAPARA_BE,
if (!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) edca_setting_DL_GMode[pHTInfo->IOTPeer]);
{ else
if (priv->rtllib->mode == WIRELESS_MODE_G) write_nic_dword(dev, EDCAPARA_BE,
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL_GMode[pHTInfo->IOTPeer]); edca_setting_DL[pHTInfo->IOTPeer]);
else priv->bis_cur_rdlstate = true;
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL[pHTInfo->IOTPeer]); }
priv->bis_cur_rdlstate = true; } else {
} if (priv->bis_cur_rdlstate ||
} !priv->bcurrent_turbo_EDCA) {
else write_nic_dword(dev, EDCAPARA_BE,
{ edca_setting_UL[pHTInfo->IOTPeer]);
if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) priv->bis_cur_rdlstate = false;
{ }
write_nic_dword(dev, EDCAPARA_BE, edca_setting_UL[pHTInfo->IOTPeer]);
priv->bis_cur_rdlstate = false;
} }
priv->bcurrent_turbo_EDCA = true;
} }
} else {
priv->bcurrent_turbo_EDCA = true; if (priv->bcurrent_turbo_EDCA) {
} u8 tmp = AC0_BE;
} priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&tmp));
else
{
if (priv->bcurrent_turbo_EDCA)
{
u8 tmp = AC0_BE;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8*)(&tmp) );
priv->bcurrent_turbo_EDCA = false; priv->bcurrent_turbo_EDCA = false;
} }
} }
...@@ -2592,25 +2390,23 @@ static void dm_check_edca_turbo( ...@@ -2592,25 +2390,23 @@ static void dm_check_edca_turbo(
lastRxOkCnt = priv->stats.rxbytesunicast; lastRxOkCnt = priv->stats.rxbytesunicast;
} }
extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value) extern void DM_CTSToSelfSetting(struct net_device *dev, u32 DM_Type,
u32 DM_Value)
{ {
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev); struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
if (DM_Type == 0) if (DM_Type == 0) {
{
if (DM_Value > 1) if (DM_Value > 1)
DM_Value = 1; DM_Value = 1;
priv->rtllib->bCTSToSelfEnable = (bool)DM_Value; priv->rtllib->bCTSToSelfEnable = (bool)DM_Value;
} } else if (DM_Type == 1) {
else if (DM_Type == 1)
{
if (DM_Value >= 50) if (DM_Value >= 50)
DM_Value = 50; DM_Value = 50;
priv->rtllib->CTSToSelfTH = (u8)DM_Value; priv->rtllib->CTSToSelfTH = (u8)DM_Value;
} }
} }
static void dm_init_ctstoself(struct net_device * dev) static void dm_init_ctstoself(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev); struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
...@@ -2622,28 +2418,22 @@ static void dm_ctstoself(struct net_device *dev) ...@@ -2622,28 +2418,22 @@ static void dm_ctstoself(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev); struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo; struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;
static unsigned long lastTxOkCnt = 0; static unsigned long lastTxOkCnt;
static unsigned long lastRxOkCnt = 0; static unsigned long lastRxOkCnt;
unsigned long curTxOkCnt = 0; unsigned long curTxOkCnt = 0;
unsigned long curRxOkCnt = 0; unsigned long curRxOkCnt = 0;
if (priv->rtllib->bCTSToSelfEnable != true) if (priv->rtllib->bCTSToSelfEnable != true) {
{
pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF; pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
return; return;
} }
if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) {
{
curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;
curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;
if (curRxOkCnt > 4*curTxOkCnt) if (curRxOkCnt > 4*curTxOkCnt)
{
pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF; pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;
}
else else
{
pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF; pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;
}
lastTxOkCnt = priv->stats.txbytesunicast; lastTxOkCnt = priv->stats.txbytesunicast;
lastRxOkCnt = priv->stats.rxbytesunicast; lastRxOkCnt = priv->stats.rxbytesunicast;
...@@ -2651,8 +2441,7 @@ static void dm_ctstoself(struct net_device *dev) ...@@ -2651,8 +2441,7 @@ static void dm_ctstoself(struct net_device *dev)
} }
static void static void dm_Init_WA_Broadcom_IOT(struct net_device *dev)
dm_Init_WA_Broadcom_IOT(struct net_device * dev)
{ {
struct r8192_priv *priv = rtllib_priv((struct net_device *)dev); struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo; struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;
...@@ -2665,78 +2454,65 @@ static void dm_check_pbc_gpio(struct net_device *dev) ...@@ -2665,78 +2454,65 @@ static void dm_check_pbc_gpio(struct net_device *dev)
{ {
} }
extern void dm_CheckRfCtrlGPIO(void *data) extern void dm_CheckRfCtrlGPIO(void *data)
{ {
struct r8192_priv *priv = container_of_dwork_rsl(data, struct r8192_priv,gpio_change_rf_wq); struct r8192_priv *priv = container_of_dwork_rsl(data,
struct net_device *dev = priv->rtllib->dev; struct r8192_priv, gpio_change_rf_wq);
struct net_device *dev = priv->rtllib->dev;
u8 tmp1byte; u8 tmp1byte;
enum rt_rf_power_state eRfPowerStateToSet; enum rt_rf_power_state eRfPowerStateToSet;
bool bActuallySet = false; bool bActuallySet = false;
char *argv[3]; char *argv[3];
static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh"; static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL}; static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL};
bActuallySet=false; bActuallySet = false;
if ((priv->up_first_time == 1) || (priv->being_init_adapter)) if ((priv->up_first_time == 1) || (priv->being_init_adapter))
{
return; return;
}
if (priv->bfirst_after_down){ if (priv->bfirst_after_down) {
priv->bfirst_after_down = 1; priv->bfirst_after_down = 1;
return; return;
} }
tmp1byte = read_nic_byte(dev, GPI);
eRfPowerStateToSet = (tmp1byte&BIT1) ? eRfOn : eRfOff;
{ if ((priv->bHwRadioOff == true) && (eRfPowerStateToSet == eRfOn)) {
tmp1byte = read_nic_byte(dev,GPI); RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio ON\n");
printk(KERN_INFO "gpiochangeRF - HW Radio ON\n");
eRfPowerStateToSet = (tmp1byte&BIT1) ? eRfOn : eRfOff; priv->bHwRadioOff = false;
bActuallySet = true;
if ( (priv->bHwRadioOff == true) && (eRfPowerStateToSet == eRfOn)) } else if ((priv->bHwRadioOff == false) && (eRfPowerStateToSet == eRfOff)) {
{ RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio OFF\n");
RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio ON\n"); printk(KERN_INFO "gpiochangeRF - HW Radio OFF\n");
printk("gpiochangeRF - HW Radio ON\n"); priv->bHwRadioOff = true;
priv->bHwRadioOff = false; bActuallySet = true;
bActuallySet = true; }
}
else if ( (priv->bHwRadioOff == false) && (eRfPowerStateToSet == eRfOff))
{
RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio OFF\n");
printk("gpiochangeRF - HW Radio OFF\n");
priv->bHwRadioOff = true;
bActuallySet = true;
}
if (bActuallySet)
{
mdelay(1000);
priv->bHwRfOffAction = 1;
MgntActSet_RF_State(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW,true);
{
if (priv->bHwRadioOff == true)
argv[1] = "RFOFF";
else
argv[1] = "RFON";
argv[0] = RadioPowerPath; if (bActuallySet) {
argv[2] = NULL; mdelay(1000);
call_usermodehelper(RadioPowerPath,argv,envp,1); priv->bHwRfOffAction = 1;
} MgntActSet_RF_State(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW, true);
if (priv->bHwRadioOff == true)
argv[1] = "RFOFF";
else
argv[1] = "RFON";
} argv[0] = RadioPowerPath;
argv[2] = NULL;
call_usermodehelper(RadioPowerPath, argv, envp, 1);
} }
} }
void dm_rf_pathcheck_workitemcallback(void *data) void dm_rf_pathcheck_workitemcallback(void *data)
{ {
struct r8192_priv *priv = container_of_dwork_rsl(data, struct r8192_priv,rfpath_check_wq); struct r8192_priv *priv = container_of_dwork_rsl(data,
struct net_device *dev =priv->rtllib->dev; struct r8192_priv,
rfpath_check_wq);
struct net_device *dev = priv->rtllib->dev;
u8 rfpath = 0, i; u8 rfpath = 0, i;
rfpath = read_nic_byte(dev, 0xc04); rfpath = read_nic_byte(dev, 0xc04);
...@@ -2753,10 +2529,11 @@ void dm_rf_pathcheck_workitemcallback(void *data) ...@@ -2753,10 +2529,11 @@ void dm_rf_pathcheck_workitemcallback(void *data)
dm_rxpath_sel_byrssi(dev); dm_rxpath_sel_byrssi(dev);
} }
static void dm_init_rxpath_selection(struct net_device * dev) static void dm_init_rxpath_selection(struct net_device *dev)
{ {
u8 i; u8 i;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
DM_RxPathSelTable.Enable = 1; DM_RxPathSelTable.Enable = 1;
DM_RxPathSelTable.SS_TH_low = RxPathSelection_SS_TH_low; DM_RxPathSelTable.SS_TH_low = RxPathSelection_SS_TH_low;
DM_RxPathSelTable.diff_TH = RxPathSelection_diff_TH; DM_RxPathSelTable.diff_TH = RxPathSelection_diff_TH;
...@@ -2766,119 +2543,92 @@ static void dm_init_rxpath_selection(struct net_device * dev) ...@@ -2766,119 +2543,92 @@ static void dm_init_rxpath_selection(struct net_device * dev)
DM_RxPathSelTable.cck_method = CCK_Rx_Version_1; DM_RxPathSelTable.cck_method = CCK_Rx_Version_1;
DM_RxPathSelTable.DbgMode = DM_DBG_OFF; DM_RxPathSelTable.DbgMode = DM_DBG_OFF;
DM_RxPathSelTable.disabledRF = 0; DM_RxPathSelTable.disabledRF = 0;
for (i=0; i<4; i++) for (i = 0; i < 4; i++) {
{
DM_RxPathSelTable.rf_rssi[i] = 50; DM_RxPathSelTable.rf_rssi[i] = 50;
DM_RxPathSelTable.cck_pwdb_sta[i] = -64; DM_RxPathSelTable.cck_pwdb_sta[i] = -64;
DM_RxPathSelTable.rf_enable_rssi_th[i] = 100; DM_RxPathSelTable.rf_enable_rssi_th[i] = 100;
} }
} }
static void dm_rxpath_sel_byrssi(struct net_device * dev) #define PWDB_IN_RANGE ((cur_cck_pwdb < tmp_cck_max_pwdb) && \
(cur_cck_pwdb > tmp_cck_sec_pwdb))
static void dm_rxpath_sel_byrssi(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 i, max_rssi_index=0, min_rssi_index=0, sec_rssi_index=0, rf_num=0; u8 i, max_rssi_index = 0, min_rssi_index = 0;
u8 tmp_max_rssi=0, tmp_min_rssi=0, tmp_sec_rssi=0; u8 sec_rssi_index = 0, rf_num = 0;
u8 cck_default_Rx=0x2; u8 tmp_max_rssi = 0, tmp_min_rssi = 0, tmp_sec_rssi = 0;
u8 cck_optional_Rx=0x3; u8 cck_default_Rx = 0x2;
long tmp_cck_max_pwdb=0, tmp_cck_min_pwdb=0, tmp_cck_sec_pwdb=0; u8 cck_optional_Rx = 0x3;
u8 cck_rx_ver2_max_index=0, cck_rx_ver2_min_index=0, cck_rx_ver2_sec_index=0; long tmp_cck_max_pwdb = 0, tmp_cck_min_pwdb = 0, tmp_cck_sec_pwdb = 0;
u8 cur_rf_rssi; u8 cck_rx_ver2_max_index = 0, cck_rx_ver2_min_index = 0;
long cur_cck_pwdb; u8 cck_rx_ver2_sec_index = 0;
static u8 disabled_rf_cnt=0, cck_Rx_Path_initialized=0; u8 cur_rf_rssi;
u8 update_cck_rx_path; long cur_cck_pwdb;
static u8 disabled_rf_cnt, cck_Rx_Path_initialized;
u8 update_cck_rx_path;
if (priv->rf_type != RF_2T4R) if (priv->rf_type != RF_2T4R)
return; return;
if (!cck_Rx_Path_initialized) if (!cck_Rx_Path_initialized) {
{
DM_RxPathSelTable.cck_Rx_path = (read_nic_byte(dev, 0xa07)&0xf); DM_RxPathSelTable.cck_Rx_path = (read_nic_byte(dev, 0xa07)&0xf);
cck_Rx_Path_initialized = 1; cck_Rx_Path_initialized = 1;
} }
DM_RxPathSelTable.disabledRF = 0xf; DM_RxPathSelTable.disabledRF = 0xf;
DM_RxPathSelTable.disabledRF &=~ (read_nic_byte(dev, 0xc04)); DM_RxPathSelTable.disabledRF &= ~(read_nic_byte(dev, 0xc04));
if (priv->rtllib->mode == WIRELESS_MODE_B) if (priv->rtllib->mode == WIRELESS_MODE_B)
{
DM_RxPathSelTable.cck_method = CCK_Rx_Version_2; DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;
}
for (i=0; i<RF90_PATH_MAX; i++) for (i = 0; i < RF90_PATH_MAX; i++) {
{
if (!DM_RxPathSelTable.DbgMode) if (!DM_RxPathSelTable.DbgMode)
DM_RxPathSelTable.rf_rssi[i] = priv->stats.rx_rssi_percentage[i]; DM_RxPathSelTable.rf_rssi[i] = priv->stats.rx_rssi_percentage[i];
if (priv->brfpath_rxenable[i]) if (priv->brfpath_rxenable[i]) {
{
rf_num++; rf_num++;
cur_rf_rssi = DM_RxPathSelTable.rf_rssi[i]; cur_rf_rssi = DM_RxPathSelTable.rf_rssi[i];
if (rf_num == 1) if (rf_num == 1) {
{
max_rssi_index = min_rssi_index = sec_rssi_index = i; max_rssi_index = min_rssi_index = sec_rssi_index = i;
tmp_max_rssi = tmp_min_rssi = tmp_sec_rssi = cur_rf_rssi; tmp_max_rssi = tmp_min_rssi = tmp_sec_rssi = cur_rf_rssi;
} } else if (rf_num == 2) {
else if (rf_num == 2) if (cur_rf_rssi >= tmp_max_rssi) {
{
if (cur_rf_rssi >= tmp_max_rssi)
{
tmp_max_rssi = cur_rf_rssi; tmp_max_rssi = cur_rf_rssi;
max_rssi_index = i; max_rssi_index = i;
} } else {
else
{
tmp_sec_rssi = tmp_min_rssi = cur_rf_rssi; tmp_sec_rssi = tmp_min_rssi = cur_rf_rssi;
sec_rssi_index = min_rssi_index = i; sec_rssi_index = min_rssi_index = i;
} }
} } else {
else if (cur_rf_rssi > tmp_max_rssi) {
{
if (cur_rf_rssi > tmp_max_rssi)
{
tmp_sec_rssi = tmp_max_rssi; tmp_sec_rssi = tmp_max_rssi;
sec_rssi_index = max_rssi_index; sec_rssi_index = max_rssi_index;
tmp_max_rssi = cur_rf_rssi; tmp_max_rssi = cur_rf_rssi;
max_rssi_index = i; max_rssi_index = i;
} } else if (cur_rf_rssi == tmp_max_rssi) {
else if (cur_rf_rssi == tmp_max_rssi)
{
tmp_sec_rssi = cur_rf_rssi; tmp_sec_rssi = cur_rf_rssi;
sec_rssi_index = i; sec_rssi_index = i;
} } else if ((cur_rf_rssi < tmp_max_rssi) &&
else if ((cur_rf_rssi < tmp_max_rssi) &&(cur_rf_rssi > tmp_sec_rssi)) (cur_rf_rssi > tmp_sec_rssi)) {
{
tmp_sec_rssi = cur_rf_rssi; tmp_sec_rssi = cur_rf_rssi;
sec_rssi_index = i; sec_rssi_index = i;
} } else if (cur_rf_rssi == tmp_sec_rssi) {
else if (cur_rf_rssi == tmp_sec_rssi) if (tmp_sec_rssi == tmp_min_rssi) {
{
if (tmp_sec_rssi == tmp_min_rssi)
{
tmp_sec_rssi = cur_rf_rssi; tmp_sec_rssi = cur_rf_rssi;
sec_rssi_index = i; sec_rssi_index = i;
} }
else } else if ((cur_rf_rssi < tmp_sec_rssi) &&
{ (cur_rf_rssi > tmp_min_rssi)) {
} ;
} } else if (cur_rf_rssi == tmp_min_rssi) {
else if ((cur_rf_rssi < tmp_sec_rssi) && (cur_rf_rssi > tmp_min_rssi)) if (tmp_sec_rssi == tmp_min_rssi) {
{
}
else if (cur_rf_rssi == tmp_min_rssi)
{
if (tmp_sec_rssi == tmp_min_rssi)
{
tmp_min_rssi = cur_rf_rssi; tmp_min_rssi = cur_rf_rssi;
min_rssi_index = i; min_rssi_index = i;
} }
else } else if (cur_rf_rssi < tmp_min_rssi) {
{
}
}
else if (cur_rf_rssi < tmp_min_rssi)
{
tmp_min_rssi = cur_rf_rssi; tmp_min_rssi = cur_rf_rssi;
min_rssi_index = i; min_rssi_index = i;
} }
...@@ -2887,79 +2637,63 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) ...@@ -2887,79 +2637,63 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev)
} }
rf_num = 0; rf_num = 0;
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) {
{ for (i = 0; i < RF90_PATH_MAX; i++) {
for (i=0; i<RF90_PATH_MAX; i++) if (priv->brfpath_rxenable[i]) {
{
if (priv->brfpath_rxenable[i])
{
rf_num++; rf_num++;
cur_cck_pwdb = DM_RxPathSelTable.cck_pwdb_sta[i]; cur_cck_pwdb =
DM_RxPathSelTable.cck_pwdb_sta[i];
if (rf_num == 1)
{ if (rf_num == 1) {
cck_rx_ver2_max_index = cck_rx_ver2_min_index = cck_rx_ver2_sec_index = i; cck_rx_ver2_max_index = i;
tmp_cck_max_pwdb = tmp_cck_min_pwdb = tmp_cck_sec_pwdb = cur_cck_pwdb; cck_rx_ver2_min_index = i;
} cck_rx_ver2_sec_index = i;
else if (rf_num == 2) tmp_cck_max_pwdb = cur_cck_pwdb;
{ tmp_cck_min_pwdb = cur_cck_pwdb;
if (cur_cck_pwdb >= tmp_cck_max_pwdb) tmp_cck_sec_pwdb = cur_cck_pwdb;
{ } else if (rf_num == 2) {
if (cur_cck_pwdb >= tmp_cck_max_pwdb) {
tmp_cck_max_pwdb = cur_cck_pwdb; tmp_cck_max_pwdb = cur_cck_pwdb;
cck_rx_ver2_max_index = i; cck_rx_ver2_max_index = i;
} else {
tmp_cck_sec_pwdb = cur_cck_pwdb;
tmp_cck_min_pwdb = cur_cck_pwdb;
cck_rx_ver2_sec_index = i;
cck_rx_ver2_min_index = i;
} }
else } else {
{ if (cur_cck_pwdb > tmp_cck_max_pwdb) {
tmp_cck_sec_pwdb = tmp_cck_min_pwdb = cur_cck_pwdb; tmp_cck_sec_pwdb =
cck_rx_ver2_sec_index = cck_rx_ver2_min_index = i; tmp_cck_max_pwdb;
} cck_rx_ver2_sec_index =
} cck_rx_ver2_max_index;
else
{
if (cur_cck_pwdb > tmp_cck_max_pwdb)
{
tmp_cck_sec_pwdb = tmp_cck_max_pwdb;
cck_rx_ver2_sec_index = cck_rx_ver2_max_index;
tmp_cck_max_pwdb = cur_cck_pwdb; tmp_cck_max_pwdb = cur_cck_pwdb;
cck_rx_ver2_max_index = i; cck_rx_ver2_max_index = i;
} } else if (cur_cck_pwdb ==
else if (cur_cck_pwdb == tmp_cck_max_pwdb) tmp_cck_max_pwdb) {
{
tmp_cck_sec_pwdb = cur_cck_pwdb; tmp_cck_sec_pwdb = cur_cck_pwdb;
cck_rx_ver2_sec_index = i; cck_rx_ver2_sec_index = i;
} } else if (PWDB_IN_RANGE) {
else if ((cur_cck_pwdb < tmp_cck_max_pwdb) &&(cur_cck_pwdb > tmp_cck_sec_pwdb))
{
tmp_cck_sec_pwdb = cur_cck_pwdb; tmp_cck_sec_pwdb = cur_cck_pwdb;
cck_rx_ver2_sec_index = i; cck_rx_ver2_sec_index = i;
} } else if (cur_cck_pwdb ==
else if (cur_cck_pwdb == tmp_cck_sec_pwdb) tmp_cck_sec_pwdb) {
{ if (tmp_cck_sec_pwdb ==
if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb) tmp_cck_min_pwdb) {
{ tmp_cck_sec_pwdb =
tmp_cck_sec_pwdb = cur_cck_pwdb; cur_cck_pwdb;
cck_rx_ver2_sec_index = i; cck_rx_ver2_sec_index =
} i;
else
{
} }
} } else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) &&
else if ((cur_cck_pwdb < tmp_cck_sec_pwdb) && (cur_cck_pwdb > tmp_cck_min_pwdb)) (cur_cck_pwdb > tmp_cck_min_pwdb)) {
{ ;
} } else if (cur_cck_pwdb == tmp_cck_min_pwdb) {
else if (cur_cck_pwdb == tmp_cck_min_pwdb) if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb) {
{
if (tmp_cck_sec_pwdb == tmp_cck_min_pwdb)
{
tmp_cck_min_pwdb = cur_cck_pwdb; tmp_cck_min_pwdb = cur_cck_pwdb;
cck_rx_ver2_min_index = i; cck_rx_ver2_min_index = i;
} }
else } else if (cur_cck_pwdb < tmp_cck_min_pwdb) {
{
}
}
else if (cur_cck_pwdb < tmp_cck_min_pwdb)
{
tmp_cck_min_pwdb = cur_cck_pwdb; tmp_cck_min_pwdb = cur_cck_pwdb;
cck_rx_ver2_min_index = i; cck_rx_ver2_min_index = i;
} }
...@@ -2969,27 +2703,26 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) ...@@ -2969,27 +2703,26 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev)
} }
} }
update_cck_rx_path = 0; update_cck_rx_path = 0;
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_2) {
{
cck_default_Rx = cck_rx_ver2_max_index; cck_default_Rx = cck_rx_ver2_max_index;
cck_optional_Rx = cck_rx_ver2_sec_index; cck_optional_Rx = cck_rx_ver2_sec_index;
if (tmp_cck_max_pwdb != -64) if (tmp_cck_max_pwdb != -64)
update_cck_rx_path = 1; update_cck_rx_path = 1;
} }
if (tmp_min_rssi < DM_RxPathSelTable.SS_TH_low && disabled_rf_cnt < 2) if (tmp_min_rssi < DM_RxPathSelTable.SS_TH_low && disabled_rf_cnt < 2) {
{ if ((tmp_max_rssi - tmp_min_rssi) >=
if ((tmp_max_rssi - tmp_min_rssi) >= DM_RxPathSelTable.diff_TH) DM_RxPathSelTable.diff_TH) {
{ DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] =
DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] = tmp_max_rssi+5; tmp_max_rssi+5;
rtl8192_setBBreg(dev, rOFDM0_TRxPathEnable, 0x1<<min_rssi_index, 0x0); rtl8192_setBBreg(dev, rOFDM0_TRxPathEnable,
rtl8192_setBBreg(dev, rOFDM1_TRxPathEnable, 0x1<<min_rssi_index, 0x0); 0x1<<min_rssi_index, 0x0);
rtl8192_setBBreg(dev, rOFDM1_TRxPathEnable,
0x1<<min_rssi_index, 0x0);
disabled_rf_cnt++; disabled_rf_cnt++;
} }
if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_1) if (DM_RxPathSelTable.cck_method == CCK_Rx_Version_1) {
{
cck_default_Rx = max_rssi_index; cck_default_Rx = max_rssi_index;
cck_optional_Rx = sec_rssi_index; cck_optional_Rx = sec_rssi_index;
if (tmp_max_rssi) if (tmp_max_rssi)
...@@ -2997,23 +2730,26 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) ...@@ -2997,23 +2730,26 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev)
} }
} }
if (update_cck_rx_path) if (update_cck_rx_path) {
{ DM_RxPathSelTable.cck_Rx_path = (cck_default_Rx<<2) |
DM_RxPathSelTable.cck_Rx_path = (cck_default_Rx<<2)|(cck_optional_Rx); (cck_optional_Rx);
rtl8192_setBBreg(dev, rCCK0_AFESetting, 0x0f000000, DM_RxPathSelTable.cck_Rx_path); rtl8192_setBBreg(dev, rCCK0_AFESetting, 0x0f000000,
DM_RxPathSelTable.cck_Rx_path);
} }
if (DM_RxPathSelTable.disabledRF) if (DM_RxPathSelTable.disabledRF) {
{ for (i = 0; i < 4; i++) {
for (i=0; i<4; i++) if ((DM_RxPathSelTable.disabledRF>>i) & 0x1) {
{ if (tmp_max_rssi >=
if ((DM_RxPathSelTable.disabledRF>>i) & 0x1) DM_RxPathSelTable.rf_enable_rssi_th[i]) {
{ rtl8192_setBBreg(dev,
if (tmp_max_rssi >= DM_RxPathSelTable.rf_enable_rssi_th[i]) rOFDM0_TRxPathEnable, 0x1 << i,
{ 0x1);
rtl8192_setBBreg(dev, rOFDM0_TRxPathEnable, 0x1<<i, 0x1); rtl8192_setBBreg(dev,
rtl8192_setBBreg(dev, rOFDM1_TRxPathEnable, 0x1<<i, 0x1); rOFDM1_TRxPathEnable,
DM_RxPathSelTable.rf_enable_rssi_th[i] = 100; 0x1 << i, 0x1);
DM_RxPathSelTable.rf_enable_rssi_th[i]
= 100;
disabled_rf_cnt--; disabled_rf_cnt--;
} }
} }
...@@ -3024,11 +2760,12 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) ...@@ -3024,11 +2760,12 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev)
static void dm_check_rx_path_selection(struct net_device *dev) static void dm_check_rx_path_selection(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
queue_delayed_work_rsl(priv->priv_wq,&priv->rfpath_check_wq,0);
queue_delayed_work_rsl(priv->priv_wq, &priv->rfpath_check_wq, 0);
} }
static void dm_init_fsync (struct net_device *dev) static void dm_init_fsync(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -3037,13 +2774,14 @@ static void dm_init_fsync (struct net_device *dev) ...@@ -3037,13 +2774,14 @@ static void dm_init_fsync (struct net_device *dev)
priv->rtllib->fsync_rssi_threshold = 30; priv->rtllib->fsync_rssi_threshold = 30;
priv->rtllib->bfsync_enable = false; priv->rtllib->bfsync_enable = false;
priv->rtllib->fsync_multiple_timeinterval = 3; priv->rtllib->fsync_multiple_timeinterval = 3;
priv->rtllib->fsync_firstdiff_ratethreshold= 100; priv->rtllib->fsync_firstdiff_ratethreshold = 100;
priv->rtllib->fsync_seconddiff_ratethreshold= 200; priv->rtllib->fsync_seconddiff_ratethreshold = 200;
priv->rtllib->fsync_state = Default_Fsync; priv->rtllib->fsync_state = Default_Fsync;
priv->framesyncMonitor = 1; priv->framesyncMonitor = 1;
init_timer(&priv->fsync_timer); init_timer(&priv->fsync_timer);
setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,(unsigned long) dev); setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,
(unsigned long) dev);
} }
...@@ -3057,95 +2795,91 @@ extern void dm_fsync_timer_callback(unsigned long data) ...@@ -3057,95 +2795,91 @@ extern void dm_fsync_timer_callback(unsigned long data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
struct r8192_priv *priv = rtllib_priv((struct net_device *)data); struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
u32 rate_index, rate_count = 0, rate_count_diff=0; u32 rate_index, rate_count = 0, rate_count_diff = 0;
bool bSwitchFromCountDiff = false; bool bSwitchFromCountDiff = false;
bool bDoubleTimeInterval = false; bool bDoubleTimeInterval = false;
if ( priv->rtllib->state == RTLLIB_LINKED && if (priv->rtllib->state == RTLLIB_LINKED &&
priv->rtllib->bfsync_enable && priv->rtllib->bfsync_enable &&
(priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_CDD_FSYNC)) (priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_CDD_FSYNC)) {
{
u32 rate_bitmap; u32 rate_bitmap;
for (rate_index = 0; rate_index <= 27; rate_index++) for (rate_index = 0; rate_index <= 27; rate_index++) {
{
rate_bitmap = 1 << rate_index; rate_bitmap = 1 << rate_index;
if (priv->rtllib->fsync_rate_bitmap & rate_bitmap) if (priv->rtllib->fsync_rate_bitmap & rate_bitmap)
rate_count+= priv->stats.received_rate_histogram[1][rate_index]; rate_count +=
priv->stats.received_rate_histogram[1]
[rate_index];
} }
if (rate_count < priv->rate_record) if (rate_count < priv->rate_record)
rate_count_diff = 0xffffffff - rate_count + priv->rate_record; rate_count_diff = 0xffffffff - rate_count +
priv->rate_record;
else else
rate_count_diff = rate_count - priv->rate_record; rate_count_diff = rate_count - priv->rate_record;
if (rate_count_diff < priv->rateCountDiffRecord) if (rate_count_diff < priv->rateCountDiffRecord) {
{
u32 DiffNum = priv->rateCountDiffRecord - rate_count_diff; u32 DiffNum = priv->rateCountDiffRecord -
if (DiffNum >= priv->rtllib->fsync_seconddiff_ratethreshold) rate_count_diff;
if (DiffNum >=
priv->rtllib->fsync_seconddiff_ratethreshold)
priv->ContiuneDiffCount++; priv->ContiuneDiffCount++;
else else
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
if (priv->ContiuneDiffCount >=2) if (priv->ContiuneDiffCount >= 2) {
{
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
} }
} } else {
else
{
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
} }
if (rate_count_diff <= priv->rtllib->fsync_firstdiff_ratethreshold) if (rate_count_diff <=
{ priv->rtllib->fsync_firstdiff_ratethreshold) {
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
} }
priv->rate_record = rate_count; priv->rate_record = rate_count;
priv->rateCountDiffRecord = rate_count_diff; priv->rateCountDiffRecord = rate_count_diff;
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", priv->rate_record, rate_count, rate_count_diff , priv->bswitch_fsync); RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rate"
if (priv->undecorated_smoothed_pwdb > priv->rtllib->fsync_rssi_threshold && bSwitchFromCountDiff) "Countdiff %d bSwitchFsync %d\n", priv->rate_record,
{ rate_count, rate_count_diff, priv->bswitch_fsync);
if (priv->undecorated_smoothed_pwdb >
priv->rtllib->fsync_rssi_threshold &&
bSwitchFromCountDiff) {
bDoubleTimeInterval = true; bDoubleTimeInterval = true;
priv->bswitch_fsync = !priv->bswitch_fsync; priv->bswitch_fsync = !priv->bswitch_fsync;
if (priv->bswitch_fsync) if (priv->bswitch_fsync) {
{ write_nic_byte(dev, 0xC36, 0x1c);
write_nic_byte(dev,0xC36, 0x1c);
write_nic_byte(dev, 0xC3e, 0x90); write_nic_byte(dev, 0xC3e, 0x90);
} } else {
else
{
write_nic_byte(dev, 0xC36, 0x5c); write_nic_byte(dev, 0xC36, 0x5c);
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
} } else if (priv->undecorated_smoothed_pwdb <=
else if (priv->undecorated_smoothed_pwdb <= priv->rtllib->fsync_rssi_threshold) priv->rtllib->fsync_rssi_threshold) {
{ if (priv->bswitch_fsync) {
if (priv->bswitch_fsync)
{
priv->bswitch_fsync = false; priv->bswitch_fsync = false;
write_nic_byte(dev, 0xC36, 0x5c); write_nic_byte(dev, 0xC36, 0x5c);
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
} }
if (bDoubleTimeInterval){ if (bDoubleTimeInterval) {
if (timer_pending(&priv->fsync_timer)) if (timer_pending(&priv->fsync_timer))
del_timer_sync(&priv->fsync_timer); del_timer_sync(&priv->fsync_timer);
priv->fsync_timer.expires = jiffies + MSECS(priv->rtllib->fsync_time_interval*priv->rtllib->fsync_multiple_timeinterval); priv->fsync_timer.expires = jiffies +
MSECS(priv->rtllib->fsync_time_interval *
priv->rtllib->fsync_multiple_timeinterval);
add_timer(&priv->fsync_timer); add_timer(&priv->fsync_timer);
} } else {
else{
if (timer_pending(&priv->fsync_timer)) if (timer_pending(&priv->fsync_timer))
del_timer_sync(&priv->fsync_timer); del_timer_sync(&priv->fsync_timer);
priv->fsync_timer.expires = jiffies + MSECS(priv->rtllib->fsync_time_interval); priv->fsync_timer.expires = jiffies +
MSECS(priv->rtllib->fsync_time_interval);
add_timer(&priv->fsync_timer); add_timer(&priv->fsync_timer);
} }
} } else {
else if (priv->bswitch_fsync) {
{
if (priv->bswitch_fsync)
{
priv->bswitch_fsync = false; priv->bswitch_fsync = false;
write_nic_byte(dev, 0xC36, 0x5c); write_nic_byte(dev, 0xC36, 0x5c);
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
...@@ -3154,7 +2888,9 @@ extern void dm_fsync_timer_callback(unsigned long data) ...@@ -3154,7 +2888,9 @@ extern void dm_fsync_timer_callback(unsigned long data)
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
} }
RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount); RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount);
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", priv->rate_record, rate_count, rate_count_diff , priv->bswitch_fsync); RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d "
"bSwitchFsync %d\n", priv->rate_record, rate_count,
rate_count_diff, priv->bswitch_fsync);
} }
static void dm_StartHWFsync(struct net_device *dev) static void dm_StartHWFsync(struct net_device *dev)
...@@ -3163,7 +2899,8 @@ static void dm_StartHWFsync(struct net_device *dev) ...@@ -3163,7 +2899,8 @@ static void dm_StartHWFsync(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
RT_TRACE(COMP_HALDM, "%s\n", __func__); RT_TRACE(COMP_HALDM, "%s\n", __func__);
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cf); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cf);
priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8*)(&rf_timing)); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING,
(u8 *)(&rf_timing));
write_nic_byte(dev, 0xc3b, 0x41); write_nic_byte(dev, 0xc3b, 0x41);
} }
...@@ -3171,9 +2908,10 @@ static void dm_EndHWFsync(struct net_device *dev) ...@@ -3171,9 +2908,10 @@ static void dm_EndHWFsync(struct net_device *dev)
{ {
u8 rf_timing = 0xaa; u8 rf_timing = 0xaa;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
RT_TRACE(COMP_HALDM,"%s\n", __func__); RT_TRACE(COMP_HALDM, "%s\n", __func__);
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8*)(&rf_timing)); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8 *)
(&rf_timing));
write_nic_byte(dev, 0xc3b, 0x49); write_nic_byte(dev, 0xc3b, 0x49);
} }
...@@ -3184,8 +2922,7 @@ static void dm_EndSWFsync(struct net_device *dev) ...@@ -3184,8 +2922,7 @@ static void dm_EndSWFsync(struct net_device *dev)
RT_TRACE(COMP_HALDM, "%s\n", __func__); RT_TRACE(COMP_HALDM, "%s\n", __func__);
del_timer_sync(&(priv->fsync_timer)); del_timer_sync(&(priv->fsync_timer));
if (priv->bswitch_fsync) if (priv->bswitch_fsync) {
{
priv->bswitch_fsync = false; priv->bswitch_fsync = false;
write_nic_byte(dev, 0xC36, 0x5c); write_nic_byte(dev, 0xC36, 0x5c);
...@@ -3203,31 +2940,30 @@ static void dm_StartSWFsync(struct net_device *dev) ...@@ -3203,31 +2940,30 @@ static void dm_StartSWFsync(struct net_device *dev)
u32 rateIndex; u32 rateIndex;
u32 rateBitmap; u32 rateBitmap;
RT_TRACE(COMP_HALDM,"%s\n", __func__); RT_TRACE(COMP_HALDM, "%s\n", __func__);
priv->rate_record = 0; priv->rate_record = 0;
priv->ContiuneDiffCount = 0; priv->ContiuneDiffCount = 0;
priv->rateCountDiffRecord = 0; priv->rateCountDiffRecord = 0;
priv->bswitch_fsync = false; priv->bswitch_fsync = false;
if (priv->rtllib->mode == WIRELESS_MODE_N_24G) if (priv->rtllib->mode == WIRELESS_MODE_N_24G) {
{ priv->rtllib->fsync_firstdiff_ratethreshold = 600;
priv->rtllib->fsync_firstdiff_ratethreshold= 600;
priv->rtllib->fsync_seconddiff_ratethreshold = 0xffff; priv->rtllib->fsync_seconddiff_ratethreshold = 0xffff;
} } else {
else priv->rtllib->fsync_firstdiff_ratethreshold = 200;
{
priv->rtllib->fsync_firstdiff_ratethreshold= 200;
priv->rtllib->fsync_seconddiff_ratethreshold = 200; priv->rtllib->fsync_seconddiff_ratethreshold = 200;
} }
for (rateIndex = 0; rateIndex <= 27; rateIndex++) for (rateIndex = 0; rateIndex <= 27; rateIndex++) {
{
rateBitmap = 1 << rateIndex; rateBitmap = 1 << rateIndex;
if (priv->rtllib->fsync_rate_bitmap & rateBitmap) if (priv->rtllib->fsync_rate_bitmap & rateBitmap)
priv->rate_record += priv->stats.received_rate_histogram[1][rateIndex]; priv->rate_record +=
priv->stats.received_rate_histogram[1]
[rateIndex];
} }
if (timer_pending(&priv->fsync_timer)) if (timer_pending(&priv->fsync_timer))
del_timer_sync(&priv->fsync_timer); del_timer_sync(&priv->fsync_timer);
priv->fsync_timer.expires = jiffies + MSECS(priv->rtllib->fsync_time_interval); priv->fsync_timer.expires = jiffies +
MSECS(priv->rtllib->fsync_time_interval);
add_timer(&priv->fsync_timer); add_timer(&priv->fsync_timer);
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cd);
...@@ -3236,61 +2972,59 @@ static void dm_StartSWFsync(struct net_device *dev) ...@@ -3236,61 +2972,59 @@ static void dm_StartSWFsync(struct net_device *dev)
void dm_check_fsync(struct net_device *dev) void dm_check_fsync(struct net_device *dev)
{ {
#define RegC38_Default 0 #define RegC38_Default 0
#define RegC38_NonFsync_Other_AP 1 #define RegC38_NonFsync_Other_AP 1
#define RegC38_Fsync_AP_BCM 2 #define RegC38_Fsync_AP_BCM 2
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
static u8 reg_c38_State=RegC38_Default; static u8 reg_c38_State = RegC38_Default;
static u32 reset_cnt=0; static u32 reset_cnt;
RT_TRACE(COMP_HALDM, "RSSI %d TimeInterval %d MultipleTimeInterval %d\n", priv->rtllib->fsync_rssi_threshold, priv->rtllib->fsync_time_interval, priv->rtllib->fsync_multiple_timeinterval); RT_TRACE(COMP_HALDM, "RSSI %d TimeInterval %d MultipleTimeInterval "
RT_TRACE(COMP_HALDM, "RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n", priv->rtllib->fsync_rate_bitmap, priv->rtllib->fsync_firstdiff_ratethreshold, priv->rtllib->fsync_seconddiff_ratethreshold); "%d\n", priv->rtllib->fsync_rssi_threshold,
priv->rtllib->fsync_time_interval,
if ( priv->rtllib->state == RTLLIB_LINKED && priv->rtllib->fsync_multiple_timeinterval);
priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) RT_TRACE(COMP_HALDM, "RateBitmap 0x%x FirstDiffRateThreshold %d Second"
{ "DiffRateThreshold %d\n", priv->rtllib->fsync_rate_bitmap,
if (priv->rtllib->bfsync_enable == 0) priv->rtllib->fsync_firstdiff_ratethreshold,
{ priv->rtllib->fsync_seconddiff_ratethreshold);
switch (priv->rtllib->fsync_state)
{ if (priv->rtllib->state == RTLLIB_LINKED &&
case Default_Fsync: priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) {
dm_StartHWFsync(dev); if (priv->rtllib->bfsync_enable == 0) {
priv->rtllib->fsync_state = HW_Fsync; switch (priv->rtllib->fsync_state) {
break; case Default_Fsync:
case SW_Fsync: dm_StartHWFsync(dev);
dm_EndSWFsync(dev); priv->rtllib->fsync_state = HW_Fsync;
dm_StartHWFsync(dev); break;
priv->rtllib->fsync_state = HW_Fsync; case SW_Fsync:
break; dm_EndSWFsync(dev);
case HW_Fsync: dm_StartHWFsync(dev);
default: priv->rtllib->fsync_state = HW_Fsync;
break; break;
case HW_Fsync:
default:
break;
} }
} } else {
else switch (priv->rtllib->fsync_state) {
{ case Default_Fsync:
switch (priv->rtllib->fsync_state) dm_StartSWFsync(dev);
{ priv->rtllib->fsync_state = SW_Fsync;
case Default_Fsync: break;
dm_StartSWFsync(dev); case HW_Fsync:
priv->rtllib->fsync_state = SW_Fsync; dm_EndHWFsync(dev);
break; dm_StartSWFsync(dev);
case HW_Fsync: priv->rtllib->fsync_state = SW_Fsync;
dm_EndHWFsync(dev); break;
dm_StartSWFsync(dev); case SW_Fsync:
priv->rtllib->fsync_state = SW_Fsync; default:
break; break;
case SW_Fsync:
default:
break;
} }
} }
if (priv->framesyncMonitor) if (priv->framesyncMonitor) {
{ if (reg_c38_State != RegC38_Fsync_AP_BCM) {
if (reg_c38_State != RegC38_Fsync_AP_BCM) write_nic_byte(dev, rOFDM0_RxDetector3, 0x95);
{
write_nic_byte(dev, rOFDM0_RxDetector3, 0x95);
reg_c38_State = RegC38_Fsync_AP_BCM; reg_c38_State = RegC38_Fsync_AP_BCM;
} }
...@@ -3312,21 +3046,30 @@ void dm_check_fsync(struct net_device *dev) ...@@ -3312,21 +3046,30 @@ void dm_check_fsync(struct net_device *dev)
if (priv->framesyncMonitor) { if (priv->framesyncMonitor) {
if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->rtllib->state == RTLLIB_LINKED) {
if (priv->undecorated_smoothed_pwdb <= RegC38_TH) { if (priv->undecorated_smoothed_pwdb <=
if (reg_c38_State != RegC38_NonFsync_Other_AP) { RegC38_TH) {
write_nic_byte(dev, rOFDM0_RxDetector3, 0x90); if (reg_c38_State !=
RegC38_NonFsync_Other_AP) {
reg_c38_State = RegC38_NonFsync_Other_AP; write_nic_byte(dev,
rOFDM0_RxDetector3,
0x90);
reg_c38_State =
RegC38_NonFsync_Other_AP;
} }
} else if (priv->undecorated_smoothed_pwdb >= (RegC38_TH+5)) { } else if (priv->undecorated_smoothed_pwdb >=
(RegC38_TH+5)) {
if (reg_c38_State) { if (reg_c38_State) {
write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync); write_nic_byte(dev,
rOFDM0_RxDetector3,
priv->framesync);
reg_c38_State = RegC38_Default; reg_c38_State = RegC38_Default;
} }
} }
} else { } else {
if (reg_c38_State) { if (reg_c38_State) {
write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync); write_nic_byte(dev, rOFDM0_RxDetector3,
priv->framesync);
reg_c38_State = RegC38_Default; reg_c38_State = RegC38_Default;
} }
} }
...@@ -3334,13 +3077,15 @@ void dm_check_fsync(struct net_device *dev) ...@@ -3334,13 +3077,15 @@ void dm_check_fsync(struct net_device *dev)
} }
if (priv->framesyncMonitor) { if (priv->framesyncMonitor) {
if (priv->reset_count != reset_cnt) { if (priv->reset_count != reset_cnt) {
write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync); write_nic_byte(dev, rOFDM0_RxDetector3,
priv->framesync);
reg_c38_State = RegC38_Default; reg_c38_State = RegC38_Default;
reset_cnt = priv->reset_count; reset_cnt = priv->reset_count;
} }
} else { } else {
if (reg_c38_State) { if (reg_c38_State) {
write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync); write_nic_byte(dev, rOFDM0_RxDetector3,
priv->framesync);
reg_c38_State = RegC38_Default; reg_c38_State = RegC38_Default;
} }
} }
...@@ -3353,15 +3098,18 @@ extern void dm_shadow_init(struct net_device *dev) ...@@ -3353,15 +3098,18 @@ extern void dm_shadow_init(struct net_device *dev)
for (page = 0; page < 5; page++) for (page = 0; page < 5; page++)
for (offset = 0; offset < 256; offset++) for (offset = 0; offset < 256; offset++)
dm_shadow[page][offset] = read_nic_byte(dev, offset+page*256); dm_shadow[page][offset] = read_nic_byte(dev,
offset+page * 256);
for (page = 8; page < 11; page++) for (page = 8; page < 11; page++)
for (offset = 0; offset < 256; offset++) for (offset = 0; offset < 256; offset++)
dm_shadow[page][offset] = read_nic_byte(dev, offset+page*256); dm_shadow[page][offset] = read_nic_byte(dev,
offset+page * 256);
for (page = 12; page < 15; page++) for (page = 12; page < 15; page++)
for (offset = 0; offset < 256; offset++) for (offset = 0; offset < 256; offset++)
dm_shadow[page][offset] = read_nic_byte(dev, offset+page*256); dm_shadow[page][offset] = read_nic_byte(dev,
offset+page*256);
} }
...@@ -3380,93 +3128,75 @@ static void dm_init_dynamic_txpower(struct net_device *dev) ...@@ -3380,93 +3128,75 @@ static void dm_init_dynamic_txpower(struct net_device *dev)
static void dm_dynamic_txpower(struct net_device *dev) static void dm_dynamic_txpower(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
unsigned int txhipower_threshhold=0; unsigned int txhipower_threshhold = 0;
unsigned int txlowpower_threshold=0; unsigned int txlowpower_threshold = 0;
if (priv->rtllib->bdynamic_txpower_enable != true) if (priv->rtllib->bdynamic_txpower_enable != true) {
{
priv->bDynamicTxHighPower = false; priv->bDynamicTxHighPower = false;
priv->bDynamicTxLowPower = false; priv->bDynamicTxLowPower = false;
return; return;
} }
if ((priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_ATHEROS) && (priv->rtllib->mode == IEEE_G)){ if ((priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_ATHEROS) &&
(priv->rtllib->mode == IEEE_G)) {
txhipower_threshhold = TX_POWER_ATHEROAP_THRESH_HIGH; txhipower_threshhold = TX_POWER_ATHEROAP_THRESH_HIGH;
txlowpower_threshold = TX_POWER_ATHEROAP_THRESH_LOW; txlowpower_threshold = TX_POWER_ATHEROAP_THRESH_LOW;
} } else {
else
{
txhipower_threshhold = TX_POWER_NEAR_FIELD_THRESH_HIGH; txhipower_threshhold = TX_POWER_NEAR_FIELD_THRESH_HIGH;
txlowpower_threshold = TX_POWER_NEAR_FIELD_THRESH_LOW; txlowpower_threshold = TX_POWER_NEAR_FIELD_THRESH_LOW;
} }
RT_TRACE(COMP_TXAGC, "priv->undecorated_smoothed_pwdb = %ld\n",
priv->undecorated_smoothed_pwdb);
RT_TRACE(COMP_TXAGC,"priv->undecorated_smoothed_pwdb = %ld \n" , priv->undecorated_smoothed_pwdb); if (priv->rtllib->state == RTLLIB_LINKED) {
if (priv->undecorated_smoothed_pwdb >= txhipower_threshhold) {
if (priv->rtllib->state == RTLLIB_LINKED)
{
if (priv->undecorated_smoothed_pwdb >= txhipower_threshhold)
{
priv->bDynamicTxHighPower = true; priv->bDynamicTxHighPower = true;
priv->bDynamicTxLowPower = false; priv->bDynamicTxLowPower = false;
} } else {
else if (priv->undecorated_smoothed_pwdb <
{ txlowpower_threshold &&
if (priv->undecorated_smoothed_pwdb < txlowpower_threshold && priv->bDynamicTxHighPower == true) priv->bDynamicTxHighPower == true)
{
priv->bDynamicTxHighPower = false; priv->bDynamicTxHighPower = false;
}
if (priv->undecorated_smoothed_pwdb < 35) if (priv->undecorated_smoothed_pwdb < 35)
{
priv->bDynamicTxLowPower = true; priv->bDynamicTxLowPower = true;
}
else if (priv->undecorated_smoothed_pwdb >= 40) else if (priv->undecorated_smoothed_pwdb >= 40)
{
priv->bDynamicTxLowPower = false; priv->bDynamicTxLowPower = false;
}
} }
} } else {
else
{
priv->bDynamicTxHighPower = false; priv->bDynamicTxHighPower = false;
priv->bDynamicTxLowPower = false; priv->bDynamicTxLowPower = false;
} }
if ( (priv->bDynamicTxHighPower != priv->bLastDTPFlag_High ) || if ((priv->bDynamicTxHighPower != priv->bLastDTPFlag_High) ||
(priv->bDynamicTxLowPower != priv->bLastDTPFlag_Low ) ) (priv->bDynamicTxLowPower != priv->bLastDTPFlag_Low)) {
{ RT_TRACE(COMP_TXAGC, "SetTxPowerLevel8190() channel = %d\n",
RT_TRACE(COMP_TXAGC,"SetTxPowerLevel8190() channel = %d \n" , priv->rtllib->current_network.channel); priv->rtllib->current_network.channel);
rtl8192_phy_setTxPower(dev,priv->rtllib->current_network.channel); rtl8192_phy_setTxPower(dev,
priv->rtllib->current_network.channel);
} }
priv->bLastDTPFlag_High = priv->bDynamicTxHighPower; priv->bLastDTPFlag_High = priv->bDynamicTxHighPower;
priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower; priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower;
} }
static void dm_check_txrateandretrycount(struct net_device * dev) static void dm_check_txrateandretrycount(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
ieee->softmac_stats.CurrentShowTxate = read_nic_byte(dev, Current_Tx_Rate_Reg); ieee->softmac_stats.CurrentShowTxate = read_nic_byte(dev,
Current_Tx_Rate_Reg);
ieee->softmac_stats.last_packet_rate = read_nic_byte(dev ,Initial_Tx_Rate_Reg); ieee->softmac_stats.last_packet_rate = read_nic_byte(dev,
Initial_Tx_Rate_Reg);
ieee->softmac_stats.txretrycount = read_nic_dword(dev, Tx_Retry_Count_Reg); ieee->softmac_stats.txretrycount = read_nic_dword(dev,
Tx_Retry_Count_Reg);
} }
static void dm_send_rssi_tofw(struct net_device *dev) static void dm_send_rssi_tofw(struct net_device *dev)
{ {
struct dcmd_txcmd tx_cmd;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
write_nic_byte(dev, DRIVER_RSSI, (u8)priv->undecorated_smoothed_pwdb); write_nic_byte(dev, DRIVER_RSSI, (u8)priv->undecorated_smoothed_pwdb);
return;
tx_cmd.Op = TXCMD_SET_RX_RSSI;
tx_cmd.Length = 4;
tx_cmd.Value = priv->undecorated_smoothed_pwdb;
cmpk_message_handle_tx(dev, (u8*)&tx_cmd,
DESC_PACKET_TYPE_INIT, sizeof(struct dcmd_txcmd));
} }
/*---------------------------Define function prototype------------------------*/
drivers/staging/rtl8192e/rtl_dm.h
浏览文件 @ b448b0cc
...@@ -59,15 +59,15 @@ ...@@ -59,15 +59,15 @@
#define WAIotTHVal 25 #define WAIotTHVal 25
#define E_FOR_TX_POWER_TRACK 300 #define E_FOR_TX_POWER_TRACK 300
#define TX_POWER_NEAR_FIELD_THRESH_HIGH 68 #define TX_POWER_NEAR_FIELD_THRESH_HIGH 68
#define TX_POWER_NEAR_FIELD_THRESH_LOW 62 #define TX_POWER_NEAR_FIELD_THRESH_LOW 62
#define TX_POWER_ATHEROAP_THRESH_HIGH 78 #define TX_POWER_ATHEROAP_THRESH_HIGH 78
#define TX_POWER_ATHEROAP_THRESH_LOW 72 #define TX_POWER_ATHEROAP_THRESH_LOW 72
#define Current_Tx_Rate_Reg 0x1e0 #define Current_Tx_Rate_Reg 0x1e0
#define Initial_Tx_Rate_Reg 0x1e1 #define Initial_Tx_Rate_Reg 0x1e1
#define Tx_Retry_Count_Reg 0x1ac #define Tx_Retry_Count_Reg 0x1ac
#define RegC38_TH 20 #define RegC38_TH 20
#define TX_POWER_NEAR_FIELD_THRESH_LVL2 74 #define TX_POWER_NEAR_FIELD_THRESH_LVL2 74
...@@ -227,7 +227,7 @@ struct drx_path_sel { ...@@ -227,7 +227,7 @@ struct drx_path_sel {
enum dm_cck_rx_path_method { enum dm_cck_rx_path_method {
CCK_Rx_Version_1 = 0, CCK_Rx_Version_1 = 0,
CCK_Rx_Version_2= 1, CCK_Rx_Version_2 = 1,
CCK_Rx_Version_MAX CCK_Rx_Version_MAX
}; };
...@@ -256,7 +256,10 @@ extern u8 test_flag; ...@@ -256,7 +256,10 @@ extern u8 test_flag;
/*------------------------Export Marco Definition---------------------------*/ /*------------------------Export Marco Definition---------------------------*/
#define DM_APInitGainChangeNotify(Event) {dm_digtable.CurAPConnectState = Event;} #define DM_APInitGainChangeNotify(Event) \
{ \
dm_digtable.CurAPConnectState = Event; \
}
/*------------------------Export Marco Definition---------------------------*/ /*------------------------Export Marco Definition---------------------------*/
...@@ -271,19 +274,19 @@ extern void hal_dm_watchdog(struct net_device *dev); ...@@ -271,19 +274,19 @@ extern void hal_dm_watchdog(struct net_device *dev);
extern void init_rate_adaptive(struct net_device *dev); extern void init_rate_adaptive(struct net_device *dev);
extern void dm_txpower_trackingcallback(void *data); extern void dm_txpower_trackingcallback(void *data);
extern void dm_cck_txpower_adjust(struct net_device *dev,bool binch14); extern void dm_cck_txpower_adjust(struct net_device *dev, bool binch14);
extern void dm_restore_dynamic_mechanism_state(struct net_device *dev); extern void dm_restore_dynamic_mechanism_state(struct net_device *dev);
extern void dm_backup_dynamic_mechanism_state(struct net_device *dev); extern void dm_backup_dynamic_mechanism_state(struct net_device *dev);
extern void dm_change_dynamic_initgain_thresh(struct net_device *dev, extern void dm_change_dynamic_initgain_thresh(struct net_device *dev,
u32 dm_type, u32 dm_type,
u32 dm_value); u32 dm_value);
extern void DM_ChangeFsyncSetting(struct net_device *dev, extern void DM_ChangeFsyncSetting(struct net_device *dev,
s32 DM_Type, s32 DM_Type,
s32 DM_Value); s32 DM_Value);
extern void dm_force_tx_fw_info(struct net_device *dev, extern void dm_force_tx_fw_info(struct net_device *dev,
u32 force_type, u32 force_type,
u32 force_value); u32 force_value);
extern void dm_init_edca_turbo(struct net_device *dev); extern void dm_init_edca_turbo(struct net_device *dev);
extern void dm_rf_operation_test_callback(unsigned long data); extern void dm_rf_operation_test_callback(unsigned long data);
extern void dm_rf_pathcheck_workitemcallback(void *data); extern void dm_rf_pathcheck_workitemcallback(void *data);
...@@ -291,11 +294,31 @@ extern void dm_fsync_timer_callback(unsigned long data); ...@@ -291,11 +294,31 @@ extern void dm_fsync_timer_callback(unsigned long data);
extern void dm_check_fsync(struct net_device *dev); extern void dm_check_fsync(struct net_device *dev);
extern void dm_shadow_init(struct net_device *dev); extern void dm_shadow_init(struct net_device *dev);
extern void dm_initialize_txpower_tracking(struct net_device *dev); extern void dm_initialize_txpower_tracking(struct net_device *dev);
extern void dm_CheckRfCtrlGPIO(void *data); extern void dm_CheckRfCtrlGPIO(void *data);
extern void dm_InitRateAdaptiveMask(struct net_device *dev);
extern void dm_InitRateAdaptiveMask(struct net_device * dev); extern void init_hal_dm(struct net_device *dev);
extern void deinit_hal_dm(struct net_device *dev);
extern void hal_dm_watchdog(struct net_device *dev);
extern void init_rate_adaptive(struct net_device *dev);
extern void dm_txpower_trackingcallback(void *data);
extern void dm_restore_dynamic_mechanism_state(struct net_device *dev);
extern void dm_backup_dynamic_mechanism_state(struct net_device *dev);
extern void dm_change_dynamic_initgain_thresh(struct net_device *dev,
u32 dm_type,
u32 dm_value);
extern void DM_ChangeFsyncSetting(struct net_device *dev,
s32 DM_Type,
s32 DM_Value);
extern void dm_force_tx_fw_info(struct net_device *dev,
u32 force_type,
u32 force_value);
extern void dm_init_edca_turbo(struct net_device *dev);
extern void dm_rf_operation_test_callback(unsigned long data);
extern void dm_rf_pathcheck_workitemcallback(void *data);
extern void dm_fsync_timer_callback(unsigned long data);
extern void dm_check_fsync(struct net_device *dev);
extern void dm_shadow_init(struct net_device *dev);
extern void dm_initialize_txpower_tracking(struct net_device *dev);
extern void dm_CheckRfCtrlGPIO(void *data);
#endif /*__R8192UDM_H__ */ #endif /*__R8192UDM_H__ */
/* End of r8192U_dm.h */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或