diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 5301fd0..03d0110 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -112,7 +112,7 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) void _rtw_free_evt_priv (struct evt_priv *pevtpriv) { - RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv \n")); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("+_rtw_free_evt_priv\n")); #ifdef CONFIG_C2H_WK _cancel_workitem_sync(&pevtpriv->c2h_wk); @@ -129,7 +129,7 @@ void _rtw_free_evt_priv (struct evt_priv *pevtpriv) rtw_cbuf_free(pevtpriv->c2h_queue); #endif - RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv \n")); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv\n")); ; @@ -1881,7 +1881,7 @@ static void traffic_status_watchdog(struct adapter *padapter) if( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) { - /* DBG_871X("Tx = %d, Rx = %d \n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */ + /* DBG_871X("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */ bEnterPS= false; } else @@ -1963,7 +1963,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) switch(lps_ctrl_type) { case LPS_CTRL_SCAN: - /* DBG_871X("LPS_CTRL_SCAN \n"); */ + /* DBG_871X("LPS_CTRL_SCAN\n"); */ #ifdef CONFIG_BT_COEXIST BT_WifiScanNotify(padapter, true); if (BT_1Ant(padapter) == false) @@ -1976,11 +1976,11 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) } break; case LPS_CTRL_JOINBSS: - /* DBG_871X("LPS_CTRL_JOINBSS \n"); */ + /* DBG_871X("LPS_CTRL_JOINBSS\n"); */ LPS_Leave(padapter); break; case LPS_CTRL_CONNECT: - /* DBG_871X("LPS_CTRL_CONNECT \n"); */ + /* DBG_871X("LPS_CTRL_CONNECT\n"); */ mstatus = 1;/* connect */ /* Reset LPS Setting */ pwrpriv->LpsIdleCount = 0; @@ -1990,7 +1990,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) #endif break; case LPS_CTRL_DISCONNECT: - /* DBG_871X("LPS_CTRL_DISCONNECT \n"); */ + /* DBG_871X("LPS_CTRL_DISCONNECT\n"); */ mstatus = 0;/* disconnect */ #ifdef CONFIG_BT_COEXIST BT_WifiMediaStatusNotify(padapter, mstatus); @@ -2002,7 +2002,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); break; case LPS_CTRL_SPECIAL_PACKET: - /* DBG_871X("LPS_CTRL_SPECIAL_PACKET \n"); */ + /* DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); */ pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); #ifdef CONFIG_BT_COEXIST BT_SpecialPacketNotify(padapter); @@ -2013,7 +2013,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) } break; case LPS_CTRL_LEAVE: - /* DBG_871X("LPS_CTRL_LEAVE \n"); */ + /* DBG_871X("LPS_CTRL_LEAVE\n"); */ #ifdef CONFIG_BT_COEXIST BT_LpsLeave(padapter); if (BT_1Ant(padapter) == false) @@ -2652,7 +2652,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); if( pwlan == NULL) { - RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback \n")); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback\n")); spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); goto createbss_cmd_fail; } @@ -2700,7 +2700,7 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter* padapter , struct cmd_obj *p if(psta==NULL) { - RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info \n\n")); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n")); goto exit; } @@ -2721,7 +2721,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter* padapter, struct cmd_obj * if(psta==NULL) { - RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info \n\n")); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n")); goto exit; } diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 20e6a18..9b2341d 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -769,8 +769,8 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) if (word_en != 0xF) { ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false); - DBG_871X("offset=%x \n",offset); - DBG_871X("word_en=%x \n",word_en); + DBG_871X("offset=%x\n",offset); + DBG_871X("word_en=%x\n",word_en); for(i=0;icur_network.join_res = -2; @@ -167,14 +167,14 @@ u8 rtw_do_join(struct adapter * padapter) if(rtw_createbss_cmd(padapter)!=_SUCCESS) { - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n ")); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL***\n ")); ret = false; goto exit; } pmlmepriv->to_join = false; - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n ")); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode***\n ")); } else { /* can't associate ; reset under-linking */ @@ -186,7 +186,7 @@ u8 rtw_do_join(struct adapter * padapter) || rtw_to_roaming(padapter) > 0 ) { - /* DBG_871X("rtw_do_join() when no desired bss in scanning queue \n"); */ + /* DBG_871X("rtw_do_join() when no desired bss in scanning queue\n"); */ if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){ pmlmepriv->to_join = false; RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n.")); @@ -709,7 +709,7 @@ u8 rtw_set_802_11_add_wep(struct adapter* padapter, struct ndis_802_11_wep *wep) psecuritypriv->dot11PrivacyKeyIndex=keyid; - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x \n", + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n", psecuritypriv->dot11DefKey[keyid].skey[0],psecuritypriv->dot11DefKey[keyid].skey[1],psecuritypriv->dot11DefKey[keyid].skey[2], psecuritypriv->dot11DefKey[keyid].skey[3],psecuritypriv->dot11DefKey[keyid].skey[4],psecuritypriv->dot11DefKey[keyid].skey[5], psecuritypriv->dot11DefKey[keyid].skey[6],psecuritypriv->dot11DefKey[keyid].skey[7],psecuritypriv->dot11DefKey[keyid].skey[8], @@ -788,7 +788,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key) /* it must fail the request and return NDIS_STATUS_INVALID_DATA. */ RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0)); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0)); - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d \n" ,(int)key->KeyIndex)); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d\n" ,(int)key->KeyIndex)); ret= _FAIL; goto exit; } @@ -894,7 +894,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key) break; default: padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_; - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u \n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength)); break; } @@ -973,7 +973,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key) wep->KeyIndex = keyindex ; wep->KeyLength = key->KeyLength; - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n")); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy\n")); memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength); memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength); diff --git a/core/rtw_iol.c b/core/rtw_iol.c index 086a833..9852cac 100644 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -242,5 +242,5 @@ void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf) if(j%32 ==0) printk("\n");j++; } printk("\n"); - printk("============= ioreg_cmd len = %d =============== \n",buf_len); + printk("============= ioreg_cmd len = %d ===============\n",buf_len); } diff --git a/core/rtw_led.c b/core/rtw_led.c index b56440c..414781c 100644 --- a/core/rtw_led.c +++ b/core/rtw_led.c @@ -2237,7 +2237,7 @@ void BlinkHandler(PLED_871x pLed) break; default: - /* RT_TRACE(COMP_LED, DBG_LOUD, ("BlinkWorkItemCallback 0x%x \n", pHalData->LedStrategy)); */ + /* RT_TRACE(COMP_LED, DBG_LOUD, ("BlinkWorkItemCallback 0x%x\n", pHalData->LedStrategy)); */ /* SwLedBlink(pLed); */ break; } diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 10ff9da..1b03616 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -488,7 +488,7 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *f void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)/* struct wlan_network *pnetwork, _queue *free_queue) */ { ; - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid)); _rtw_free_network(pmlmepriv, pnetwork, is_freeall); ; } @@ -497,7 +497,7 @@ void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *p void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork ) { ; - /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); */ + /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid)); */ _rtw_free_network_nolock(pmlmepriv, pnetwork); ; } @@ -963,7 +963,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) /* update IBSS_network 's timestamp */ if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) { - /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n"); */ + /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE\n\n"); */ if(_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) { struct wlan_network* ibss_wlan = NULL; @@ -1251,7 +1251,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) } #endif /* CONFIG_P2P */ } else { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL \n\n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL\n\n")); } @@ -1450,7 +1450,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -1468,7 +1468,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -1589,7 +1589,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) spin_lock_bh(&pmlmepriv->lock); - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_joinbss_event_callback !! _enter_critical \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_joinbss_event_callback !! _enter_critical\n")); if(pnetwork->join_res > 0) { spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); @@ -1657,7 +1657,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) /* s5. Cancle assoc_timer */ _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer\n")); } else { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_joinbss_event_callback err: fw_state:%x", get_fwstate(pmlmepriv))); spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); @@ -1687,7 +1687,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); rtw_indicate_connect(adapter); } else { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Set Assoc_Timer = 1; can't find match ssid in scanned_q \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Set Assoc_Timer = 1; can't find match ssid in scanned_q\n")); #endif _set_timer(&pmlmepriv->assoc_timer, 1); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); @@ -1836,7 +1836,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) { /* the sta have been in sta_info_queue => do nothing */ - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n")); goto exit; /* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ } @@ -1999,7 +1999,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) if(rtw_createbss_cmd(adapter)!=_SUCCESS) { - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>stadel_event_callback: rtw_createbss_cmd status FAIL*** \n ")); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>stadel_event_callback: rtw_createbss_cmd status FAIL***\n ")); } @@ -2428,11 +2428,11 @@ sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,si if(psecuritypriv->dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X){ psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy; - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d \n", psetkeyparm->algorithm)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d\n", psetkeyparm->algorithm)); } else{ psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm; - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d \n", psetkeyparm->algorithm)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d\n", psetkeyparm->algorithm)); } psetkeyparm->keyid = (u8)keyid;/* 0~3 */ @@ -2441,7 +2441,7 @@ sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,si psecuritypriv->key_mask |= BIT(psetkeyparm->keyid); DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid, psecuritypriv->key_mask); - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d \n",psetkeyparm->algorithm, keyid)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d\n",psetkeyparm->algorithm, keyid)); switch(psetkeyparm->algorithm){ diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 2570b27..a50f7e5 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -2367,7 +2367,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra preorder_ctrl->enable = false; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, preorder_ctrl->indicate_seq); #endif } @@ -7925,7 +7925,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) psta->recvreorder_ctrl[tid].enable = false; psta->recvreorder_ctrl[tid].indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, psta->recvreorder_ctrl[tid].indicate_seq); #endif } diff --git a/core/rtw_odm.c b/core/rtw_odm.c index c912d5b..b747b16 100644 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -110,7 +110,7 @@ int _rtw_odm_dbg_comp_msg(struct adapter *adapter, char *buf, int len) int i; rtw_hal_get_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &dbg_comp); - cnt += snprintf(buf+cnt, len-cnt, "odm.DebugComponents = 0x%016llx \n", dbg_comp); + cnt += snprintf(buf+cnt, len-cnt, "odm.DebugComponents = 0x%016llx\n", dbg_comp); for (i=0;ips_flag = true; rfpwrstate = RfOnOffDetect(padapter); - DBG_871X("@@@@- #1 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); + DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); if(rfpwrstate!= pwrpriv->rf_pwrstate) { if(rfpwrstate == rf_off) @@ -239,7 +239,7 @@ void rtw_ps_processor(struct adapter*padapter) #endif /* CONFIG_AUTOSUSPEND */ { rfpwrstate = RfOnOffDetect(padapter); - DBG_871X("@@@@- #2 %s==> rfstate:%s \n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); + DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); if(rfpwrstate!= pwrpriv->rf_pwrstate) { @@ -928,7 +928,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) { - DBG_871X( "can't get autopm: \n"); + DBG_871X( "can't get autopm:\n"); } #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20)) usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 5ffdafc..a6ec111 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -407,7 +407,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){ /* rxdata_key_idx =( ((iv[3])>>6)&0x3) ; */ mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; - RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key\n")); /* DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n", */ /* psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx); */ @@ -421,7 +421,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){ } else{ mickey=&stainfo->dot11tkiprxmickey.skey[0]; - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key\n")); } datalen=precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;/* icv_len included the mic code */ @@ -462,7 +462,7 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){ *(precvframe->u.hdr.rx_data+i+6),*(precvframe->u.hdr.rx_data+i+7))); } RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet end [len=%d]======\n",precvframe->u.hdr.len)); - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d, \n",prxattrib->hdrlen)); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d,\n",prxattrib->hdrlen)); } RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ", @@ -531,7 +531,7 @@ static union recv_frame *decryptor(struct adapter *padapter,union recv_frame *pr if(prxattrib->key_index > WEP_KEYS) { - DBG_871X("prxattrib->key_index(%d) > WEP_KEYS \n", prxattrib->key_index); + DBG_871X("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index); switch(prxattrib->encrypt){ case _WEP40_: @@ -895,7 +895,7 @@ sint sta2sta_data_frame( /* filter packets that SA is myself or multicast or broadcast */ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n")); ret= _FAIL; goto exit; } @@ -1013,7 +1013,7 @@ sint ap2sta_data_frame( /* filter packets that SA is myself or multicast or broadcast */ if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr)); @@ -1537,7 +1537,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f if(psta==NULL){ - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__); #endif @@ -1784,33 +1784,33 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame) rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt)); if(bDumpRxPkt ==1){/* dump all rx packets */ int i; - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); for(i=0; i<64;i=i+8) DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); } else if(bDumpRxPkt ==2){ if(type== WIFI_MGT_TYPE){ int i; - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); for(i=0; i<64;i=i+8) DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); } } else if(bDumpRxPkt ==3){ if(type== WIFI_DATA_TYPE){ int i; - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); for(i=0; i<64;i=i+8) DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); - DBG_871X("############################# \n"); + DBG_871X("#############################\n"); } } switch (type) @@ -2502,7 +2502,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr /* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */ /* Indicate packets */ - /* RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!! \n")); */ + /* RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!!\n")); */ /* indicate this recv_frame */ @@ -2711,7 +2711,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame retval=wlanhdr_to_ethhdr (prframe); if(retval != _SUCCESS) { - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); #endif @@ -2794,7 +2794,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr prframe=portctrl(padapter, prframe); if (prframe == NULL) { - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__); #endif @@ -2806,7 +2806,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr ret = process_recv_indicatepkts(padapter, prframe); if (ret != _SUCCESS) { - RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail! \n")); + RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail!\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__); #endif diff --git a/core/rtw_security.c b/core/rtw_security.c index 8972a74..d4bd2b5 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -1851,9 +1851,9 @@ static sint aes_decipher(u8 *key, uint hdrlen, for(i=0;i<8;i++){ if(pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) { - RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x) \n", + RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n", i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i])); - DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x) \n", + DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n", i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]); res = _FAIL; } @@ -1918,7 +1918,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; if(psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) { - DBG_871X("not match packet_index=%d, install_index=%d \n" + DBG_871X("not match packet_index=%d, install_index=%d\n" , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid); res=_FAIL; goto exit; @@ -2788,12 +2788,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller) if (securitypriv->btkip_countermeasure == true) { u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time); if (passing_ms > 60*1000) { - DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s \n", + DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s\n", caller, ADPT_ARG(adapter), passing_ms/1000); securitypriv->btkip_countermeasure = false; securitypriv->btkip_countermeasure_time = 0; } else { - DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s \n", + DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s\n", caller, ADPT_ARG(adapter), passing_ms/1000); status = _FAIL; } diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 4f5204c..eb15c6a 100644 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -65,7 +65,7 @@ u8 sreset_get_wifi_status(struct adapter *padapter) if(WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status) { - DBG_8192C("==>%s error_status(0x%x) \n",__FUNCTION__,psrtpriv->Wifi_Error_Status); + DBG_8192C("==>%s error_status(0x%x)\n",__FUNCTION__,psrtpriv->Wifi_Error_Status); status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL))); } DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status); @@ -120,7 +120,7 @@ static void sreset_restore_security_station(struct adapter *padapter) { psta = rtw_get_stainfo(pstapriv, get_bssid(mlmepriv)); if (psta == NULL) { - /* DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); */ + /* DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n")); */ } else { diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 6834953..2bc8fd6 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -297,7 +297,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) for( i = 0; i < 16; i++ ) memcpy( &psta->sta_recvpriv.rxcache.tid_rxseq[ i ], &wRxSeqInitialValue, 2 ); - RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_info_,("alloc number_%d stainfo with hwaddr = %x %x %x %x %x %x \n", + RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_info_,("alloc number_%d stainfo with hwaddr = %x %x %x %x %x %x \n", pstapriv->asoc_sta_count , hwaddr[0], hwaddr[1], hwaddr[2],hwaddr[3],hwaddr[4],hwaddr[5])); init_addba_retry_timer(pstapriv->padapter, psta); @@ -409,7 +409,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) spin_unlock_bh(&pxmitpriv->lock); rtw_list_delete(&psta->hash_list); - RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",pstapriv->asoc_sta_count , psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5])); + RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",pstapriv->asoc_sta_count , psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5])); pstapriv->asoc_sta_count --; _cancel_timer_ex(&psta->addba_retry_timer); diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index e177d8d..207e373 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -630,7 +630,7 @@ void read_cam(struct adapter *padapter ,u8 entry) /* HW_VAR_CAM_READ */ cam_val[1]=addr+j; rtw_hal_get_hwreg(padapter, HW_VAR_CAM_READ, (u8 *)cam_val); - DBG_8192C("offset:0x%02x => 0x%08x \n",addr+j,cam_val[0]); + DBG_8192C("offset:0x%02x => 0x%08x\n",addr+j,cam_val[0]); } DBG_8192C("*********************************\n"); } @@ -1248,7 +1248,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) if(pht_info) { bcn_channel = pht_info->primary_channel; } else { /* we don't find channel IE, so don't check it */ - DBG_871X("Oops: %s we don't find channel IE, so don't check it \n", __func__); + DBG_871X("Oops: %s we don't find channel IE, so don't check it\n", __func__); bcn_channel = Adapter->mlmeextpriv.cur_channel; } } diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 98ecde6..06935a6 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -650,7 +650,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p ((tmp[21] == 67) && (tmp[23] == 68))) { /* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ - RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("======================update_attrib: get DHCP Packet \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("======================update_attrib: get DHCP Packet\n")); /* Use low rate to send DHCP packet. */ pattrib->dhcp_pkt = 1; } @@ -734,7 +734,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p } } if (psta->ieee8021x_blocked == true) { - RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == true \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\n psta->ieee8021x_blocked == true\n")); pattrib->encrypt = 0; @@ -942,7 +942,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr rtw_secgetmic(&micdata,&(mic[0])); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: before add mic code!!!\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: pattrib->last_txcmdsz=%d!!!\n",pattrib->last_txcmdsz)); - RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: mic[0]=0x%.2x ,mic[1]=0x%.2x ,mic[2]=0x%.2x ,mic[3]=0x%.2x \n\ + RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("xmitframe_addmic: mic[0]=0x%.2x ,mic[1]=0x%.2x ,mic[2]=0x%.2x ,mic[3]=0x%.2x\n\ mic[4]=0x%.2x ,mic[5]=0x%.2x ,mic[6]=0x%.2x ,mic[7]=0x%.2x !!!!\n", mic[0],mic[1],mic[2],mic[3],mic[4],mic[5],mic[6],mic[7])); /* add mic code and add the mic code length in last_txcmdsz */ @@ -1309,7 +1309,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct } if (pxmitframe->buf_addr == NULL){ - DBG_8192C("==> %s buf_addr==NULL \n",__FUNCTION__); + DBG_8192C("==> %s buf_addr==NULL\n",__FUNCTION__); return _FAIL; } @@ -1568,7 +1568,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s /*/dump all packet after mic ok { int pp; - printk("pattrib->pktlen = %d \n", pattrib->pktlen); + printk("pattrib->pktlen = %d\n", pattrib->pktlen); for(pp=0;pp< pattrib->pktlen; pp++) printk(" %02x ", mem_start[pp]); printk("\n"); @@ -1600,7 +1600,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s goto xmitframe_coalesce_fail; } - /* DBG_871X("%s, action frame category=%d \n", __func__, pframe[WLAN_HDR_A3_LEN]); */ + /* DBG_871X("%s, action frame category=%d\n", __func__, pframe[WLAN_HDR_A3_LEN]); */ /* according 802.11-2012 standard, these five types are not robust types */ if(subtype == WIFI_ACTION && (pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC || @@ -2280,7 +2280,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info * case 2: ptxservq = &(psta->sta_xmitpriv.bk_q); *(ac) = 3; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BK\n")); break; case 4: @@ -2294,7 +2294,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info * case 7: ptxservq = &(psta->sta_xmitpriv.vo_q); *(ac) = 0; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : VO\n")); break; case 0: @@ -2302,7 +2302,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info * default: ptxservq = &(psta->sta_xmitpriv.be_q); *(ac) = 2; - RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE \n")); + RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_get_sta_pending : BE\n")); break; } diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 3f3a1db..ed1d36e 100644 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -201,7 +201,7 @@ RateDownFinish: ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down, RPT Timing default\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down to RateID %d RateSGI %d\n", RateID, pRaInfo->RateSGI)); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDown_8188E() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDown_8188E()\n")); return 0; } @@ -214,7 +214,7 @@ odm_RateUp_8188E( u8 RateID, HighestRate; u8 i; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateUp_8188E() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateUp_8188E()\n")); if(NULL == pRaInfo) { ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateUp_8188E(): pRaInfo is NULL\n")); @@ -269,7 +269,7 @@ RateUpfinish: pRaInfo->DecisionRate=RateID; ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate up to RateID %d\n", RateID)); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d",pRaInfo->RAWaitingCounter,pRaInfo->RAPendingCounter)); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateUp_8188E() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateUp_8188E()\n")); return 0; } @@ -290,7 +290,7 @@ odm_RateDecision_8188E( /* u32 pool_retry; */ static u8 DynamicTxRPTTimingCounter=0; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDecision_8188E() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDecision_8188E()\n")); if (pRaInfo->Active && (pRaInfo->TOTAL > 0)) /* STA used and data packet exits */ { @@ -369,7 +369,7 @@ odm_RateDecision_8188E( odm_ResetRaCounter_8188E( pRaInfo); } - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDecision_8188E() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<=====odm_RateDecision_8188E()\n")); } static int @@ -470,7 +470,7 @@ odm_ARFBRefresh_8188E( pRaInfo->DecisionRate = pRaInfo->HighestRate; ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, - ("ODM_ARFBRefresh_8188E(): RateID=%d RateMask=%8.8x RAUseRate=%8.8x HighestRate=%d,DecisionRate=%d \n", + ("ODM_ARFBRefresh_8188E(): RateID=%d RateMask=%8.8x RAUseRate=%8.8x HighestRate=%d,DecisionRate=%d\n", pRaInfo->RateID, pRaInfo->RateMask, pRaInfo->RAUseRate, pRaInfo->HighestRate,pRaInfo->DecisionRate)); return 0; } @@ -637,7 +637,7 @@ ODM_RAInfo_Init( /* printk("%s ==>WirelessMode:0x%08x ,max_raid_idx:0x%02x\n ",__FUNCTION__,WirelessMode,max_rate_idx); */ ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, - ("ODM_RAInfo_Init(): WirelessMode:0x%08x ,max_raid_idx:0x%02x \n", + ("ODM_RAInfo_Init(): WirelessMode:0x%08x ,max_raid_idx:0x%02x\n", WirelessMode,max_rate_idx)); pRaInfo->DecisionRate = max_rate_idx; diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index 44c6fa2..c38904b 100644 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -55,7 +55,7 @@ static void setIqkMatrix( { s32 ele_A=0, ele_D, ele_C=0, TempCCk, value32; - /* printk("%s==> OFDM_index:%d \n",__FUNCTION__,OFDM_index); */ + /* printk("%s==> OFDM_index:%d\n",__FUNCTION__,OFDM_index); */ /* if(OFDM_index> OFDM_TABLE_SIZE_92D) */ /* */ @@ -259,7 +259,7 @@ odm_TxPwrTrackSetPwr88E( u8 rf = 0; u32 pwr = 0, TxAGC = 0; struct adapter *Adapter = pDM_Odm->Adapter; - /* printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel)); */ + /* printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC\n", *(pDM_Odm->pChannel)); */ ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel))); /* if (MP_DRIVER != 1) */ @@ -379,7 +379,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( pDM_Odm->RFCalibrateInfo.RegA24 = 0x090e1317; #endif - ODM_RT_TRACE(pDM_Odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("===>odm_TXPowerTrackingCallback_ThermalMeter_8188E, pDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase: %d \n", pDM_Odm->BbSwingIdxCckBase, pDM_Odm->BbSwingIdxOfdmBase)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("===>odm_TXPowerTrackingCallback_ThermalMeter_8188E, pDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase: %d\n", pDM_Odm->BbSwingIdxCckBase, pDM_Odm->BbSwingIdxOfdmBase)); ThermalValue = (u8)ODM_GetRFReg(pDM_Odm, RF_PATH_A, RF_T_METER_88E, 0xfc00); /* 0x42: RF Reg[15:10] 88E */ if (!ThermalValue || ! pDM_Odm->RFCalibrateInfo.TxPowerTrackControl) return; @@ -416,7 +416,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( if(ThermalValue_AVG_count) { ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("AVG Thermal Meter = 0x%x \n", ThermalValue)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("AVG Thermal Meter = 0x%x\n", ThermalValue)); } /* 4 5. Calculate delta, delta_LCK, delta_IQK. */ @@ -687,7 +687,7 @@ phy_PathA_RxIQK( u4tmp = 0x80007C00 | (regE94&0x3FF0000) | ((regE9C&0x3FF0000) >> 16); ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, u4tmp); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe40 = 0x%x u4tmp = 0x%x \n", ODM_GetBBReg(pDM_Odm, rTx_IQK, bMaskDWord), u4tmp)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("0xe40 = 0x%x u4tmp = 0x%x\n", ODM_GetBBReg(pDM_Odm, rTx_IQK, bMaskDWord), u4tmp)); /* 1 RX IQK */ @@ -1986,8 +1986,8 @@ if (*(pDM_Odm->mp_mode) == 1) is13simular = false; - /* ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQK !!!interface %d currentband %d ishardwareD %d \n", pDM_Odm->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter))); */ -/* RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate \n")); */ + /* ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("IQK !!!interface %d currentband %d ishardwareD %d\n", pDM_Odm->interfaceIndex, pHalData->CurrentBandType92D, IS_HARDWARE_TYPE_8192D(pAdapter))); */ +/* RT_TRACE(COMP_INIT,DBG_LOUD,("Acquire Mutex in IQCalibrate\n")); */ for (i=0; i<3; i++) { @@ -2030,7 +2030,7 @@ if (*(pDM_Odm->mp_mode) == 1) } } } -/* RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate \n")); */ +/* RT_TRACE(COMP_INIT,DBG_LOUD,("Release Mutex in IQCalibrate\n")); */ for (i=0; i<4; i++) { diff --git a/hal/odm.c b/hal/odm.c index 6a90731..ae1a7b4 100644 --- a/hal/odm.c +++ b/hal/odm.c @@ -1162,7 +1162,7 @@ ODM_Write_DIG( { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_REG(IGI_A,pDM_Odm)=0x%x, ODM_BIT(IGI,pDM_Odm)=0x%x \n", + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_REG(IGI_A,pDM_Odm)=0x%x, ODM_BIT(IGI,pDM_Odm)=0x%x\n", ODM_REG(IGI_A,pDM_Odm),ODM_BIT(IGI,pDM_Odm))); if(pDM_DigTable->CurIGValue != CurrentIGI)/* if(pDM_DigTable->PreIGValue != CurrentIGI) */ @@ -1190,11 +1190,11 @@ ODM_Write_DIG( break; } } - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("CurrentIGI(0x%02x). \n",CurrentIGI)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("CurrentIGI(0x%02x).\n",CurrentIGI)); /* pDM_DigTable->PreIGValue = pDM_DigTable->CurIGValue; */ pDM_DigTable->CurIGValue = CurrentIGI; } - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_Write_DIG():CurrentIGI=0x%x \n",CurrentIGI)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ODM_Write_DIG():CurrentIGI=0x%x\n",CurrentIGI)); } /* Need LPS mode for CE platform --2012--08--24--- */ @@ -1293,10 +1293,10 @@ odm_Adaptivity( bool EDCCA_State = 0; if(!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)) { - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("Go to odm_DynamicEDCCA() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("Go to odm_DynamicEDCCA()\n")); return; } - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_Adaptivity() =====> \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_Adaptivity() =====>\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("ForceEDCCA=%d, IGI_Base=0x%x, TH_L2H_ini = %d, TH_EDCCA_HL_diff = %d, AdapEn_RSSI = %d\n", pDM_Odm->ForceEDCCA, pDM_Odm->IGI_Base, pDM_Odm->TH_L2H_ini, pDM_Odm->TH_EDCCA_HL_diff, pDM_Odm->AdapEn_RSSI)); @@ -1443,7 +1443,7 @@ odm_DIG( if(*(pDM_Odm->pbScanInProcess)) { - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In Scan Progress \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: In Scan Progress\n")); return; } @@ -1452,7 +1452,7 @@ odm_DIG( { if(pDM_Odm->bDMInitialGainEnable == false) { - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing\n")); return; } } @@ -1612,7 +1612,7 @@ odm_DIG( if((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) ||(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)) { DIG_Dynamic_MIN = (u8) pDM_DigTable->AntDiv_RSSI_max; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d \n",pDM_DigTable->AntDiv_RSSI_max)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max)); } } else @@ -1646,7 +1646,7 @@ odm_DIG( /* 1 Modify DIG lower bound, deal with abnorally large false alarm */ if(pFalseAlmCnt->Cnt_all > 10000) { - ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("dm_DIG(): Abnornally false alarm case. \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("dm_DIG(): Abnornally false alarm case.\n")); if(pDM_DigTable->LargeFAHit != 3) pDM_DigTable->LargeFAHit++; @@ -1775,7 +1775,7 @@ odm_DIG( if(FirstDisConnect) { CurrentIGI = pDM_DigTable->rx_gain_range_min; - ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): First DisConnect \n")); + ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): First DisConnect\n")); } else { @@ -1786,7 +1786,7 @@ odm_DIG( CurrentIGI = CurrentIGI + 2; else if(pFalseAlmCnt->Cnt_all < 500) CurrentIGI = CurrentIGI - 2; - ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): England DIG \n")); + ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): England DIG\n")); } } ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): DIG End Adjust IGI\n")); @@ -2334,8 +2334,8 @@ u32 ODM_Get_Rate_Bitmap( } - /* printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x \n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap); */ - ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x \n",rssi_level,WirelessMode,rate_bitmap)); + /* printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap); */ + ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",rssi_level,WirelessMode,rate_bitmap)); return rate_bitmap; @@ -2481,7 +2481,7 @@ ODM_RAStateCheck( RATRState = DM_RATR_STA_MIDDLE; else RATRState = DM_RATR_STA_LOW; - /* printk("==>%s,RATRState:0x%02x ,RSSI:%d \n",__FUNCTION__,RATRState,RSSI); */ + /* printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__FUNCTION__,RATRState,RSSI); */ if( *pRATRState!=RATRState || bForceUpdate) { @@ -3761,9 +3761,9 @@ ODM_SingleDualAntennaDetection( /* Reload AFE Registers */ odm_PHY_ReloadAFERegisters(pDM_Odm, AFE_REG_8723A, AFE_Backup, 16); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_A[%d]= %d \n", 2416, AntA_report)); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d \n", 2416, AntB_report)); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d \n", 2416, AntO_report)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_A[%d]= %d\n", 2416, AntA_report)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_B[%d]= %d\n", 2416, AntB_report)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("psd_report_O[%d]= %d\n", 2416, AntO_report)); if(pDM_Odm->SupportICType == ODM_RTL8723A) @@ -3827,7 +3827,7 @@ ODM_SingleDualAntennaDetection( { pDM_SWAT_Table->ANTA_ON=true; pDM_SWAT_Table->ANTB_ON=true; - RT_TRACE(COMP_ANTENNA, DBG_LOUD, ("ODM_SingleDualAntennaDetection(): Dual Antenna \n")); + RT_TRACE(COMP_ANTENNA, DBG_LOUD, ("ODM_SingleDualAntennaDetection(): Dual Antenna\n")); } } else diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c index 22aebb7..c57b2d2 100644 --- a/hal/odm_HWConfig.c +++ b/hal/odm_HWConfig.c @@ -217,7 +217,7 @@ odm_EVMdbToPercentage( ret_val = Value; /* ret_val /= 2; */ - /* ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x \n", ret_val, ret_val)); */ + /* ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x\n", ret_val, ret_val)); */ if(ret_val >= 0) ret_val = 0; @@ -643,7 +643,7 @@ odm_Process_RSSIForDM( } else { - /* DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d \n", */ + /* DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d\n", */ /* pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]); */ pDM_Odm->RSSI_A = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A]; pDM_Odm->RSSI_B = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]; diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index fc2fc98..b8ca690 100644 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -34,7 +34,7 @@ ODM_DIG_LowerBound_88E( if(pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) { pDM_DigTable->rx_gain_range_min = (u8) pDM_DigTable->AntDiv_RSSI_max; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_DIG_LowerBound_88E(): pDM_DigTable->AntDiv_RSSI_max=%d \n",pDM_DigTable->AntDiv_RSSI_max)); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_DIG_LowerBound_88E(): pDM_DigTable->AntDiv_RSSI_max=%d\n",pDM_DigTable->AntDiv_RSSI_max)); } /* If only one Entry connected */ @@ -58,7 +58,7 @@ odm_RX_HWAntDivInit( return; } #endif - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_RX_HWAntDivInit() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_RX_HWAntDivInit()\n")); /* MAC Setting */ value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); @@ -99,7 +99,7 @@ odm_TRX_HWAntDivInit( #endif - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_TRX_HWAntDivInit() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_TRX_HWAntDivInit()\n")); /* MAC Setting */ value32 = ODM_GetMACReg(pDM_Odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord); @@ -142,7 +142,7 @@ odm_FastAntTrainingInit( struct adapter * Adapter = pDM_Odm->Adapter; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit() \n")); + ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n")); #if (MP_DRIVER == 1) if (*(pDM_Odm->mp_mode) == 1) { diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index feecd15..3fefce9 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -171,7 +171,7 @@ u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param) if(pHalData->fw_ractrl == true){ }else{ - DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); + DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__); res=_FAIL; } return res; @@ -192,7 +192,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask) FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf); }else{ - DBG_8192C("==>%s fw dont support RA \n",__FUNCTION__); + DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__); res=_FAIL; } return res; @@ -309,7 +309,7 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, __le16 mstatus_rpt u32 reg_macid_no_link = REG_MACID_NO_LINK_0; opmode = (u8) mst_rpt; macid = (u8)(mst_rpt >> 8) ; - DBG_871X("### %s: MStatus=%x MACID=%d \n", __FUNCTION__,opmode,macid); + DBG_871X("### %s: MStatus=%x MACID=%d\n", __FUNCTION__,opmode,macid); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); if(macid > 31){ @@ -857,11 +857,11 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state) switch(p2p_ps_state) { case P2P_PS_DISABLE: - DBG_8192C("P2P_PS_DISABLE \n"); + DBG_8192C("P2P_PS_DISABLE\n"); memset(p2p_ps_offload, 0 ,1); break; case P2P_PS_ENABLE: - DBG_8192C("P2P_PS_ENABLE \n"); + DBG_8192C("P2P_PS_ENABLE\n"); /* update CTWindow value. */ if( pwdinfo->ctwindow > 0 ) { @@ -914,11 +914,11 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state) } break; case P2P_PS_SCAN: - DBG_8192C("P2P_PS_SCAN \n"); + DBG_8192C("P2P_PS_SCAN\n"); p2p_ps_offload->discovery = 1; break; case P2P_PS_SCAN_DONE: - DBG_8192C("P2P_PS_SCAN_DONE \n"); + DBG_8192C("P2P_PS_SCAN_DONE\n"); p2p_ps_offload->discovery = 0; pwdinfo->p2p_ps_state = P2P_PS_ENABLE; break; diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 199a209..07f554c 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -167,7 +167,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf) u1temp =( (rtemp8 & 0xE0) >> 5); /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0)); */ - /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x \n", u1temp)); */ + /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x\n", u1temp)); */ rtemp8 = *(phymap+eFuse_Addr); @@ -207,7 +207,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf) /* Check word enable condition in the section */ if(!(wren & 0x01)) { - /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d \n", eFuse_Addr)); */ + /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr)); */ rtemp8 = *(phymap+eFuse_Addr); eFuse_Addr++; /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8)); */ @@ -406,7 +406,7 @@ static s32 iol_read_efuse( s32 rtl8188e_iol_efuse_patch(struct adapter *padapter) { s32 result = _SUCCESS; - printk("==> %s \n",__FUNCTION__); + printk("==> %s\n",__FUNCTION__); if(rtw_IOL_applied(padapter)){ iol_mode_enable(padapter, 1); @@ -442,7 +442,7 @@ static int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_fram int ret = _FAIL; u32 t1,t2; - /* printk("===> %s ,bndy_cnt = %d \n",__FUNCTION__,bndy_cnt); */ + /* printk("===> %s ,bndy_cnt = %d\n",__FUNCTION__,bndy_cnt); */ if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS) goto exit; { @@ -461,7 +461,7 @@ static int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_fram for(i=0;i> 5); /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x *rtemp&0xE0 0x%x\n", u1temp, *rtemp8 & 0xE0)); */ - /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x \n", u1temp)); */ + /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("extended header u1temp=%x\n", u1temp)); */ ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); @@ -1167,7 +1167,7 @@ Hal_EfuseReadEFuse88E( /* Check word enable condition in the section */ if(!(wren & 0x01)) { - /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d \n", eFuse_Addr)); */ + /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Addr=%d\n", eFuse_Addr)); */ ReadEFuseByte(Adapter, eFuse_Addr, rtemp8, bPseudoTest); eFuse_Addr++; /* RTPRINT(FEEPROM, EFUSE_READ_ALL, ("Data=0x%x\n", *rtemp8)); */ @@ -2930,7 +2930,7 @@ Hal_ReadPowerValueFromPROM_8188E( { /* printk(" IndexCCK_Base rfPath:%d group:%d,eeAddr:0x%02x ",rfPath,group,eeAddr); */ pwrInfo24G->IndexCCK_Base[rfPath][group] = PROMContent[eeAddr++]; - /* printk(" IndexCCK_Base:%02x \n",pwrInfo24G->IndexCCK_Base[rfPath][group] ); */ + /* printk(" IndexCCK_Base:%02x\n",pwrInfo24G->IndexCCK_Base[rfPath][group] ); */ if(pwrInfo24G->IndexCCK_Base[rfPath][group] == 0xFF) { pwrInfo24G->IndexCCK_Base[rfPath][group] = EEPROM_DEFAULT_24G_INDEX; @@ -2941,7 +2941,7 @@ Hal_ReadPowerValueFromPROM_8188E( { /* printk(" IndexBW40_Base rfPath:%d group:%d,eeAddr:0x%02x ",rfPath,group,eeAddr); */ pwrInfo24G->IndexBW40_Base[rfPath][group] = PROMContent[eeAddr++]; - /* printk(" IndexBW40_Base: %02x \n",pwrInfo24G->IndexBW40_Base[rfPath][group] ); */ + /* printk(" IndexBW40_Base: %02x\n",pwrInfo24G->IndexBW40_Base[rfPath][group] ); */ if(pwrInfo24G->IndexBW40_Base[rfPath][group] == 0xFF) pwrInfo24G->IndexBW40_Base[rfPath][group] = EEPROM_DEFAULT_24G_INDEX; } @@ -3059,7 +3059,7 @@ Hal_GetChnlGroup88E( *pGroup = 5; else { - /* RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 2.4 G, but Channel %d in Group not found \n",chnl)); */ + /* RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 2.4 G, but Channel %d in Group not found\n",chnl)); */ } } else @@ -3094,7 +3094,7 @@ Hal_GetChnlGroup88E( *pGroup = 11; else { - /* RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 5G, but Channel %d in Group not found \n",chnl)); */ + /* RT_TRACE(COMP_EFUSE,DBG_LOUD,("==>Hal_GetChnlGroup88E in 5G, but Channel %d in Group not found\n",chnl)); */ } } diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 14ad505..fddd407 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -1031,7 +1031,7 @@ phy_BB8190_Config_HardCode( struct adapter *Adapter ) { - /* RT_ASSERT(false, ("This function is not implement yet!! \n")); */ + /* RT_ASSERT(false, ("This function is not implement yet!!\n")); */ return _SUCCESS; } @@ -1312,7 +1312,7 @@ PHY_CheckBBAndRFOK( /* */ if(ulRegRead != WriteData[i]) { - /* RT_TRACE(COMP_FPGA, DBG_LOUD, ("ulRegRead: %lx, WriteData: %lx \n", ulRegRead, WriteData[i])); */ + /* RT_TRACE(COMP_FPGA, DBG_LOUD, ("ulRegRead: %lx, WriteData: %lx\n", ulRegRead, WriteData[i])); */ rtStatus = _FAIL; break; } @@ -1335,14 +1335,14 @@ rtl8192c_PHY_GetHWRegOriginalValue( pHalData->DefaultInitialGain[2] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XCAGCCore1, bMaskByte0); pHalData->DefaultInitialGain[3] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XDAGCCore1, bMaskByte0); /* RT_TRACE(COMP_INIT, DBG_LOUD, */ - /* Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x) \n", */ + /* Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n", */ /* pHalData->DefaultInitialGain[0], pHalData->DefaultInitialGain[1], */ /* pHalData->DefaultInitialGain[2], pHalData->DefaultInitialGain[3])); */ /* read framesync */ pHalData->framesync = (u8)PHY_QueryBBReg(Adapter, rOFDM0_RxDetector3, bMaskByte0); pHalData->framesyncC34 = PHY_QueryBBReg(Adapter, rOFDM0_RxDetector2, bMaskDWord); - /* RT_TRACE(COMP_INIT, DBG_LOUD, ("Default framesync (0x%x) = 0x%x \n", */ + /* RT_TRACE(COMP_INIT, DBG_LOUD, ("Default framesync (0x%x) = 0x%x\n", */ /* rOFDM0_RxDetector3, pHalData->framesync)); */ } @@ -1824,7 +1824,7 @@ _PHY_SetBWMode92C( /* pHalData->SetBWModeInProgress= false; */ - /* RT_TRACE(COMP_SCAN, DBG_LOUD, ("<==PHY_SetBWModeCallback8192C() \n" )); */ + /* RT_TRACE(COMP_SCAN, DBG_LOUD, ("<==PHY_SetBWModeCallback8192C()\n" )); */ } diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index e508c18..1873e2f 100644 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -232,8 +232,8 @@ rtl8188e_PHY_RF6052SetCckTxPower( ODM_TxPwrTrackAdjust88E(&pHalData->odmpriv, 1, &direction, &pwrtrac_value); - /* printk("ODM_TxPwrTrackAdjust88E => direction:%02x, pwrtrac_value:%d \n", direction, pwrtrac_value); */ - /* printk(" ==> TxAGC:0x%08x \n",TxAGC[0] ); */ + /* printk("ODM_TxPwrTrackAdjust88E => direction:%02x, pwrtrac_value:%d\n", direction, pwrtrac_value); */ + /* printk(" ==> TxAGC:0x%08x\n",TxAGC[0] ); */ if (direction == 1) /* Increase TX pwoer */ { @@ -257,7 +257,7 @@ rtl8188e_PHY_RF6052SetCckTxPower( ptr++; } } - /* printk(" ==> TxAGC:0x%08x \n",TxAGC[0] ); */ + /* printk(" ==> TxAGC:0x%08x\n",TxAGC[0] ); */ /* rf-A cck tx power */ tmpval = TxAGC[RF_PATH_A]&0xff; @@ -541,7 +541,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( u8 index = 0; - /* DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d) \n", Channel); */ + /* DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel); */ getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]); diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c index db22032..fb48d95 100644 --- a/hal/rtl8188e_sreset.c +++ b/hal/rtl8188e_sreset.c @@ -78,16 +78,16 @@ void rtl8188e_sreset_linked_status_check(struct adapter *padapter) u8 fw_status=0; rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS); if(rx_dma_status!= 0x00){ - DBG_8192C("%s REG_RXDMA_STATUS:0x%08x \n",__FUNCTION__,rx_dma_status); + DBG_8192C("%s REG_RXDMA_STATUS:0x%08x\n",__FUNCTION__,rx_dma_status); rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status); } fw_status = rtw_read8(padapter,REG_FMETHR); if(fw_status != 0x00) { if(fw_status == 1) - DBG_8192C("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__FUNCTION__,fw_status); + DBG_8192C("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__FUNCTION__,fw_status); else if(fw_status == 2) - DBG_8192C("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__FUNCTION__,fw_status); + DBG_8192C("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__FUNCTION__,fw_status); } if (psrtpriv->dbg_trigger_point == SRESET_TGP_LINK_STATUS) { psrtpriv->dbg_trigger_point = SRESET_TGP_NULL; diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 3c1e214..13d8af3 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -260,7 +260,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3F); qsel = (uint)(pattrib->qsel & 0x0000001f); - /* DBG_8192C("==> macid(%d) qsel:0x%02x \n",pattrib->mac_id,qsel); */ + /* DBG_8192C("==> macid(%d) qsel:0x%02x\n",pattrib->mac_id,qsel); */ ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00); ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< RATE_ID_SHT) & 0x000F0000); @@ -568,12 +568,12 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm if (pxmitbuf == NULL) { pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); if (pxmitbuf == NULL){ - /* DBG_871X("%s #1, connot alloc xmitbuf!!!! \n",__FUNCTION__); */ + /* DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__); */ return false; } } -/* DBG_8192C("%s ===================================== \n",__FUNCTION__); */ +/* DBG_8192C("%s =====================================\n",__FUNCTION__); */ /* 3 1. pick up first frame */ do { rtw_free_xmitframe(pxmitpriv, pxmitframe); @@ -614,7 +614,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pxmitframe->pkt_offset = 1; /* first frame of aggregation, reserve offset */ if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { - DBG_871X("%s coalesce 1st xmitframe failed \n",__FUNCTION__); + DBG_871X("%s coalesce 1st xmitframe failed\n",__FUNCTION__); continue; } @@ -731,7 +731,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { - DBG_871X("%s coalesce failed \n",__FUNCTION__); + DBG_871X("%s coalesce failed\n",__FUNCTION__); rtw_free_xmitframe(pxmitpriv, pxmitframe); continue; } @@ -808,7 +808,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe) { s32 res = _SUCCESS; -/* DBG_8192C("==> %s \n",__FUNCTION__); */ +/* DBG_8192C("==> %s\n",__FUNCTION__); */ res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); if (res == _SUCCESS) { diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 1c0c514..ab10018 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -67,7 +67,7 @@ _ConfigNormalChipOutEP_8188E( break; } - DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d) \n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); + DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); } @@ -191,7 +191,7 @@ static void _InitPABias(struct adapter *padapter) /* efuse_one_byte_read(padapter, 0x1FA, &pa_setting); */ pa_setting = EFUSE_Read1Byte(padapter, 0x1FA); - /* RT_TRACE(COMP_INIT, DBG_LOUD, ("_InitPABias 0x1FA 0x%x \n",pa_setting)); */ + /* RT_TRACE(COMP_INIT, DBG_LOUD, ("_InitPABias 0x1FA 0x%x\n",pa_setting)); */ if(!(pa_setting & BIT0)) { @@ -1317,7 +1317,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) status = PHY_MACConfig8188E(Adapter); if(status == _FAIL) { - DBG_871X(" ### Failed to init MAC ...... \n "); + DBG_871X(" ### Failed to init MAC ......\n "); goto exit; } #endif @@ -1330,7 +1330,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) status = PHY_BBConfig8188E(Adapter); if(status == _FAIL) { - DBG_871X(" ### Failed to init BB ...... \n "); + DBG_871X(" ### Failed to init BB ......\n "); goto exit; } #endif @@ -1341,7 +1341,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) status = PHY_RFConfig8188E(Adapter); if(status == _FAIL) { - DBG_871X(" ### Failed to init RF ...... \n "); + DBG_871X(" ### Failed to init RF ......\n "); goto exit; } #endif @@ -1349,7 +1349,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter) HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH); status = rtl8188e_iol_efuse_patch(Adapter); if(status == _FAIL){ - DBG_871X("%s rtl8188e_iol_efuse_patch failed \n",__FUNCTION__); + DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__FUNCTION__); goto exit; } @@ -1630,7 +1630,7 @@ static u32 rtl8188eu_hal_deinit(struct adapter *Adapter) { struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - DBG_8192C("==> %s \n",__FUNCTION__); + DBG_8192C("==> %s\n",__FUNCTION__); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMRE_88E, IMR_DISABLED_88E); @@ -1672,7 +1672,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) status = _SUCCESS; - RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("===> usb_inirp_init \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("===> usb_inirp_init\n")); precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR; @@ -1682,7 +1682,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) { if(_read_port(pintfhdl, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == false ) { - RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_port error\n")); status = _FAIL; goto exit; } @@ -1701,14 +1701,14 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) _read_interrupt = pintfhdl->io_ops._read_interrupt; if(_read_interrupt(pintfhdl, RECV_INT_IN_ADDR) == false ) { - RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_err_,("usb_rx_init: usb_read_interrupt error\n")); status = _FAIL; } #endif exit: - RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("<=== usb_inirp_init \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("<=== usb_inirp_init\n")); ; @@ -1718,11 +1718,11 @@ exit: static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) { - RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit\n")); rtw_read_port_cancel(Adapter); - RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit \n")); + RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n <=== usb_rx_deinit\n")); return _SUCCESS; } @@ -2446,11 +2446,11 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) break; case HW_VAR_ON_RCR_AM: rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_AM); - DBG_871X("%s, %d, RCR= %x \n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); + DBG_871X("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); break; case HW_VAR_OFF_RCR_AM: rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)& (~RCR_AM)); - DBG_871X("%s, %d, RCR= %x \n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); + DBG_871X("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); break; case HW_VAR_BEACON_INTERVAL: rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); @@ -2507,7 +2507,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) break; case HW_VAR_DM_FLAG: podmpriv->SupportAbility = *((u8 *)val); - /* DBG_871X("HW_VAR_DM_FLAG ==> SupportAbility:0x%08x \n",podmpriv->SupportAbility ); */ + /* DBG_871X("HW_VAR_DM_FLAG ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */ break; case HW_VAR_DM_FUNC_OP: if(val[0]) @@ -2518,7 +2518,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) {/* restore dm flag */ podmpriv->SupportAbility = podmpriv->BK_SupportAbility; } - /* DBG_871X("HW_VAR_DM_FUNC_OP ==> %s SupportAbility:0x%08x \n", */ + /* DBG_871X("HW_VAR_DM_FUNC_OP ==> %s SupportAbility:0x%08x\n", */ /* (val[0]==1)?"Save":"Restore", */ /* podmpriv->SupportAbility */ /* ); */ @@ -2531,7 +2531,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) else{ podmpriv->SupportAbility |= *((u32 *)val); } - /* DBG_871X("HW_VAR_DM_FUNC_SET ==> SupportAbility:0x%08x \n",podmpriv->SupportAbility ); */ + /* DBG_871X("HW_VAR_DM_FUNC_SET ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */ break; case HW_VAR_DM_FUNC_CLR: podmpriv->SupportAbility &= *((u32 *)val); @@ -2562,9 +2562,9 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) ulCommand= ulCommand | CAM_POLLINIG|CAM_WRITE; /* write content 0 is equall to mark invalid */ rtw_write32(Adapter, WCAMI, ulContent); /* delay_ms(40); */ - /* RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A4: %lx \n",ulContent)); */ + /* RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A4: %lx\n",ulContent)); */ rtw_write32(Adapter, RWCAM, ulCommand); /* delay_ms(40); */ - /* RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A0: %lx \n",ulCommand)); */ + /* RT_TRACE(COMP_SEC, DBG_LOUD, ("CAM_empty_entry(): WRITE A0: %lx\n",ulCommand)); */ } } break; @@ -2811,7 +2811,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) break; }while(trycnt--); if(trycnt ==0) - DBG_8192C("Stop RX DMA failed...... \n"); + DBG_8192C("Stop RX DMA failed......\n"); /* RQPN Load 0 */ rtw_write16(Adapter,REG_RQPN_NPQ,0x0); @@ -3371,7 +3371,7 @@ void rtl8188eu_set_hal_ops(struct adapter * padapter) padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE)); if(padapter->HalData == NULL){ - DBG_8192C("cant not alloc memory for HAL DATA \n"); + DBG_8192C("cant not alloc memory for HAL DATA\n"); } padapter->hal_data_sz = sizeof(HAL_DATA_TYPE); diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index d5a5e4b..3e9f710 100644 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -58,7 +58,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u pIo_buf = pdvobjpriv->usb_vendor_req_buf; if ( pIo_buf== NULL) { - DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ ); + DBG_8192C( "[%s] pIo_buf == NULL\n", __FUNCTION__ ); status = -ENOMEM; goto release_mutex; } @@ -301,13 +301,13 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4); if ( pHalData->IntArray[1] & IMR_TXERR_88E ) - DBG_871X("===> %s Tx Error Flag Interrupt Status \n",__FUNCTION__); + DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__); if ( pHalData->IntArray[1] & IMR_RXERR_88E ) - DBG_871X("===> %s Rx Error Flag INT Status \n",__FUNCTION__); + DBG_871X("===> %s Rx Error Flag INT Status\n",__FUNCTION__); if ( pHalData->IntArray[1] & IMR_TXFOVW_88E ) - DBG_871X("===> %s Transmit FIFO Overflow \n",__FUNCTION__); + DBG_871X("===> %s Transmit FIFO Overflow\n",__FUNCTION__); if ( pHalData->IntArray[1] & IMR_RXFOVW_88E ) - DBG_871X("===> %s Receive FIFO Overflow \n",__FUNCTION__); + DBG_871X("===> %s Receive FIFO Overflow\n",__FUNCTION__); /* C2H Event */ if (pbuf[0]!= 0){ @@ -478,7 +478,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) { RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); - DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len \n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __FUNCTION__, __LINE__); rtw_free_recvframe(precvframe, pfree_recv_queue); goto _exit_recvbuf2recvframe; } @@ -528,7 +528,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb) { if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)) { - DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame \n"); + DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame\n"); rtw_free_recvframe(precvframe, pfree_recv_queue); goto _exit_recvbuf2recvframe; } @@ -577,12 +577,12 @@ static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb) } else{ /* pkt_rpt_type == TX_REPORT1-CCX, TX_REPORT2-TX RTP,HIS_REPORT-USB HISR RTP */ /* enqueue recvframe to txrtp queue */ if (pattrib->pkt_rpt_type == TX_REPORT1){ - /* DBG_8192C("rx CCX \n"); */ + /* DBG_8192C("rx CCX\n"); */ /* CCX-TXRPT ack for xmit mgmt frames. */ handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data); } else if (pattrib->pkt_rpt_type == TX_REPORT2){ - /* DBG_8192C("rx TX RPT \n"); */ + /* DBG_8192C("rx TX RPT\n"); */ ODM_RA_TxRPT2Handle_8188E( &pHalData->odmpriv, precvframe->u.hdr.rx_data, @@ -622,7 +622,7 @@ void rtl8188eu_recv_tasklet(void *priv) { if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved== true)) { - DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved \n"); + DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved\n"); rtw_skb_free(pskb); break; } @@ -699,7 +699,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) } else { - RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0 \n", purb->status)); + RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete : purb->status(%d) != 0\n", purb->status)); DBG_8192C("###=> usb_read_port_complete => urb status(%d)\n", purb->status); diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index cca2ae4..1d34b86 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -343,7 +343,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl bssinf_len = pnetwork->network.IELength+sizeof (struct rtw_ieee80211_hdr_3addr); if(bssinf_len > MAX_BSSINFO_LEN){ - DBG_871X("%s IE Length too long > %d byte \n",__FUNCTION__,MAX_BSSINFO_LEN); + DBG_871X("%s IE Length too long > %d byte\n",__FUNCTION__,MAX_BSSINFO_LEN); goto exit; } @@ -1247,14 +1247,14 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param struct sta_info * psta,*pbcmc_sta; struct sta_priv * pstapriv = &padapter->stapriv; - /* DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X \n", __func__); */ + /* DBG_8192C("%s, : dot11AuthAlgrthm == dot11AuthAlgrthm_8021X\n", __func__); */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == true) /* sta mode */ { psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); if (psta == NULL) { - /* DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail \n")); */ - DBG_8192C("%s, : Obtain Sta_info fail \n", __func__); + /* DEBUG_ERR( ("Set wpa_set_encryption: Obtain Sta_info fail\n")); */ + DBG_8192C("%s, : Obtain Sta_info fail\n", __func__); } else { @@ -1272,7 +1272,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param if(param->u.crypt.set_tx ==1)/* pairwise key */ { - DBG_8192C("%s, : param->u.crypt.set_tx ==1 \n", __func__); + DBG_8192C("%s, : param->u.crypt.set_tx ==1\n", __func__); memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); @@ -1338,7 +1338,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param pbcmc_sta=rtw_get_bcmc_stainfo(padapter); if(pbcmc_sta==NULL) { - /* DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null \n")); */ + /* DEBUG_ERR( ("Set OID_802_11_ADD_KEY: bcmc stainfo is null\n")); */ } else { @@ -1989,7 +1989,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS)) { - DBG_8192C("AP mode process WPS \n"); + DBG_8192C("AP mode process WPS\n"); } need_indicate_scan_done = true; @@ -2267,7 +2267,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel int i; DBG_8192C("set wpa_ie(length:%zu):\n", ielen); for(i=0;imode])); + RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("\n Mode: %s is not supported \n", iw_operation_mode[wrqu->mode])); goto exit; } @@ -1163,7 +1163,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode\n")); if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) wrqu->mode = IW_MODE_INFRA; @@ -2023,7 +2023,7 @@ static int rtw_wx_set_rate(struct net_device *dev, u32 ratevalue = 0; u8 mpdatarate[NumRates]={11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff}; - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_set_rate \n")); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_set_rate\n")); RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("target_rate = %d, fixed = %d\n",target_rate,fixed)); if(target_rate == -1){ @@ -3444,7 +3444,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, /* YY => SSID Length */ /* SSID => SSID for persistence group */ - DBG_871X( "[%s] In value = %s, len = %d \n", __FUNCTION__, extra, wrqu->data.length -1); + DBG_871X( "[%s] In value = %s, len = %d\n", __FUNCTION__, extra, wrqu->data.length -1); /* The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function. */ @@ -4623,7 +4623,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) { /* Handle the P2P Device ID attribute of Beacon first */ - printk( "[%s] P2P_ATTR_DEVICE_ID \n", __FUNCTION__ ); + printk( "[%s] P2P_ATTR_DEVICE_ID\n", __FUNCTION__ ); if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) { uintPeerChannel = pnetwork->network.Configuration.DSConfig; @@ -4633,7 +4633,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) { /* Handle the P2P Device Info attribute of probe response */ - printk( "[%s] P2P_ATTR_DEVICE_INFO \n", __FUNCTION__ ); + printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __FUNCTION__ ); if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) { uintPeerChannel = pnetwork->network.Configuration.DSConfig; @@ -6043,7 +6043,7 @@ static int rtw_dbg_port(struct net_device *dev, case 0x17: { struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - printk("===> Fixed channel to %d \n",extra_arg); + printk("===> Fixed channel to %d\n",extra_arg); pmlmeext->fixed_chan = extra_arg; } @@ -6096,14 +6096,14 @@ static int rtw_dbg_port(struct net_device *dev, if(0xf==extra_arg){ rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag); - DBG_871X(" === DMFlag(0x%08x) === \n",odm_flag); - DBG_871X("extra_arg = 0 - disable all dynamic func \n"); + DBG_871X(" === DMFlag(0x%08x) ===\n",odm_flag); + DBG_871X("extra_arg = 0 - disable all dynamic func\n"); DBG_871X("extra_arg = 1 - disable DIG- BIT(0)\n"); DBG_871X("extra_arg = 2 - disable High power - BIT(1)\n"); DBG_871X("extra_arg = 3 - disable tx power tracking - BIT(2)\n"); DBG_871X("extra_arg = 4 - disable BT coexistence - BIT(3)\n"); DBG_871X("extra_arg = 5 - disable antenna diversity - BIT(4)\n"); - DBG_871X("extra_arg = 6 - enable all dynamic func \n"); + DBG_871X("extra_arg = 6 - enable all dynamic func\n"); } else{ /* extra_arg = 0 - disable all dynamic func @@ -6113,7 +6113,7 @@ static int rtw_dbg_port(struct net_device *dev, */ rtw_hal_set_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &(extra_arg)); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC,&odm_flag); - DBG_871X(" === DMFlag(0x%08x) === \n",odm_flag); + DBG_871X(" === DMFlag(0x%08x) ===\n",odm_flag); } } break; @@ -8049,7 +8049,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, *extra = 0; for (i=0; ifakeEfuseModifiedMap[addr+i]); + DBG_871X("wlrfkrmap = 0x%02x\n", pEfuseHal->fakeEfuseModifiedMap[addr+i]); sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[addr+i]); } } else if (strcmp(tmp[0],"btrfkrmap")== 0) { @@ -8072,7 +8072,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, *extra = 0; for (i=0; ifakeBTEfuseModifiedMap[addr+i]); + DBG_871X("wlrfkrmap = 0x%02x\n", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); } } else { @@ -8352,9 +8352,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, else if (strcmp(tmp[0], "wldumpfake") == 0) { if (rtw_efuse_map_read(padapter, 0, EFUSE_MAP_SIZE, pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) { - DBG_871X("%s: WiFi hw efuse dump to Fake map success \n", __FUNCTION__); + DBG_871X("%s: WiFi hw efuse dump to Fake map success\n", __FUNCTION__); } else { - DBG_871X("%s: WiFi hw efuse dump to Fake map Fail \n", __FUNCTION__); + DBG_871X("%s: WiFi hw efuse dump to Fake map Fail\n", __FUNCTION__); err = -EFAULT; } } diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index a02dad3..609d5cf 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -420,7 +420,7 @@ int hostapd_mode_init(struct adapter *padapter) pnetdev->watchdog_timeo = HZ; /* 1 second timeout */ if(dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0) - DBG_871X("hostapd_mode_init(): dev_alloc_name, fail! \n"); + DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n"); mac[0]=0x00; mac[1]=0xe0; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 40b92b9..4f5dba5 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -534,7 +534,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) if(dev_alloc_name(pnetdev, ifname) < 0) { - RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n")); } netif_carrier_off(pnetdev); @@ -859,17 +859,17 @@ void rtw_cancel_all_timer(struct adapter *padapter) RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n")); _cancel_timer_ex(&padapter->mlmepriv.assoc_timer); - RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete!\n")); _cancel_timer_ex(&padapter->mlmepriv.scan_to_timer); - RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer!\n")); _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); - RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n")); /* cancel sw led timer */ rtw_hal_sw_led_deinit(padapter); - RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds!\n")); _cancel_timer_ex(&(adapter_to_pwrctl(padapter)->pwr_state_check_timer)); @@ -879,7 +879,7 @@ void rtw_cancel_all_timer(struct adapter *padapter) _cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer); rtw_clear_scan_deny(padapter); - RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n")); + RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer!\n")); _cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); @@ -1576,7 +1576,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[]) if( !(*ip_addr) || !gw_index ) { - /* DBG_871X("No default GW \n"); */ + /* DBG_871X("No default GW\n"); */ return -1; } @@ -1584,7 +1584,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[]) if(gw_dev == NULL) { - /* DBG_871X("get Oif Device Fail \n"); */ + /* DBG_871X("get Oif Device Fail\n"); */ return -1; } @@ -1716,7 +1716,7 @@ int rtw_resume_common(struct adapter *padapter) DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); if(pm_netdev_open(pnetdev,true) != 0) { - DBG_871X("%s ==> pm_netdev_open failed \n",__FUNCTION__); + DBG_871X("%s ==> pm_netdev_open failed\n",__FUNCTION__); ret = -1; return ret; } diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index 692dee6..f56e8f5 100644 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -222,7 +222,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():skb != NULL !!!\n")); RT_TRACE(_module_recv_osdep_c_,_drv_info_,("rtw_recv_indicatepkt():precv_frame->u.hdr.rx_head=%p precv_frame->hdr.rx_data=%p\n", precv_frame->u.hdr.rx_head, precv_frame->u.hdr.rx_data)); - RT_TRACE(_module_recv_osdep_c_,_drv_info_,("precv_frame->hdr.rx_tail=%p precv_frame->u.hdr.rx_end=%p precv_frame->hdr.len=%d \n", precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len)); + RT_TRACE(_module_recv_osdep_c_,_drv_info_,("precv_frame->hdr.rx_tail=%p precv_frame->u.hdr.rx_end=%p precv_frame->hdr.len=%d\n", precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len)); skb->data = precv_frame->u.hdr.rx_data; diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index c571cb6..0b85588 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -558,7 +558,7 @@ int rtw_hw_suspend(struct adapter *padapter ) return 0; error_exit: - DBG_871X("%s, failed \n",__FUNCTION__); + DBG_871X("%s, failed\n",__FUNCTION__); return (-1); } @@ -605,7 +605,7 @@ int rtw_hw_resume(struct adapter *padapter) return 0; error_exit: - DBG_871X("%s, Open net dev failed \n",__FUNCTION__); + DBG_871X("%s, Open net dev failed\n",__FUNCTION__); return (-1); } @@ -847,7 +847,7 @@ int autoresume_enter(struct adapter* padapter) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); - DBG_871X("====> autoresume_enter \n"); + DBG_871X("====> autoresume_enter\n"); if(rf_off == pwrpriv->rf_pwrstate ) { @@ -897,7 +897,7 @@ int autoresume_enter(struct adapter* padapter) DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt); #endif /* ifndef CONFIG_BT_COEXIST */ } - DBG_871X("<==== autoresume_enter \n"); + DBG_871X("<==== autoresume_enter\n"); error_exit: return result; @@ -1016,7 +1016,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) if (usb_autopm_get_interface(pusb_intf) < 0) { - DBG_871X( "can't get autopm: \n"); + DBG_871X( "can't get autopm:\n"); } #endif #ifdef CONFIG_BT_COEXIST diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index fb56bf6..55bc62e 100644 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -292,7 +292,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl) precvbuf->reuse = true; if (precvbuf->purb) { - /* DBG_8192C("usb_read_port_cancel : usb_kill_urb \n"); */ + /* DBG_8192C("usb_read_port_cancel : usb_kill_urb\n"); */ usb_kill_urb(precvbuf->purb); } precvbuf++; @@ -343,7 +343,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) if(padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel) { RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); - DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x) \n", + DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n", __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); goto check_completion; @@ -353,7 +353,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) if (purb->status==0) { } else { - RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0 \n", purb->status)); + RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0\n", purb->status)); DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status); if((purb->status==-EPIPE)||(purb->status==-EPROTO)) { @@ -575,7 +575,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl) struct adapter *padapter = pintfhdl->padapter; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; - DBG_871X("%s \n", __func__); + DBG_871X("%s\n", __func__); padapter->bWritePortCancel = true;