Skip to content

L
linux
Commit 8875899c authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtl8192e: Delete dead code 

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 356955ae
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 89 deletions
drivers/staging/rtl8192e/r8190_rtl8256.c
View file @ 8875899c
...@@ -432,7 +432,6 @@ SetRFPowerState8190( ...@@ -432,7 +432,6 @@ SetRFPowerState8190(
if(priv->SetRFPowerStateInProgress == true) if(priv->SetRFPowerStateInProgress == true)
return false; return false;
//RT_TRACE(COMP_PS, "===========> SetRFPowerState8190()!\n");
priv->SetRFPowerStateInProgress = true; priv->SetRFPowerStateInProgress = true;
switch(priv->rf_chip) switch(priv->rf_chip)
...@@ -441,7 +440,6 @@ SetRFPowerState8190( ...@@ -441,7 +440,6 @@ SetRFPowerState8190(
switch( eRFPowerState ) switch( eRFPowerState )
{ {
case eRfOn: case eRfOn:
//RT_TRACE(COMP_PS, "SetRFPowerState8190() eRfOn !\n");
//RXTX enable control: On //RXTX enable control: On
//for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++) //for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
// PHY_SetRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x2); // PHY_SetRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x2);
...@@ -620,7 +618,6 @@ SetRFPowerState8190( ...@@ -620,7 +618,6 @@ SetRFPowerState8190(
break; break;
case eRfOff: case eRfOff:
//RT_TRACE(COMP_PS, "SetRFPowerState8190() eRfOff/Sleep !\n");
// Update current RF state variable. // Update current RF state variable.
//priv->ieee80211->eRFPowerState = eRFPowerState; //priv->ieee80211->eRFPowerState = eRFPowerState;
...@@ -718,9 +715,7 @@ SetRFPowerState8190( ...@@ -718,9 +715,7 @@ SetRFPowerState8190(
priv->ieee80211->eRFPowerState = eRFPowerState; priv->ieee80211->eRFPowerState = eRFPowerState;
} }
//printk("%s()priv->ieee80211->eRFPowerState:%s\n" ,__func__,priv->ieee80211->eRFPowerState == eRfOn ? "On" : "Off");
priv->SetRFPowerStateInProgress = false; priv->SetRFPowerStateInProgress = false;
//RT_TRACE(COMP_PS, "<=========== SetRFPowerState8190() bResult = %d!\n", bResult);
return bResult; return bResult;
} }
...@@ -774,8 +769,6 @@ MgntDisconnectIBSS( ...@@ -774,8 +769,6 @@ MgntDisconnectIBSS(
u8 i; u8 i;
bool bFilterOutNonAssociatedBSSID = false; bool bFilterOutNonAssociatedBSSID = false;
//IEEE80211_DEBUG(IEEE80211_DL_TRACE, "XXXXXXXXXX MgntDisconnect IBSS\n");
priv->ieee80211->state = IEEE80211_NOLINK; priv->ieee80211->state = IEEE80211_NOLINK;
// PlatformZeroMemory( pMgntInfo->Bssid, 6 ); // PlatformZeroMemory( pMgntInfo->Bssid, 6 );
...@@ -1003,7 +996,6 @@ MgntDisconnect( ...@@ -1003,7 +996,6 @@ MgntDisconnect(
{ {
if( priv->ieee80211->iw_mode == IW_MODE_ADHOC ) if( priv->ieee80211->iw_mode == IW_MODE_ADHOC )
{ {
//RT_TRACE(COMP_MLME, "MgntDisconnect() ===> MgntDisconnectIBSS\n");
MgntDisconnectIBSS(dev); MgntDisconnectIBSS(dev);
} }
if( priv->ieee80211->iw_mode == IW_MODE_INFRA ) if( priv->ieee80211->iw_mode == IW_MODE_INFRA )
...@@ -1013,7 +1005,6 @@ MgntDisconnect( ...@@ -1013,7 +1005,6 @@ MgntDisconnect(
// e.g. OID_802_11_DISASSOCIATE in Windows while as MgntDisconnectAP() is // e.g. OID_802_11_DISASSOCIATE in Windows while as MgntDisconnectAP() is
// used to handle disassociation related things to AP, e.g. send Disassoc // used to handle disassociation related things to AP, e.g. send Disassoc
// frame to AP. 2005.01.27, by rcnjko. // frame to AP. 2005.01.27, by rcnjko.
//IEEE80211_DEBUG(IEEE80211_DL_TRACE,"MgntDisconnect() ===> MgntDisconnectAP\n");
MgntDisconnectAP(dev, asRsn); MgntDisconnectAP(dev, asRsn);
} }
......
drivers/staging/rtl8192e/r8192E_core.c
View file @ 8875899c
...@@ -1685,7 +1685,6 @@ static void rtl8192_qos_activate(struct work_struct * work) ...@@ -1685,7 +1685,6 @@ static void rtl8192_qos_activate(struct work_struct * work)
(((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)| (((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)|
(((u32)(qos_parameters->cw_min[i]))<< AC_PARAM_ECW_MIN_OFFSET)| (((u32)(qos_parameters->cw_min[i]))<< AC_PARAM_ECW_MIN_OFFSET)|
((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET)); ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
//printk("===>u4bAcParam:%x, ", u4bAcParam);
write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam); write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);
//write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332); //write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
} }
...@@ -3529,26 +3528,22 @@ static bool HalRxCheckStuck8190Pci(struct net_device *dev) ...@@ -3529,26 +3528,22 @@ static bool HalRxCheckStuck8190Pci(struct net_device *dev)
{ {
if(rx_chk_cnt < 4) if(rx_chk_cnt < 4)
{ {
//DbgPrint("RSSI < %d && RSSI >= %d, no check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);
return bStuck; return bStuck;
} }
else else
{ {
rx_chk_cnt = 0; rx_chk_cnt = 0;
//DbgPrint("RSSI < %d && RSSI >= %d, check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);
} }
} }
else else
{ {
if(rx_chk_cnt < 8) if(rx_chk_cnt < 8)
{ {
//DbgPrint("RSSI <= %d, no check this time \n", VeryLowRSSI);
return bStuck; return bStuck;
} }
else else
{ {
rx_chk_cnt = 0; rx_chk_cnt = 0;
//DbgPrint("RSSI <= %d, check this time \n", VeryLowRSSI);
} }
} }
if(priv->RxCounter==RegRxCounter) if(priv->RxCounter==RegRxCounter)
...@@ -4033,7 +4028,6 @@ IPSEnter(struct net_device *dev) ...@@ -4033,7 +4028,6 @@ IPSEnter(struct net_device *dev)
&& (priv->ieee80211->state != IEEE80211_LINKED) ) && (priv->ieee80211->state != IEEE80211_LINKED) )
{ {
RT_TRACE(COMP_RF,"IPSEnter(): Turn off RF.\n"); RT_TRACE(COMP_RF,"IPSEnter(): Turn off RF.\n");
//printk("IPSEnter(): Turn off RF.\n");
pPSC->eInactivePowerState = eRfOff; pPSC->eInactivePowerState = eRfOff;
// queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem)); // queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));
InactivePsWorkItemCallback(dev); InactivePsWorkItemCallback(dev);
...@@ -4059,7 +4053,6 @@ IPSLeave(struct net_device *dev) ...@@ -4059,7 +4053,6 @@ IPSLeave(struct net_device *dev)
if (rtState != eRfOn && !pPSC->bSwRfProcessing && priv->ieee80211->RfOffReason <= RF_CHANGE_BY_IPS) if (rtState != eRfOn && !pPSC->bSwRfProcessing && priv->ieee80211->RfOffReason <= RF_CHANGE_BY_IPS)
{ {
RT_TRACE(COMP_POWER, "IPSLeave(): Turn on RF.\n"); RT_TRACE(COMP_POWER, "IPSLeave(): Turn on RF.\n");
//printk("IPSLeave(): Turn on RF.\n");
pPSC->eInactivePowerState = eRfOn; pPSC->eInactivePowerState = eRfOn;
// queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem)); // queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));
InactivePsWorkItemCallback(dev); InactivePsWorkItemCallback(dev);
...@@ -4150,14 +4143,11 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) ...@@ -4150,14 +4143,11 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
return; return;
hal_dm_watchdog(dev); hal_dm_watchdog(dev);
#ifdef ENABLE_IPS #ifdef ENABLE_IPS
// printk("watch_dog ENABLE_IPS\n");
if(ieee->actscanning == false){ if(ieee->actscanning == false){
//printk("%d,%d,%d,%d\n", ieee->eRFPowerState, ieee->is_set_key, ieee->proto_stoppping, ieee->wx_set_enc);
if((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_NOLINK) && if((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_NOLINK) &&
(ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key && (ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key &&
(!ieee->proto_stoppping) && !ieee->wx_set_enc){ (!ieee->proto_stoppping) && !ieee->wx_set_enc){
if(ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){ if(ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
//printk("====================>haha:IPSEnter()\n");
IPSEnter(dev); IPSEnter(dev);
//ieee80211_stop_scan(priv->ieee80211); //ieee80211_stop_scan(priv->ieee80211);
} }
...@@ -4177,8 +4167,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) ...@@ -4177,8 +4167,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
if( ((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + ieee->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || if( ((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + ieee->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
(ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
{ {
//printk("ieee->LinkDetectInfo.NumRxUnicastOkInPeriod is %d,ieee->LinkDetectInfo.NumTxOkInPeriod is %d\n",
// ieee->LinkDetectInfo.NumRxUnicastOkInPeriod,ieee->LinkDetectInfo.NumTxOkInPeriod);
bEnterPS= false; bEnterPS= false;
} }
else else
...@@ -4186,7 +4174,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) ...@@ -4186,7 +4174,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
bEnterPS= true; bEnterPS= true;
} }
//printk("***bEnterPS = %d\n", bEnterPS);
// LeisurePS only work in infra mode. // LeisurePS only work in infra mode.
if(bEnterPS) if(bEnterPS)
{ {
...@@ -4248,7 +4235,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) ...@@ -4248,7 +4235,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
{ {
ResetType = rtl819x_ifcheck_resetornot(dev); ResetType = rtl819x_ifcheck_resetornot(dev);
check_reset_cnt = 3; check_reset_cnt = 3;
//DbgPrint("Start to check silent reset\n");
} }
spin_unlock_irqrestore(&priv->tx_lock,flags); spin_unlock_irqrestore(&priv->tx_lock,flags);
if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL) if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL)
...@@ -4784,7 +4770,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct ...@@ -4784,7 +4770,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
if(priv->stats.rx_rssi_percentage[rfpath] == 0) if(priv->stats.rx_rssi_percentage[rfpath] == 0)
{ {
priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath]; priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath];
//DbgPrint("MIMO RSSI initialize \n");
} }
if(pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath]) if(pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath])
{ {
...@@ -4816,12 +4801,10 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct ...@@ -4816,12 +4801,10 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX; slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX;
last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index]; last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index];
priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb; priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb;
//DbgPrint("slide_beacon_adc_pwdb_index = %d, last_beacon_adc_pwdb = %d, Adapter->RxStats.Slide_Beacon_Total = %d\n",
// slide_beacon_adc_pwdb_index, last_beacon_adc_pwdb, Adapter->RxStats.Slide_Beacon_Total); // slide_beacon_adc_pwdb_index, last_beacon_adc_pwdb, Adapter->RxStats.Slide_Beacon_Total);
} }
priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll; priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll;
priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll; priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll;
//DbgPrint("slide_beacon_adc_pwdb_index = %d, pPreviousRfd->Status.RxPWDBAll = %d\n", slide_beacon_adc_pwdb_index, pPreviousRfd->Status.RxPWDBAll);
slide_beacon_adc_pwdb_index++; slide_beacon_adc_pwdb_index++;
if(slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX) if(slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX)
slide_beacon_adc_pwdb_index = 0; slide_beacon_adc_pwdb_index = 0;
...@@ -4839,7 +4822,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct ...@@ -4839,7 +4822,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
if(priv->undecorated_smoothed_pwdb < 0) // initialize if(priv->undecorated_smoothed_pwdb < 0) // initialize
{ {
priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll; priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll;
//DbgPrint("First pwdb initialize \n");
} }
#if 1 #if 1
if(pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb) if(pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
...@@ -5094,7 +5076,6 @@ static void rtl8192_query_rxphystatus( ...@@ -5094,7 +5076,6 @@ static void rtl8192_query_rxphystatus(
cck_adc_pwdb[i] = (char)tmp_pwdb; cck_adc_pwdb[i] = (char)tmp_pwdb;
cck_adc_pwdb[i] /= 2; cck_adc_pwdb[i] /= 2;
pstats->cck_adc_pwdb[i] = precord_stats->cck_adc_pwdb[i] = cck_adc_pwdb[i]; pstats->cck_adc_pwdb[i] = precord_stats->cck_adc_pwdb[i] = cck_adc_pwdb[i];
//DbgPrint("RF-%d tmp_pwdb = 0x%x, cck_adc_pwdb = %d", i, tmp_pwdb, cck_adc_pwdb[i]);
} }
} }
#endif #endif
...@@ -5323,13 +5304,11 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev, ...@@ -5323,13 +5304,11 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev,
if(WLAN_FC_GET_FRAMETYPE(fc)== IEEE80211_STYPE_BEACON) if(WLAN_FC_GET_FRAMETYPE(fc)== IEEE80211_STYPE_BEACON)
{ {
bPacketBeacon = true; bPacketBeacon = true;
//DbgPrint("Beacon 2, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);
} }
if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK) if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)
{ {
if((!compare_ether_addr(praddr,dev->dev_addr))) if((!compare_ether_addr(praddr,dev->dev_addr)))
bToSelfBA = true; bToSelfBA = true;
//DbgPrint("BlockAck, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);
} }
#endif #endif
...@@ -6103,7 +6082,6 @@ void setKey( struct net_device *dev, ...@@ -6103,7 +6082,6 @@ void setKey( struct net_device *dev,
write_nic_dword(dev, WCAMI, TargetContent); write_nic_dword(dev, WCAMI, TargetContent);
write_nic_dword(dev, RWCAM, TargetCommand); write_nic_dword(dev, RWCAM, TargetCommand);
// printk("setkey cam =%8x\n", read_cam(dev, i+6*EntryNo));
} }
else if(i==1){//MAC else if(i==1){//MAC
TargetContent = (u32)(*(MacAddr+2)) | TargetContent = (u32)(*(MacAddr+2)) |
...@@ -6147,7 +6125,6 @@ bool NicIFEnableNIC(struct net_device* dev) ...@@ -6147,7 +6125,6 @@ bool NicIFEnableNIC(struct net_device* dev)
priv->bdisable_nic = false; //YJ,add,091111 priv->bdisable_nic = false; //YJ,add,091111
return -1; return -1;
} }
//printk("start adapter finished\n");
RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);
//priv->bfirst_init = false; //priv->bfirst_init = false;
......
drivers/staging/rtl8192e/r8192E_dm.c
View file @ 8875899c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7