From 5881f66af57a4d78bc83757be1b4c791886c0e37 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 26 Jul 2013 23:51:57 -0500 Subject: [PATCH] rtl8188eu: Remove DBG_RX_SIGNAL_DISPLAY_PROCESSING - not defined Signed-off-by: Larry Finger --- core/rtw_mlme.c | 32 +------------------------------- core/rtw_recv.c | 24 ------------------------ 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 175e87e..0003991 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -641,17 +641,6 @@ _func_enter_; rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */ - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 - if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { - DBG_88E("%s %s(%pm, ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" - , __func__ - , src->Ssid.Ssid, src->MacAddress, src->Configuration.DSConfig - ,ss_ori, sq_ori, rssi_ori - ,ss_smp, sq_smp, rssi_smp - ); - } - #endif - /* The rule below is 1/5 for sample value, 4/5 for history value */ if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(padapter->mlmepriv.cur_network.network), src)) { /* Take the recvpriv's value for the connected AP*/ @@ -662,8 +651,7 @@ _func_enter_; rssi_final = (src->Rssi+dst->Rssi*4)/5; else rssi_final = rssi_ori; - } - else { + } else { if (sq_smp != 101) { /* from the right channel */ ss_final = ((u32)(src->PhyInfo.SignalStrength)+(u32)(dst->PhyInfo.SignalStrength)*4)/5; sq_final = ((u32)(src->PhyInfo.SignalQuality)+(u32)(dst->PhyInfo.SignalQuality)*4)/5; @@ -684,15 +672,6 @@ _func_enter_; dst->PhyInfo.SignalQuality = sq_final; dst->Rssi = rssi_final; - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 - if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { - DBG_88E("%s %s(%pm SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n", - __func__, dst->Ssid.Ssid, dst->MacAddress, - dst->PhyInfo.SignalStrength, - dst->PhyInfo.SignalQuality, dst->Rssi); - } - #endif - _func_exit_; } @@ -1412,15 +1391,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality; /* the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled) */ padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength); - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 - DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" - "\n" - , __func__ - , padapter->recvpriv.signal_strength - , padapter->recvpriv.rssi - , padapter->recvpriv.signal_qual - ); - #endif rtw_set_signal_stat_timer(&padapter->recvpriv); /* update fw_state will clr _FW_UNDER_LINKING here indirectly */ diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 2970b3c..493987a 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -2602,12 +2602,6 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ u32 tmp_s, tmp_q; u8 avg_signal_strength = 0; u8 avg_signal_qual = 0; - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) - u32 num_signal_strength = 0; - #endif - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) - u32 num_signal_qual = 0; - #endif u8 _alpha = 3; /* this value is based on converging_constant = 5000 and sampling_interval = 1000 */ if (adapter->recvpriv.is_signal_dbg) { @@ -2618,18 +2612,12 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ if (recvpriv->signal_strength_data.update_req == 0) {/* update_req is clear, means we got rx */ avg_signal_strength = recvpriv->signal_strength_data.avg_val; - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) - num_signal_strength = recvpriv->signal_strength_data.total_num; - #endif /* after avg_vals are accquired, we can re-stat the signal values */ recvpriv->signal_strength_data.update_req = 1; } if (recvpriv->signal_qual_data.update_req == 0) {/* update_req is clear, means we got rx */ avg_signal_qual = recvpriv->signal_qual_data.avg_val; - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) - num_signal_qual = recvpriv->signal_qual_data.total_num; - #endif /* after avg_vals are accquired, we can re-stat the signal values */ recvpriv->signal_qual_data.update_req = 1; } @@ -2655,18 +2643,6 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ recvpriv->signal_strength = tmp_s; recvpriv->rssi = (s8)translate_percentage_to_dbm(tmp_s); recvpriv->signal_qual = tmp_q; - - #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) - DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" - ", num_signal_strength:%u, num_signal_qual:%u" - "\n" - , __func__ - , recvpriv->signal_strength - , recvpriv->rssi - , recvpriv->signal_qual - , num_signal_strength, num_signal_qual - ); - #endif } } rtw_set_signal_stat_timer(recvpriv);