skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 05:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Update logging

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-25 18:35:42 -05:00
parent d597e07a9e
commit 96adb823b9
54 changed files with 2268 additions and 2272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
core/rtw_ap.c
View file

@ -91,7 +91,7 @@ static void update_BCNTIM(_adapter *padapter)
WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network); WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network);
unsigned char *pie = pnetwork_mlmeext->IEs; unsigned char *pie = pnetwork_mlmeext->IEs;
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
//update TIM IE //update TIM IE
//if (pstapriv->tim_bitmap) //if (pstapriv->tim_bitmap)
@ -318,7 +318,7 @@ u8 chk_sta_is_alive(struct sta_info *psta)
{ {
u8 ret = _FALSE; u8 ret = _FALSE;
#ifdef DBG_EXPIRATION_CHK #ifdef DBG_EXPIRATION_CHK
DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" DBG_88E("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"
, MAC_ARG(psta->hwaddr) , MAC_ARG(psta->hwaddr)
, psta->rssi_stat.UndecoratedSmoothedPWDB , psta->rssi_stat.UndecoratedSmoothedPWDB
//, STA_RX_PKTS_ARG(psta) //, STA_RX_PKTS_ARG(psta)
@ -362,7 +362,7 @@ void expire_timeout_chk(_adapter *padapter)
//check auth_queue //check auth_queue
#ifdef DBG_EXPIRATION_CHK #ifdef DBG_EXPIRATION_CHK
if (rtw_end_of_queue_search(phead, plist) == _FALSE) { if (rtw_end_of_queue_search(phead, plist) == _FALSE) {
DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n" DBG_88E(FUNC_NDEV_FMT" auth_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt); , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt);
} }
#endif #endif
@ -379,7 +379,7 @@ void expire_timeout_chk(_adapter *padapter)
rtw_list_delete(&psta->auth_list); rtw_list_delete(&psta->auth_list);
pstapriv->auth_list_cnt--; pstapriv->auth_list_cnt--;
DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n", DBG_88E("auth expire %02X%02X%02X%02X%02X%02X\n",
psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]); psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]);
_exit_critical_bh(&pstapriv->auth_list_lock, &irqL); _exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
@ -407,7 +407,7 @@ void expire_timeout_chk(_adapter *padapter)
//check asoc_queue //check asoc_queue
#ifdef DBG_EXPIRATION_CHK #ifdef DBG_EXPIRATION_CHK
if (rtw_end_of_queue_search(phead, plist) == _FALSE) { if (rtw_end_of_queue_search(phead, plist) == _FALSE) {
DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n" DBG_88E(FUNC_NDEV_FMT" asoc_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt); , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt);
} }
#endif #endif
@ -432,14 +432,14 @@ void expire_timeout_chk(_adapter *padapter)
if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) { if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) {
// check sta by delba(addba) for 11n STA // check sta by delba(addba) for 11n STA
// ToDo: use CCX report to check for all STAs // ToDo: use CCX report to check for all STAs
//DBG_871X("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking); //DBG_88E("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking);
if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) { if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) {
DBG_871X("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2); DBG_88E("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 0; psta->under_exist_checking = 0;
psta->expire_to = 0; psta->expire_to = 0;
} else if ( psta->expire_to <= (pstapriv->expire_to - 3) && (psta->under_exist_checking==0)) { } else if ( psta->expire_to <= (pstapriv->expire_to - 3) && (psta->under_exist_checking==0)) {
DBG_871X("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2); DBG_88E("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 1; psta->under_exist_checking = 1;
//tear down TX AMPDU //tear down TX AMPDU
send_delba(padapter, 1, psta->hwaddr);// // originator send_delba(padapter, 1, psta->hwaddr);// // originator
@ -468,7 +468,7 @@ void expire_timeout_chk(_adapter *padapter)
psta->expire_to = pstapriv->expire_to; psta->expire_to = pstapriv->expire_to;
psta->state |= WIFI_STA_ALIVE_CHK_STATE; psta->state |= WIFI_STA_ALIVE_CHK_STATE;
//DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); //DBG_88E("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr));
//to update bcn with tim_bitmap for this station //to update bcn with tim_bitmap for this station
pstapriv->tim_bitmap |= BIT(psta->aid); pstapriv->tim_bitmap |= BIT(psta->aid);
@ -494,7 +494,7 @@ void expire_timeout_chk(_adapter *padapter)
rtw_list_delete(&psta->asoc_list); rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING); updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING);
} }
else else
@ -503,7 +503,7 @@ void expire_timeout_chk(_adapter *padapter)
if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt) if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt)
&& padapter->xmitpriv.free_xmitframe_cnt < (NR_XMITFRAME/pstapriv->asoc_list_cnt/2) && padapter->xmitpriv.free_xmitframe_cnt < (NR_XMITFRAME/pstapriv->asoc_list_cnt/2)
){ ){
DBG_871X("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__ DBG_88E("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__
, MAC_ARG(psta->hwaddr) , MAC_ARG(psta->hwaddr)
, psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt); , psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt);
wakeup_sta_to_xmit(padapter, psta); wakeup_sta_to_xmit(padapter, psta);
@ -539,21 +539,21 @@ if (chk_alive_num) {
psta->keep_alive_trycnt++; psta->keep_alive_trycnt++;
if (ret == _SUCCESS) if (ret == _SUCCESS)
{ {
DBG_871X("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr)); DBG_88E("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr));
psta->expire_to = pstapriv->expire_to; psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
continue; continue;
} }
else if (psta->keep_alive_trycnt <= 3) else if (psta->keep_alive_trycnt <= 3)
{ {
DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt); DBG_88E("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt);
psta->expire_to = 1; psta->expire_to = 1;
continue; continue;
} }
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
rtw_list_delete(&psta->asoc_list); rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
@ -651,7 +651,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
tx_ra_bitmap |= ((raid<<28)&0xf0000000); tx_ra_bitmap |= ((raid<<28)&0xf0000000);
DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n", DBG_88E("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n",
__func__ , psta->mac_id, raid ,tx_ra_bitmap, arg); __func__ , psta->mac_id, raid ,tx_ra_bitmap, arg);
//bitmap[0:27] = tx_rate_bitmap //bitmap[0:27] = tx_rate_bitmap
@ -671,7 +671,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
} }
else else
{ {
DBG_871X("station aid %d exceed the max number\n", psta->aid); DBG_88E("station aid %d exceed the max number\n", psta->aid);
} }
} }
@ -735,7 +735,7 @@ static void update_bmc_sta(_adapter *padapter)
raid = networktype_to_raid(network_type); raid = networktype_to_raid(network_type);
init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f; init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f;
//DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap); //DBG_88E("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap);
//ap mode //ap mode
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE); rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE);
@ -752,7 +752,7 @@ static void update_bmc_sta(_adapter *padapter)
tx_ra_bitmap |= ((raid<<28)&0xf0000000); tx_ra_bitmap |= ((raid<<28)&0xf0000000);
DBG_871X("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg); DBG_88E("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg);
//bitmap[0:27] = tx_rate_bitmap //bitmap[0:27] = tx_rate_bitmap
//bitmap[28:31]= Rate Adaptive id //bitmap[28:31]= Rate Adaptive id
@ -775,7 +775,7 @@ static void update_bmc_sta(_adapter *padapter)
} }
else else
{ {
DBG_871X("add_RATid_bmc_sta error!\n"); DBG_88E("add_RATid_bmc_sta error!\n");
} }
} }
@ -802,7 +802,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
//psta->mac_id = psta->aid+4; //psta->mac_id = psta->aid+4;
psta->mac_id = psta->aid+1; psta->mac_id = psta->aid+1;
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
//ap mode //ap mode
rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE); rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE);
@ -884,7 +884,7 @@ static void update_hw_ht_param(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
//handle A-MPDU parameter field //handle A-MPDU parameter field
@ -912,7 +912,7 @@ static void update_hw_ht_param(_adapter *padapter)
{ {
pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
}*/ }*/
DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
} }
// //
@ -941,7 +941,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
struct wifidirect_info *pwdinfo = &(padapter->wdinfo); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif //CONFIG_P2P #endif //CONFIG_P2P
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod; bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
cur_channel = pnetwork->Configuration.DSConfig; cur_channel = pnetwork->Configuration.DSConfig;
@ -1098,9 +1098,9 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
//To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter //To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter
DBG_871X("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n"); DBG_88E("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n");
DBG_871X("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset); DBG_88E("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset);
DBG_871X("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); DBG_88E("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
cur_channel = pbuddy_mlmeext->cur_channel; cur_channel = pbuddy_mlmeext->cur_channel;
if (cur_bwmode == HT_CHANNEL_WIDTH_40) if (cur_bwmode == HT_CHANNEL_WIDTH_40)
@ -1171,7 +1171,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset); DBG_88E("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
// //
pmlmeext->cur_channel = cur_channel; pmlmeext->cur_channel = cur_channel;
@ -1203,7 +1203,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
//issue beacon frame //issue beacon frame
if (send_beacon(padapter)==_FAIL) if (send_beacon(padapter)==_FAIL)
{ {
DBG_871X("issue_beacon, fail!\n"); DBG_88E("issue_beacon, fail!\n");
} }
#endif #endif
#endif //!CONFIG_INTERRUPT_BASED_TXBCN #endif //!CONFIG_INTERRUPT_BASED_TXBCN
@ -1252,7 +1252,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
/* ht_capab, ht_oper */ /* ht_capab, ht_oper */
/* WPS IE */ /* WPS IE */
DBG_871X("%s, len=%d\n", __func__, len); DBG_88E("%s, len=%d\n", __func__, len);
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE)
return _FAIL; return _FAIL;
@ -1546,7 +1546,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
DBG_871X("%s, mode=%d\n", __func__, mode); DBG_88E("%s, mode=%d\n", __func__, mode);
pacl_list->mode = mode; pacl_list->mode = mode;
} }
@ -1562,7 +1562,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q; _queue *pacl_node_q =&pacl_list->acl_node_q;
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
if ((NUM_ACL-1) < pacl_list->num) if ((NUM_ACL-1) < pacl_list->num)
return (-1); return (-1);
@ -1583,7 +1583,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
if (paclnode->valid == _TRUE) if (paclnode->valid == _TRUE)
{ {
added = _TRUE; added = _TRUE;
DBG_871X("%s, sta has been added\n", __func__); DBG_88E("%s, sta has been added\n", __func__);
break; break;
} }
} }
@ -1618,7 +1618,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
} }
} }
DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); DBG_88E("%s, acl_num=%d\n", __func__, pacl_list->num);
_exit_critical_bh(&(pacl_node_q->lock), &irqL); _exit_critical_bh(&(pacl_node_q->lock), &irqL);
@ -1635,7 +1635,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q; _queue *pacl_node_q =&pacl_list->acl_node_q;
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
_enter_critical_bh(&(pacl_node_q->lock), &irqL); _enter_critical_bh(&(pacl_node_q->lock), &irqL);
@ -1662,7 +1662,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
_exit_critical_bh(&(pacl_node_q->lock), &irqL); _exit_critical_bh(&(pacl_node_q->lock), &irqL);
DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); DBG_88E("%s, acl_num=%d\n", __func__, pacl_list->num);
return ret; return ret;
@ -1672,7 +1672,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
static void update_bcn_fixed_ie(_adapter *padapter) static void update_bcn_fixed_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
@ -1685,7 +1685,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
unsigned char *p, *ie = pnetwork->IEs; unsigned char *p, *ie = pnetwork->IEs;
u32 len = 0; u32 len = 0;
DBG_871X("%s, ERP_enable=%d\n", __func__, pmlmeinfo->ERP_enable); DBG_88E("%s, ERP_enable=%d\n", __func__, pmlmeinfo->ERP_enable);
if (!pmlmeinfo->ERP_enable) if (!pmlmeinfo->ERP_enable)
return; return;
@ -1713,31 +1713,31 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
static void update_bcn_htcap_ie(_adapter *padapter) static void update_bcn_htcap_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_htinfo_ie(_adapter *padapter) static void update_bcn_htinfo_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_rsn_ie(_adapter *padapter) static void update_bcn_rsn_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_wpa_ie(_adapter *padapter) static void update_bcn_wpa_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_wmm_ie(_adapter *padapter) static void update_bcn_wmm_ie(_adapter *padapter)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
@ -1753,7 +1753,7 @@ static void update_bcn_wps_ie(_adapter *padapter)
u32 ielen = pnetwork->IELength; u32 ielen = pnetwork->IELength;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen); pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
@ -1804,7 +1804,7 @@ static void update_bcn_p2p_ie(_adapter *padapter)
static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
if (_rtw_memcmp(RTW_WPA_OUI, oui, 4)) if (_rtw_memcmp(RTW_WPA_OUI, oui, 4))
{ {
@ -1824,7 +1824,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
} }
else else
{ {
DBG_871X("unknown OUI type!\n"); DBG_88E("unknown OUI type!\n");
} }
@ -1837,7 +1837,7 @@ void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
//struct mlme_ext_info *pmlmeinfo; //struct mlme_ext_info *pmlmeinfo;
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
if (!padapter) if (!padapter)
return; return;
@ -1946,7 +1946,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
//if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) //if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
// return 0; // return 0;
DBG_871X("%s current operation mode=0x%X\n", DBG_88E("%s current operation mode=0x%X\n",
__func__, pmlmepriv->ht_op_mode); __func__, pmlmepriv->ht_op_mode);
if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
@ -1997,7 +1997,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
op_mode_changes++; op_mode_changes++;
} }
DBG_871X("%s new operation mode=0x%X changes=%d\n", DBG_88E("%s new operation mode=0x%X changes=%d\n",
__func__, pmlmepriv->ht_op_mode, op_mode_changes); __func__, pmlmepriv->ht_op_mode, op_mode_changes);
return op_mode_changes; return op_mode_changes;
@ -2152,7 +2152,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
{ {
u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info); u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info);
DBG_871X("HT: STA " MAC_FMT " HT Capabilities " DBG_88E("HT: STA " MAC_FMT " HT Capabilities "
"Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab); "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab);
if (psta->no_ht_set) { if (psta->no_ht_set) {
@ -2165,7 +2165,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
psta->no_ht_gf_set = 1; psta->no_ht_gf_set = 1;
pmlmepriv->num_sta_ht_no_gf++; pmlmepriv->num_sta_ht_no_gf++;
} }
DBG_871X("%s STA " MAC_FMT " - no " DBG_88E("%s STA " MAC_FMT " - no "
"greenfield, num of non-gf stations %d\n", "greenfield, num of non-gf stations %d\n",
__func__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf); pmlmepriv->num_sta_ht_no_gf);
@ -2176,7 +2176,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
psta->ht_20mhz_set = 1; psta->ht_20mhz_set = 1;
pmlmepriv->num_sta_ht_20mhz++; pmlmepriv->num_sta_ht_20mhz++;
} }
DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, " DBG_88E("%s STA " MAC_FMT " - 20 MHz HT, "
"num of 20MHz HT STAs %d\n", "num of 20MHz HT STAs %d\n",
__func__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz); pmlmepriv->num_sta_ht_20mhz);
@ -2190,7 +2190,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_ht++; pmlmepriv->num_sta_no_ht++;
} }
if (pmlmepriv->htpriv.ht_option == _TRUE) { if (pmlmepriv->htpriv.ht_option == _TRUE) {
DBG_871X("%s STA " MAC_FMT DBG_88E("%s STA " MAC_FMT
" - no HT, num of non-HT stations %d\n", " - no HT, num of non-HT stations %d\n",
__func__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_no_ht); pmlmepriv->num_sta_no_ht);
@ -2208,7 +2208,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
//update associcated stations cap. //update associcated stations cap.
associated_clients_update(padapter, beacon_updated); associated_clients_update(padapter, beacon_updated);
DBG_871X("%s, updated=%d\n", __func__, beacon_updated); DBG_88E("%s, updated=%d\n", __func__, beacon_updated);
} }
@ -2281,7 +2281,7 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
//update associcated stations cap. //update associcated stations cap.
//associated_clients_update(padapter, beacon_updated); //move it to avoid deadlock //associated_clients_update(padapter, beacon_updated); //move it to avoid deadlock
DBG_871X("%s, updated=%d\n", __func__, beacon_updated); DBG_88E("%s, updated=%d\n", __func__, beacon_updated);
return beacon_updated; return beacon_updated;
@ -2364,7 +2364,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret; return ret;
DBG_871X(FUNC_NDEV_FMT" with ch:%u, offset:%u\n", DBG_88E(FUNC_NDEV_FMT" with ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset); FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@ -2398,7 +2398,7 @@ int rtw_sta_flush(_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret; return ret;
@ -2579,7 +2579,7 @@ void stop_ap_mode(_adapter *padapter)
} }
_exit_critical_bh(&(pacl_node_q->lock), &irqL); _exit_critical_bh(&(pacl_node_q->lock), &irqL);
DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num); DBG_88E("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num);
rtw_sta_flush(padapter); rtw_sta_flush(padapter);

38
core/rtw_cmd.c
View file

@ -317,7 +317,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf; struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID) if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
{ {
//DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n"); //DBG_88E("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
bAllow = _TRUE; bAllow = _TRUE;
} }
} }
@ -331,7 +331,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
|| pcmdpriv->cmdthd_running== _FALSE //com_thread not running || pcmdpriv->cmdthd_running== _FALSE //com_thread not running
) )
{ {
//DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__, //DBG_88E("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__,
// cmd_obj->cmdcode, // cmd_obj->cmdcode,
// pcmdpriv->padapter->hw_init_completed, // pcmdpriv->padapter->hw_init_completed,
// pcmdpriv->cmdthd_running // pcmdpriv->cmdthd_running
@ -453,7 +453,7 @@ _func_enter_;
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE))
{ {
DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break; break;
} }
@ -470,7 +470,7 @@ _func_enter_;
_next: _next:
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{ {
DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break; break;
} }
@ -550,7 +550,7 @@ post_process:
if (pcmd==NULL) if (pcmd==NULL)
break; break;
//DBG_871X("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode); //DBG_88E("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode);
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
}while (1); }while (1);
@ -738,7 +738,7 @@ _func_enter_;
_rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
psurveyPara->ssid_num++; psurveyPara->ssid_num++;
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter), DBG_88E(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter),
psurveyPara->ssid[i].Ssid, psurveyPara->ssid[i].SsidLength); psurveyPara->ssid[i].Ssid, psurveyPara->ssid[i].SsidLength);
} }
} }
@ -752,7 +752,7 @@ _func_enter_;
_rtw_memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel)); _rtw_memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel));
psurveyPara->ch_num++; psurveyPara->ch_num++;
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter), DBG_88E(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter),
psurveyPara->ch[i].hw_value); psurveyPara->ch[i].hw_value);
} }
} }
@ -1300,7 +1300,7 @@ _func_enter_;
else else
padapter->pwrctrlpriv.smart_ps = padapter->registrypriv.smart_ps; padapter->pwrctrlpriv.smart_ps = padapter->registrypriv.smart_ps;
DBG_871X("%s: smart_ps=%d\n", __func__, padapter->pwrctrlpriv.smart_ps); DBG_88E("%s: smart_ps=%d\n", __func__, padapter->pwrctrlpriv.smart_ps);
pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion
@ -1697,7 +1697,7 @@ _func_enter_;
init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq)); init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq));
//DBG_871X("rtw_addbareq_cmd, tid=%d\n", tid); //DBG_88E("rtw_addbareq_cmd, tid=%d\n", tid);
//rtw_enqueue_cmd(pcmdpriv, ph2c); //rtw_enqueue_cmd(pcmdpriv, ph2c);
res = rtw_enqueue_cmd(pcmdpriv, ph2c); res = rtw_enqueue_cmd(pcmdpriv, ph2c);
@ -1764,7 +1764,7 @@ u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue)
_func_enter_; _func_enter_;
DBG_871X(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset); FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
/* check input parameter */ /* check input parameter */
@ -1802,7 +1802,7 @@ _func_enter_;
exit: exit:
DBG_871X(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res); DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
_func_exit_; _func_exit_;
@ -2039,7 +2039,7 @@ static void traffic_status_watchdog(_adapter *padapter)
} }
#ifdef CONFIG_FTP_PROTECT #ifdef CONFIG_FTP_PROTECT
DBG_871X("RX in period:%d, TX in period:%d, ftp_lock_flag:%d\n", DBG_88E("RX in period:%d, TX in period:%d, ftp_lock_flag:%d\n",
pmlmepriv->LinkDetectInfo.NumRxOkInPeriod, pmlmepriv->LinkDetectInfo.NumRxOkInPeriod,
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod, pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,
pmlmepriv->ftp_lock_flag); pmlmepriv->ftp_lock_flag);
@ -2071,7 +2071,7 @@ static void traffic_status_watchdog(_adapter *padapter)
if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) || if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
(pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) ) (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
{ {
//DBG_871X("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); //DBG_88E("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
bEnterPS= _FALSE; bEnterPS= _FALSE;
} }
else else
@ -2168,7 +2168,7 @@ _func_enter_;
switch (lps_ctrl_type) switch (lps_ctrl_type)
{ {
case LPS_CTRL_SCAN: case LPS_CTRL_SCAN:
//DBG_871X("LPS_CTRL_SCAN\n"); //DBG_88E("LPS_CTRL_SCAN\n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiScanNotify(padapter, _TRUE); BT_WifiScanNotify(padapter, _TRUE);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == _FALSE)
@ -2181,11 +2181,11 @@ _func_enter_;
} }
break; break;
case LPS_CTRL_JOINBSS: case LPS_CTRL_JOINBSS:
//DBG_871X("LPS_CTRL_JOINBSS\n"); //DBG_88E("LPS_CTRL_JOINBSS\n");
LPS_Leave(padapter); LPS_Leave(padapter);
break; break;
case LPS_CTRL_CONNECT: case LPS_CTRL_CONNECT:
//DBG_871X("LPS_CTRL_CONNECT\n"); //DBG_88E("LPS_CTRL_CONNECT\n");
mstatus = 1;//connect mstatus = 1;//connect
// Reset LPS Setting // Reset LPS Setting
padapter->pwrctrlpriv.LpsIdleCount = 0; padapter->pwrctrlpriv.LpsIdleCount = 0;
@ -2195,7 +2195,7 @@ _func_enter_;
#endif #endif
break; break;
case LPS_CTRL_DISCONNECT: case LPS_CTRL_DISCONNECT:
//DBG_871X("LPS_CTRL_DISCONNECT\n"); //DBG_88E("LPS_CTRL_DISCONNECT\n");
mstatus = 0;//disconnect mstatus = 0;//disconnect
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiMediaStatusNotify(padapter, mstatus); BT_WifiMediaStatusNotify(padapter, mstatus);
@ -2207,7 +2207,7 @@ _func_enter_;
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
break; break;
case LPS_CTRL_SPECIAL_PACKET: case LPS_CTRL_SPECIAL_PACKET:
//DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); //DBG_88E("LPS_CTRL_SPECIAL_PACKET\n");
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time(); pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter); BT_SpecialPacketNotify(padapter);
@ -2218,7 +2218,7 @@ _func_enter_;
} }
break; break;
case LPS_CTRL_LEAVE: case LPS_CTRL_LEAVE:
//DBG_871X("LPS_CTRL_LEAVE\n"); //DBG_88E("LPS_CTRL_LEAVE\n");
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_LpsLeave(padapter); BT_LpsLeave(padapter);
if (BT_1Ant(padapter) == _FALSE) if (BT_1Ant(padapter) == _FALSE)

22
core/rtw_debug.c
View file

@ -94,7 +94,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
if (count < 3) if (count < 3)
{ {
DBG_871X("argument size is less than 3\n"); DBG_88E("argument size is less than 3\n");
return -EFAULT; return -EFAULT;
} }
@ -103,7 +103,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x %x %x", &addr, &val, &len); int num = sscanf(tmp, "%x %x %x", &addr, &val, &len);
if (num != 3) { if (num != 3) {
DBG_871X("invalid write_reg parameter!\n"); DBG_88E("invalid write_reg parameter!\n");
return count; return count;
} }
@ -119,7 +119,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
rtw_write32(padapter, addr, val); rtw_write32(padapter, addr, val);
break; break;
default: default:
DBG_871X("error write length=%d", len); DBG_88E("error write length=%d", len);
break; break;
} }
@ -176,7 +176,7 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
if (count < 2) if (count < 2)
{ {
DBG_871X("argument size is less than 2\n"); DBG_88E("argument size is less than 2\n");
return -EFAULT; return -EFAULT;
} }
@ -185,7 +185,7 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x %x", &addr, &len); int num = sscanf(tmp, "%x %x", &addr, &len);
if (num != 2) { if (num != 2) {
DBG_871X("invalid read_reg parameter!\n"); DBG_88E("invalid read_reg parameter!\n");
return count; return count;
} }
@ -678,9 +678,9 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
padapter->recvpriv.signal_strength_dbg=signal_strength; padapter->recvpriv.signal_strength_dbg=signal_strength;
if (is_signal_dbg) if (is_signal_dbg)
DBG_871X("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength); DBG_88E("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength);
else else
DBG_871X("set %s\n", "HW_SIGNAL_STRENGTH"); DBG_88E("set %s\n", "HW_SIGNAL_STRENGTH");
} }
@ -921,7 +921,7 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
if (count < 1) if (count < 1)
{ {
DBG_8192C("argument size is less than 1\n"); DBG_88E("argument size is less than 1\n");
return -EFAULT; return -EFAULT;
} }
@ -930,18 +930,18 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x", &enable); int num = sscanf(tmp, "%x", &enable);
if (num != 1) { if (num != 1) {
DBG_8192C("invalid set_rssi_disp parameter!\n"); DBG_88E("invalid set_rssi_disp parameter!\n");
return count; return count;
} }
if (enable) if (enable)
{ {
DBG_8192C("Turn On Rx RSSI Display Function\n"); DBG_88E("Turn On Rx RSSI Display Function\n");
padapter->bRxRSSIDisplay = enable ; padapter->bRxRSSIDisplay = enable ;
} }
else else
{ {
DBG_8192C("Turn Off Rx RSSI Display Function\n"); DBG_88E("Turn Off Rx RSSI Display Function\n");
padapter->bRxRSSIDisplay = 0 ; padapter->bRxRSSIDisplay = 0 ;
} }

22
core/rtw_efuse.c
View file

@ -221,7 +221,7 @@ ReadEFuseByte(
value32 = rtw_read32(Adapter, EFUSE_CTRL); value32 = rtw_read32(Adapter, EFUSE_CTRL);
*pbuf = (u8)(value32 & 0xff); *pbuf = (u8)(value32 & 0xff);
//DBG_871X("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start)); //DBG_88E("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start));
} }
@ -769,12 +769,12 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF) { if (word_en != 0xF) {
ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE); ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE);
DBG_871X("offset=%x\n",offset); DBG_88E("offset=%x\n",offset);
DBG_871X("word_en=%x\n",word_en); DBG_88E("word_en=%x\n",word_en);
for (i=0;i<PGPKT_DATA_SIZE;i++) for (i=0;i<PGPKT_DATA_SIZE;i++)
{ {
DBG_871X("data=%x \t",newdata[i]); DBG_88E("data=%x \t",newdata[i]);
} }
if (ret == _FAIL) break; if (ret == _FAIL) break;
} }
@ -867,14 +867,14 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF) if (word_en != 0xF)
{ {
DBG_871X("%s: offset=%#X\n", __func__, offset); DBG_88E("%s: offset=%#X\n", __func__, offset);
DBG_871X("%s: word_en=%#X\n", __func__, word_en); DBG_88E("%s: word_en=%#X\n", __func__, word_en);
DBG_871X("%s: data=", __func__); DBG_88E("%s: data=", __func__);
for (i=0; i<PGPKT_DATA_SIZE; i++) for (i=0; i<PGPKT_DATA_SIZE; i++)
{ {
DBG_871X("0x%02X ", newdata[i]); DBG_88E("0x%02X ", newdata[i]);
} }
DBG_871X("\n"); DBG_88E("\n");
ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, _FALSE); ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, _FALSE);
if (ret == _FAIL) break; if (ret == _FAIL) break;
@ -1242,7 +1242,7 @@ int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
else else
ret = _FAIL; ret = _FAIL;
} else { } else {
DBG_871X("%s NULL pointer\n",__func__); DBG_88E("%s NULL pointer\n",__func__);
ret = _FAIL; ret = _FAIL;
} }
return ret; return ret;
@ -1263,7 +1263,7 @@ int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
else else
ret = _FAIL; ret = _FAIL;
} else { } else {
DBG_871X("%s NULL pointer\n",__func__); DBG_88E("%s NULL pointer\n",__func__);
ret = _FAIL; ret = _FAIL;
} }
return ret; return ret;

32
core/rtw_ieee80211.c
View file

@ -879,7 +879,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen)
if ((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==_TRUE)) if ((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==_TRUE))
{ {
//DBG_8192C("==> found WPS_IE.....\n"); //DBG_88E("==> found WPS_IE.....\n");
*wps_ielen = ie_ptr[1]+2; *wps_ielen = ie_ptr[1]+2;
match=_TRUE; match=_TRUE;
} }
@ -972,7 +972,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_att
u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2); u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2);
u16 attr_len = attr_data_len + 4; u16 attr_len = attr_data_len + 4;
//DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); //DBG_88E("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len);
if ( attr_id == target_attr_id ) if ( attr_id == target_attr_id )
{ {
target_attr_ptr = attr_ptr; target_attr_ptr = attr_ptr;
@ -1040,7 +1040,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
* sub-type. */ * sub-type. */
if (elen < 4) { if (elen < 4) {
if (show_errors) { if (show_errors) {
DBG_871X("short vendor specific " DBG_88E("short vendor specific "
"information element ignored (len=%lu)\n", "information element ignored (len=%lu)\n",
(unsigned long) elen); (unsigned long) elen);
} }
@ -1061,7 +1061,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break; break;
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */ case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
if (elen < 5) { if (elen < 5) {
DBG_871X("short WME " DBG_88E("short WME "
"information element ignored " "information element ignored "
"(len=%lu)\n", "(len=%lu)\n",
(unsigned long) elen); (unsigned long) elen);
@ -1078,7 +1078,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->wme_tspec_len = elen; elems->wme_tspec_len = elen;
break; break;
default: default:
DBG_871X("unknown WME " DBG_88E("unknown WME "
"information element ignored " "information element ignored "
"(subtype=%d len=%lu)\n", "(subtype=%d len=%lu)\n",
pos[4], (unsigned long) elen); pos[4], (unsigned long) elen);
@ -1091,7 +1091,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->wps_ie_len = elen; elems->wps_ie_len = elen;
break; break;
default: default:
DBG_871X("Unknown Microsoft " DBG_88E("Unknown Microsoft "
"information element ignored " "information element ignored "
"(type=%d len=%lu)\n", "(type=%d len=%lu)\n",
pos[3], (unsigned long) elen); pos[3], (unsigned long) elen);
@ -1106,7 +1106,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->vendor_ht_cap_len = elen; elems->vendor_ht_cap_len = elen;
break; break;
default: default:
DBG_871X("Unknown Broadcom " DBG_88E("Unknown Broadcom "
"information element ignored " "information element ignored "
"(type=%d len=%lu)\n", "(type=%d len=%lu)\n",
pos[3], (unsigned long) elen); pos[3], (unsigned long) elen);
@ -1115,7 +1115,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break; break;
default: default:
DBG_871X("unknown vendor specific information " DBG_88E("unknown vendor specific information "
"element ignored (vendor OUI %02x:%02x:%02x " "element ignored (vendor OUI %02x:%02x:%02x "
"len=%lu)\n", "len=%lu)\n",
pos[0], pos[1], pos[2], (unsigned long) elen); pos[0], pos[1], pos[2], (unsigned long) elen);
@ -1153,7 +1153,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
if (elen > left) { if (elen > left) {
if (show_errors) { if (show_errors) {
DBG_871X("IEEE 802.11 element " DBG_88E("IEEE 802.11 element "
"parse failed (id=%d elen=%d " "parse failed (id=%d elen=%d "
"left=%lu)\n", "left=%lu)\n",
id, elen, (unsigned long) left); id, elen, (unsigned long) left);
@ -1244,7 +1244,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
unknown++; unknown++;
if (!show_errors) if (!show_errors)
break; break;
DBG_871X("IEEE 802.11 element parse " DBG_88E("IEEE 802.11 element parse "
"ignored unknown element (id=%d elen=%d)\n", "ignored unknown element (id=%d elen=%d)\n",
id, elen); id, elen);
break; break;
@ -1325,10 +1325,10 @@ void rtw_macaddr_cfg(u8 *mac_addr)
mac[5] = 0x00; mac[5] = 0x00;
// use default mac addresss // use default mac addresss
_rtw_memcpy(mac_addr, mac, ETH_ALEN); _rtw_memcpy(mac_addr, mac, ETH_ALEN);
DBG_871X("MAC Address from efuse error, assign default one !!!\n"); DBG_88E("MAC Address from efuse error, assign default one !!!\n");
} }
DBG_871X("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr)); DBG_88E("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr));
} }
void dump_ies(u8 *buf, u32 buf_len) { void dump_ies(u8 *buf, u32 buf_len) {
@ -1339,7 +1339,7 @@ void dump_ies(u8 *buf, u32 buf_len) {
id = *pos; id = *pos;
len = *(pos+1); len = *(pos+1);
DBG_871X("%s ID:%u, LEN:%u\n", __func__, id, len); DBG_88E("%s ID:%u, LEN:%u\n", __func__, id, len);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
dump_p2p_ie(pos, len); dump_p2p_ie(pos, len);
#endif #endif
@ -1366,7 +1366,7 @@ void dump_wps_ie(u8 *ie, u32 ie_len) {
id = RTW_GET_BE16(pos); id = RTW_GET_BE16(pos);
len = RTW_GET_BE16(pos + 2); len = RTW_GET_BE16(pos + 2);
DBG_871X("%s ID:0x%04x, LEN:%u\n", __func__, id, len); DBG_88E("%s ID:0x%04x, LEN:%u\n", __func__, id, len);
pos+=(4+len); pos+=(4+len);
} }
@ -1390,7 +1390,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len) {
id = *pos; id = *pos;
len = RTW_GET_LE16(pos+1); len = RTW_GET_LE16(pos+1);
DBG_871X("%s ID:%u, LEN:%u\n", __func__, id, len); DBG_88E("%s ID:%u, LEN:%u\n", __func__, id, len);
pos+=(3+len); pos+=(3+len);
} }
@ -1487,7 +1487,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr
u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1); u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1);
u16 attr_len = attr_data_len + 3; u16 attr_len = attr_data_len + 3;
//DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); //DBG_88E("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len);
if ( attr_id == target_attr_id ) if ( attr_id == target_attr_id )
{ {
target_attr_ptr = attr_ptr; target_attr_ptr = attr_ptr;

14
core/rtw_io.c
View file

@ -425,7 +425,7 @@ u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line
u8 val = _rtw_read8(adapter, addr); u8 val = _rtw_read8(adapter, addr);
if (match_read_sniff_ranges(addr, 1)) if (match_read_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x\n", caller, line, addr, val);
return val; return val;
} }
@ -435,7 +435,7 @@ u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int li
u16 val = _rtw_read16(adapter, addr); u16 val = _rtw_read16(adapter, addr);
if (match_read_sniff_ranges(addr, 2)) if (match_read_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val);
return val; return val;
} }
@ -445,7 +445,7 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
u32 val = _rtw_read32(adapter, addr); u32 val = _rtw_read32(adapter, addr);
if (match_read_sniff_ranges(addr, 4)) if (match_read_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val);
return val; return val;
} }
@ -453,28 +453,28 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line) int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 1)) if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
return _rtw_write8(adapter, addr, val); return _rtw_write8(adapter, addr, val);
} }
int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line) int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 2)) if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
return _rtw_write16(adapter, addr, val); return _rtw_write16(adapter, addr, val);
} }
int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line) int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 4)) if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val); DBG_88E("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
return _rtw_write32(adapter, addr, val); return _rtw_write32(adapter, addr, val);
} }
int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line) int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, length)) if (match_write_sniff_ranges(addr, length))
DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length); DBG_88E("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length);
return _rtw_writeN(adapter, addr, length, data); return _rtw_writeN(adapter, addr, length, data);
} }

16
core/rtw_ioctl_set.c
View file

@ -315,7 +315,7 @@ u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
_func_enter_; _func_enter_;
DBG_871X_LEVEL(_drv_always_, "set bssid:%pM\n", bssid); DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid);
if ((bssid[0]==0x00 && bssid[1]==0x00 && bssid[2]==0x00 && bssid[3]==0x00 && bssid[4]==0x00 &&bssid[5]==0x00) || if ((bssid[0]==0x00 && bssid[1]==0x00 && bssid[2]==0x00 && bssid[3]==0x00 && bssid[4]==0x00 &&bssid[5]==0x00) ||
(bssid[0]==0xFF && bssid[1]==0xFF && bssid[2]==0xFF && bssid[3]==0xFF && bssid[4]==0xFF &&bssid[5]==0xFF)) (bssid[0]==0xFF && bssid[1]==0xFF && bssid[2]==0xFF && bssid[3]==0xFF && bssid[4]==0xFF &&bssid[5]==0xFF))
@ -327,7 +327,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); DBG_88E("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
goto handle_tkip_countermeasure; goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
@ -414,7 +414,7 @@ u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
_func_enter_; _func_enter_;
DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n", DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv)); ssid->Ssid, get_fwstate(pmlmepriv));
if (padapter->hw_init_completed==_FALSE){ if (padapter->hw_init_completed==_FALSE){
@ -426,7 +426,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv)); DBG_88E("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
goto handle_tkip_countermeasure; goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
@ -587,7 +587,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!")); RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!"));
//DBG_871X("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); //DBG_88E("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv));
if (*pold_state==Ndis802_11APMode) if (*pold_state==Ndis802_11APMode)
{ {
@ -716,7 +716,7 @@ _func_enter_;
} }
} else { } else {
if (rtw_is_scan_deny(padapter)) { if (rtw_is_scan_deny(padapter)) {
DBG_871X(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter));
indicate_wx_scan_complete_event(padapter); indicate_wx_scan_complete_event(padapter);
return _SUCCESS; return _SUCCESS;
} }
@ -1417,7 +1417,7 @@ int rtw_set_country(_adapter *adapter, const char *country_code)
{ {
int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G; int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;
DBG_871X("%s country_code:%s\n", __func__, country_code); DBG_88E("%s country_code:%s\n", __func__, country_code);
//TODO: should have a table to match country code and RT_CHANNEL_DOMAIN //TODO: should have a table to match country code and RT_CHANNEL_DOMAIN
//TODO: should consider 2-character and 3-character country code //TODO: should consider 2-character and 3-character country code
@ -1430,7 +1430,7 @@ int rtw_set_country(_adapter *adapter, const char *country_code)
else if (0 == strcmp(country_code, "CN")) else if (0 == strcmp(country_code, "CN"))
channel_plan = RT_CHANNEL_DOMAIN_CHINA; channel_plan = RT_CHANNEL_DOMAIN_CHINA;
else else
DBG_871X("%s unknown country_code:%s\n", __func__, country_code); DBG_88E("%s unknown country_code:%s\n", __func__, country_code);
return rtw_set_channel_plan(adapter, channel_plan); return rtw_set_channel_plan(adapter, channel_plan);
} }

32
core/rtw_iol.c
View file

@ -31,13 +31,13 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
#if 1 #if 1
if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL) if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL)
{ {
DBG_871X("%s rtw_alloc_xmitframe return null\n", __func__); DBG_88E("%s rtw_alloc_xmitframe return null\n", __func__);
goto exit; goto exit;
} }
if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL) if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL)
{ {
DBG_871X("%s rtw_alloc_xmitbuf return null\n", __func__); DBG_88E("%s rtw_alloc_xmitbuf return null\n", __func__);
rtw_free_xmitframe(pxmitpriv, xmit_frame); rtw_free_xmitframe(pxmitpriv, xmit_frame);
xmit_frame=NULL; xmit_frame=NULL;
goto exit; goto exit;
@ -57,7 +57,7 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
#else #else
if ((xmit_frame = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((xmit_frame = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
DBG_871X("%s alloc_mgtxmitframe return null\n", __func__); DBG_88E("%s alloc_mgtxmitframe return null\n", __func__);
} }
else { else {
pattrib = &xmit_frame->attrib; pattrib = &xmit_frame->attrib;
@ -83,7 +83,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
//check if the io_buf can accommodate new cmds //check if the io_buf can accommodate new cmds
if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) { if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) {
DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __func__ DBG_88E("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __func__
, ori_len + cmd_len + 8, MAX_XMITBUF_SZ); , ori_len + cmd_len + 8, MAX_XMITBUF_SZ);
return _FAIL; return _FAIL;
} }
@ -92,7 +92,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
pattrib->pktlen += cmd_len; pattrib->pktlen += cmd_len;
pattrib->last_txcmdsz += cmd_len; pattrib->last_txcmdsz += cmd_len;
//DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __func__, ori_len, cmd_len, buf_offset+pattrib->pktlen); //DBG_88E("%s ori:%u + cmd_len:%u = %u\n", __func__, ori_len, cmd_len, buf_offset+pattrib->pktlen);
return _SUCCESS; return _SUCCESS;
} }
@ -149,7 +149,7 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask); //DBG_88E("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -170,7 +170,7 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask); //DBG_88E("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -191,7 +191,7 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask); //DBG_88E("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -213,7 +213,7 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
//DBG_871X("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, addr,value,mask); //DBG_88E("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, addr,value,mask);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -227,7 +227,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
//RTW_PUT_LE16((u8*)&cmd.address, us); //RTW_PUT_LE16((u8*)&cmd.address, us);
cmd.address = cpu_to_le16(us); cmd.address = cpu_to_le16(us);
//DBG_871X("%s %u\n", __func__, us); //DBG_88E("%s %u\n", __func__, us);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4);
} }
@ -238,7 +238,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
//RTW_PUT_LE16((u8*)&cmd.address, ms); //RTW_PUT_LE16((u8*)&cmd.address, ms);
cmd.address = cpu_to_le16(ms); cmd.address = cpu_to_le16(ms);
//DBG_871X("%s %u\n", __func__, ms); //DBG_88E("%s %u\n", __func__, ms);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4);
} }
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
@ -323,7 +323,7 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value)
int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line) int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 1)) if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value); DBG_88E("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value);
return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value); return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value);
} }
@ -331,7 +331,7 @@ int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value,
int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line) int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 2)) if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value); DBG_88E("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value);
return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value); return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value);
} }
@ -339,7 +339,7 @@ int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value
int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line) int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 4)) if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value); DBG_88E("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value);
return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value); return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value);
} }
@ -351,7 +351,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
RTW_PUT_BE32((u8*)&cmd.value, (u32)us); RTW_PUT_BE32((u8*)&cmd.value, (u32)us);
//DBG_871X("%s %u\n", __func__, us); //DBG_88E("%s %u\n", __func__, us);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
} }
@ -362,7 +362,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
RTW_PUT_BE32((u8*)&cmd.value, (u32)ms); RTW_PUT_BE32((u8*)&cmd.value, (u32)ms);
//DBG_871X("%s %u\n", __func__, ms); //DBG_88E("%s %u\n", __func__, ms);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8);
} }

8
core/rtw_led.c
View file

@ -30,11 +30,11 @@ void BlinkTimerCallback(void *data)
PLED_871x pLed = (PLED_871x)data; PLED_871x pLed = (PLED_871x)data;
_adapter *padapter = pLed->padapter; _adapter *padapter = pLed->padapter;
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE))
{ {
//DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped); //DBG_88E("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped);
return; return;
} }
@ -2302,11 +2302,11 @@ void BlinkHandler(PLED_871x pLed)
_adapter *padapter = pLed->padapter; _adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
//DBG_871X("%s (%s:%d)\n",__func__, current->comm, current->pid); //DBG_88E("%s (%s:%d)\n",__func__, current->comm, current->pid);
if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE))
{ {
//DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped); //DBG_88E("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped);
return; return;
} }

98
core/rtw_mlme.c
View file

@ -322,7 +322,7 @@ _func_enter_;
pmlmepriv->num_of_scanned --; pmlmepriv->num_of_scanned --;
//DBG_871X("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid); //DBG_88E("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid);
_exit_critical_bh(&free_queue->lock, &irqL); _exit_critical_bh(&free_queue->lock, &irqL);
@ -725,7 +725,7 @@ _func_enter_;
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_871X("%s %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" DBG_88E("%s %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n"
, __func__ , __func__
, src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig , src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig
,ss_ori, sq_ori, rssi_ori ,ss_ori, sq_ori, rssi_ori
@ -768,7 +768,7 @@ _func_enter_;
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_871X("%s %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" DBG_88E("%s %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"
, __func__ , __func__
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); , dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);
} }
@ -986,7 +986,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) { if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy); DBG_88E("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
bselected = _FALSE; bselected = _FALSE;
} }
@ -1194,9 +1194,9 @@ _func_enter_;
else else
{ {
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
DBG_871X("try_to_join, but select scanning queue fail, to_roaming:%d\n", pmlmepriv->to_roaming); DBG_88E("try_to_join, but select scanning queue fail, to_roaming:%d\n", pmlmepriv->to_roaming);
#else #else
DBG_871X("try_to_join, but select scanning queue fail\n"); DBG_88E("try_to_join, but select scanning queue fail\n");
#endif #endif
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
@ -1218,7 +1218,7 @@ _func_enter_;
} }
indicate_wx_scan_complete_event(adapter); indicate_wx_scan_complete_event(adapter);
//DBG_871X("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time)); //DBG_88E("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time));
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -1456,7 +1456,7 @@ _func_enter_;
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
//DBG_871X("clear wps when %s\n", __func__); //DBG_88E("clear wps when %s\n", __func__);
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
if (pmlmepriv->to_roaming > 0) if (pmlmepriv->to_roaming > 0)
@ -1527,13 +1527,13 @@ void rtw_scan_abort(_adapter *adapter)
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break; break;
DBG_871X(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev)); DBG_88E(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev));
rtw_msleep_os(20); rtw_msleep_os(20);
} }
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
DBG_871X(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev)); DBG_88E(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
#ifdef CONFIG_PLATFORM_MSTAR_TITANIA12 #ifdef CONFIG_PLATFORM_MSTAR_TITANIA12
//_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); //_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
set_survey_timer(pmlmeext, 0); set_survey_timer(pmlmeext, 0);
@ -1558,7 +1558,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
if (psta) //update ptarget_sta if (psta) //update ptarget_sta
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
psta->aid = pnetwork->join_res; psta->aid = pnetwork->join_res;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
@ -1613,7 +1613,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;
@ -1631,7 +1631,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;
@ -1656,7 +1656,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n" RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n"
,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress))); ,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress)));
@ -1679,7 +1679,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
//the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled) //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); padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength);
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
"\n" "\n"
, __func__ , __func__
, padapter->recvpriv.signal_strength , padapter->recvpriv.signal_strength
@ -2105,7 +2105,7 @@ _func_enter_;
psta->qos_option = 0; psta->qos_option = 0;
psta->mac_id = (uint)pstassoc->cam_id; psta->mac_id = (uint)pstassoc->cam_id;
//psta->aid = (uint)pstassoc->cam_id; //psta->aid = (uint)pstassoc->cam_id;
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
//for ad-hoc mode //for ad-hoc mode
rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE); rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE);
@ -2170,7 +2170,7 @@ _func_enter_;
else else
mac_id = pstadel->mac_id; mac_id = pstadel->mac_id;
DBG_871X("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr)); DBG_88E("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));
if (mac_id>=0){ if (mac_id>=0){
u16 media_status; u16 media_status;
@ -2338,7 +2338,7 @@ _func_enter_;
#endif #endif
DBG_871X("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (adapter->bDriverStopped ||adapter->bSurpriseRemoved) if (adapter->bDriverStopped ||adapter->bSurpriseRemoved)
return; return;
@ -2351,14 +2351,14 @@ _func_enter_;
while (1) { while (1) {
pmlmepriv->to_roaming--; pmlmepriv->to_roaming--;
if (pmlmepriv->to_roaming!=0) { //try another , if (pmlmepriv->to_roaming!=0) { //try another ,
DBG_871X("%s try another roaming\n", __func__); DBG_88E("%s try another roaming\n", __func__);
if ( _SUCCESS!=(do_join_r=rtw_do_join(adapter)) ) { if ( _SUCCESS!=(do_join_r=rtw_do_join(adapter)) ) {
DBG_871X("%s roaming do_join return %d\n", __func__ ,do_join_r); DBG_88E("%s roaming do_join return %d\n", __func__ ,do_join_r);
continue; continue;
} }
break; break;
} else { } else {
DBG_871X("%s We've try roaming but fail\n", __func__); DBG_88E("%s We've try roaming but fail\n", __func__);
rtw_indicate_disconnect(adapter); rtw_indicate_disconnect(adapter);
break; break;
} }
@ -2394,7 +2394,7 @@ void rtw_scan_timeout_handler (_adapter *adapter)
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
DBG_871X(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv)); DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
@ -2420,13 +2420,13 @@ static void rtw_auto_scan_handler(_adapter *padapter)
/* /*
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE)
{ {
DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __func__); DBG_88E("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __func__);
return; return;
} }
if (pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE) if (pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE)
{ {
DBG_871X("%s exit cause traffic_busy(%x)\n",__func__, pmlmepriv->sitesurveyctrl.traffic_busy); DBG_88E("%s exit cause traffic_busy(%x)\n",__func__, pmlmepriv->sitesurveyctrl.traffic_busy);
return; return;
} }
*/ */
@ -2437,13 +2437,13 @@ static void rtw_auto_scan_handler(_adapter *padapter)
if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) ||
(padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE)) (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE))
{ {
DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __func__); DBG_88E("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __func__);
return; return;
} }
} }
#endif #endif
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); rtw_set_802_11_bssid_list_scan(padapter, NULL, 0);
@ -2564,7 +2564,7 @@ inline void rtw_clear_scan_deny(_adapter *adapter)
struct mlme_priv *mlmepriv = &adapter->mlmepriv; struct mlme_priv *mlmepriv = &adapter->mlmepriv;
ATOMIC_SET(&mlmepriv->set_scan_deny, 0); ATOMIC_SET(&mlmepriv->set_scan_deny, 0);
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
} }
void rtw_set_scan_deny_timer_hdl(_adapter *adapter) void rtw_set_scan_deny_timer_hdl(_adapter *adapter)
@ -2580,7 +2580,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
#endif #endif
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
ATOMIC_SET(&mlmepriv->set_scan_deny, 1); ATOMIC_SET(&mlmepriv->set_scan_deny, 1);
_set_timer(&mlmepriv->set_scan_deny_timer, ms); _set_timer(&mlmepriv->set_scan_deny_timer, ms);
@ -2589,7 +2589,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
return; return;
if (0) if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter));
b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv; b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv;
ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1); ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1);
_set_timer(&b_mlmepriv->set_scan_deny_timer, ms); _set_timer(&b_mlmepriv->set_scan_deny_timer, ms);
@ -2649,7 +2649,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
updated = _TRUE; updated = _TRUE;
} }
if (updated){ if (updated){
DBG_871X("[by_bssid:%u][assoc_ssid:%s]" DBG_88E("[by_bssid:%u][assoc_ssid:%s]"
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
"[to_roaming:%u] " "[to_roaming:%u] "
#endif #endif
@ -2711,14 +2711,14 @@ _func_enter_;
} }
if (candidate == NULL) { if (candidate == NULL) {
DBG_871X("%s: return _FAIL(candidate == NULL)\n", __func__); DBG_88E("%s: return _FAIL(candidate == NULL)\n", __func__);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
_clr_fwstate_(pmlmepriv, _FW_LINKED|_FW_UNDER_LINKING); _clr_fwstate_(pmlmepriv, _FW_LINKED|_FW_UNDER_LINKING);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} else { } else {
DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__, DBG_88E("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,
candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig); candidate->network.Configuration.DSConfig);
} }
@ -2727,7 +2727,7 @@ _func_enter_;
// check for situation of _FW_LINKED // check for situation of _FW_LINKED
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
{ {
DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__); DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
{ {
rtw_disassoc_cmd(adapter, 0, _TRUE); rtw_disassoc_cmd(adapter, 0, _TRUE);
@ -2742,7 +2742,7 @@ _func_enter_;
{ {
u8 CurrentAntenna; u8 CurrentAntenna;
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
DBG_871X("#### Opt_Ant_(%s) , cur_Ant(%s)\n", DBG_88E("#### Opt_Ant_(%s) , cur_Ant(%s)\n",
(2==candidate->network.PhyInfo.Optimum_antenna)?"A":"B", (2==candidate->network.PhyInfo.Optimum_antenna)?"A":"B",
(2==CurrentAntenna)?"A":"B" (2==CurrentAntenna)?"A":"B"
); );
@ -2842,7 +2842,7 @@ _func_enter_;
) { ) {
roaming_candidate = pnetwork; roaming_candidate = pnetwork;
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_, //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
DBG_871X DBG_88E
("roaming_candidate???: %s("MAC_FMT")\n", ("roaming_candidate???: %s("MAC_FMT")\n",
roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) ) roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) )
//) //)
@ -2858,7 +2858,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s\n", dst_ssid, src_ssid)); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s\n", dst_ssid, src_ssid));
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna)); rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
DBG_871X("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid, DBG_88E("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid,
(2==pnetwork->network.PhyInfo.Optimum_antenna)?"A":"B", (2==pnetwork->network.PhyInfo.Optimum_antenna)?"A":"B",
(2==CurrentAntenna)?"A":"B"); (2==CurrentAntenna)?"A":"B");
#endif #endif
@ -2898,7 +2898,7 @@ _func_enter_;
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
if (pmlmepriv->to_roaming>0 && roaming_candidate ){ if (pmlmepriv->to_roaming>0 && roaming_candidate ){
pnetwork=roaming_candidate; pnetwork=roaming_candidate;
DBG_871X("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n", DBG_88E("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress));
goto ask_for_joinbss; goto ask_for_joinbss;
} }
@ -2907,12 +2907,12 @@ _func_enter_;
if ((pmlmepriv->assoc_by_rssi==_TRUE) && (pnetwork_max_rssi!=NULL)) if ((pmlmepriv->assoc_by_rssi==_TRUE) && (pnetwork_max_rssi!=NULL))
{ {
pnetwork = pnetwork_max_rssi; pnetwork = pnetwork_max_rssi;
DBG_871X("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n", DBG_88E("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress));
goto ask_for_joinbss; goto ask_for_joinbss;
} }
DBG_871X("(1)rtw_select_and_join_from_scanned_queue return _FAIL\n"); DBG_88E("(1)rtw_select_and_join_from_scanned_queue return _FAIL\n");
_func_exit_; _func_exit_;
@ -3016,10 +3016,10 @@ _func_enter_;
if ( _TRUE == adapter->pwrctrlpriv.bInternalAutoSuspend) if ( _TRUE == adapter->pwrctrlpriv.bInternalAutoSuspend)
{ {
adapter->pwrctrlpriv.wepkeymask = pmlmepriv->key_mask; adapter->pwrctrlpriv.wepkeymask = pmlmepriv->key_mask;
DBG_871X("....AutoSuspend pwrctrlpriv.wepkeymask(%x)\n",adapter->pwrctrlpriv.wepkeymask); DBG_88E("....AutoSuspend pwrctrlpriv.wepkeymask(%x)\n",adapter->pwrctrlpriv.wepkeymask);
} }
#endif #endif
DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->key_mask); DBG_88E("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->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){ switch (psetkeyparm->algorithm){
@ -3438,7 +3438,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);
//if (max_recvbuf_sz-rx_packet_offset>(8191-256)) { //if (max_recvbuf_sz-rx_packet_offset>(8191-256)) {
// DBG_871X("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __func__); // DBG_88E("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __func__);
// ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; // ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU;
//} //}
} }
@ -3511,7 +3511,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable)) if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable))
return; return;
DBG_871X("+rtw_update_ht_cap()\n"); DBG_88E("+rtw_update_ht_cap()\n");
//maybe needs check if ap supports rx ampdu. //maybe needs check if ap supports rx ampdu.
if ((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1)) if ((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1))
@ -3540,7 +3540,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR); max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);
max_ampdu_sz = 1 << (max_ampdu_sz+3); // max_ampdu_sz (kbytes); max_ampdu_sz = 1 << (max_ampdu_sz+3); // max_ampdu_sz (kbytes);
//DBG_871X("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz); //DBG_88E("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz);
phtpriv->rx_ampdu_maxlen = max_ampdu_sz; phtpriv->rx_ampdu_maxlen = max_ampdu_sz;
} }
@ -3621,7 +3621,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
{ {
pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
}*/ }*/
DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
} }
// //
@ -3664,7 +3664,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
if (0==issued) if (0==issued)
{ {
DBG_871X("rtw_issue_addbareq_cmd, p=%d\n", priority); DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority); psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
rtw_addbareq_cmd(padapter,(u8) priority, pattrib->ra); rtw_addbareq_cmd(padapter,(u8) priority, pattrib->ra);
} }
@ -3697,7 +3697,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
pnetwork = &pmlmepriv->cur_network; pnetwork = &pmlmepriv->cur_network;
if (0 < pmlmepriv->to_roaming) { if (0 < pmlmepriv->to_roaming) {
DBG_871X("roaming from %s("MAC_FMT"), length:%d\n", DBG_88E("roaming from %s("MAC_FMT"), length:%d\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress), pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress),
pnetwork->network.Ssid.SsidLength); pnetwork->network.Ssid.SsidLength);
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
@ -3712,13 +3712,13 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
if ( _SUCCESS==(do_join_r=rtw_do_join(padapter)) ) { if ( _SUCCESS==(do_join_r=rtw_do_join(padapter)) ) {
break; break;
} else { } else {
DBG_871X("roaming do_join return %d\n", do_join_r); DBG_88E("roaming do_join return %d\n", do_join_r);
pmlmepriv->to_roaming--; pmlmepriv->to_roaming--;
if (0< pmlmepriv->to_roaming) { if (0< pmlmepriv->to_roaming) {
continue; continue;
} else { } else {
DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __func__,__LINE__); DBG_88E("%s(%d) -to roaming fail, indicate_disconnect\n", __func__,__LINE__);
rtw_indicate_disconnect(padapter); rtw_indicate_disconnect(padapter);
break; break;
} }

460
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

10
core/rtw_mp.c
View file

@ -966,7 +966,7 @@ static thread_return mp_xmit_packet_thread(thread_context context)
thread_enter("RTW_MP_THREAD"); thread_enter("RTW_MP_THREAD");
//DBG_871X("%s:pkTx Start\n", __func__); //DBG_88E("%s:pkTx Start\n", __func__);
while (1) { while (1) {
pxmitframe = alloc_mp_xmitframe(pxmitpriv); pxmitframe = alloc_mp_xmitframe(pxmitpriv);
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
@ -1001,7 +1001,7 @@ static thread_return mp_xmit_packet_thread(thread_context context)
} }
exit: exit:
//DBG_871X("%s:pkTx Exit\n", __func__); //DBG_88E("%s:pkTx Exit\n", __func__);
rtw_mfree(pmptx->pallocated_buf, pmptx->buf_size); rtw_mfree(pmptx->pallocated_buf, pmptx->buf_size);
pmptx->pallocated_buf = NULL; pmptx->pallocated_buf = NULL;
pmptx->stop = 1; pmptx->stop = 1;
@ -1058,7 +1058,7 @@ void SetPacketTx(PADAPTER padapter)
pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ; pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ;
pmp_priv->tx.pallocated_buf = rtw_zmalloc(pmp_priv->tx.buf_size); pmp_priv->tx.pallocated_buf = rtw_zmalloc(pmp_priv->tx.buf_size);
if (pmp_priv->tx.pallocated_buf == NULL) { if (pmp_priv->tx.pallocated_buf == NULL) {
DBG_871X("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size); DBG_88E("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size);
return; return;
} }
pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pmp_priv->tx.pallocated_buf), XMITBUF_ALIGN_SZ); pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pmp_priv->tx.pallocated_buf), XMITBUF_ALIGN_SZ);
@ -1167,7 +1167,7 @@ void SetPacketTx(PADAPTER padapter)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
pmp_priv->tx.PktTxThread = kthread_run(mp_xmit_packet_thread, pmp_priv, "RTW_MP_THREAD"); pmp_priv->tx.PktTxThread = kthread_run(mp_xmit_packet_thread, pmp_priv, "RTW_MP_THREAD");
if (IS_ERR(pmp_priv->tx.PktTxThread)) if (IS_ERR(pmp_priv->tx.PktTxThread))
DBG_871X("Create PktTx Thread Fail !!!!!\n"); DBG_88E("Create PktTx Thread Fail !!!!!\n");
#endif #endif
#ifdef PLATFORM_FREEBSD #ifdef PLATFORM_FREEBSD
{ {
@ -1177,7 +1177,7 @@ void SetPacketTx(PADAPTER padapter)
&p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread"); &p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread");
if (pmp_priv->tx.PktTxThread < 0) if (pmp_priv->tx.PktTxThread < 0)
DBG_871X("Create PktTx Thread Fail !!!!!\n"); DBG_88E("Create PktTx Thread Fail !!!!!\n");
} }
#endif #endif
} }

6
core/rtw_mp_ioctl.c
View file

@ -733,7 +733,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv; struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) { if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1; pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__); DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5); rtw_msleep_os(5);
} }
pmp_priv->tx.stop = 0; pmp_priv->tx.stop = 0;
@ -771,7 +771,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv; struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) { if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1; pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__); DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5); rtw_msleep_os(5);
} }
pmp_priv->tx.stop = 0; pmp_priv->tx.stop = 0;
@ -809,7 +809,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv; struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) { if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1; pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__); DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5); rtw_msleep_os(5);
} }
pmp_priv->tx.stop = 0; pmp_priv->tx.stop = 0;

144
core/rtw_p2p.c
View file

@ -63,7 +63,7 @@ int is_any_client_associated( _adapter *padapter )
if ((intFound == _FALSE && pstapriv->asoc_list_cnt) if ((intFound == _FALSE && pstapriv->asoc_list_cnt)
|| (intFound == _TRUE && !pstapriv->asoc_list_cnt)) { || (intFound == _TRUE && !pstapriv->asoc_list_cnt)) {
DBG_871X("%s intFound:%d, asoc_list_cnt:%u mismatch\n", __func__ DBG_88E("%s intFound:%d, asoc_list_cnt:%u mismatch\n", __func__
, intFound, pstapriv->asoc_list_cnt); , intFound, pstapriv->asoc_list_cnt);
} }
@ -84,7 +84,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
_adapter *padapter = pwdinfo->padapter; _adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN); pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN);
@ -189,7 +189,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
u8 oui_subtype = P2P_GO_DISC_REQUEST; u8 oui_subtype = P2P_GO_DISC_REQUEST;
u8 dialogToken=0; u8 dialogToken=0;
DBG_871X("[%s]\n", __func__); DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
@ -250,7 +250,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
u8 p2pie[8] = { 0x00 }; u8 p2pie[8] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
DBG_871X("[%s]\n", __func__); DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
@ -416,7 +416,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
u8 noa_attr_content[32] = { 0x00 }; u8 noa_attr_content[32] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
DBG_871X("[%s]\n", __func__); DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
@ -2361,12 +2361,12 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
if ( !p2p_ie ) if ( !p2p_ie )
{ {
DBG_8192C( "[%s] P2P IE not Found!!\n", __func__ ); DBG_88E( "[%s] P2P IE not Found!!\n", __func__ );
status_code = P2P_STATUS_FAIL_INVALID_PARAM; status_code = P2P_STATUS_FAIL_INVALID_PARAM;
} }
else else
{ {
DBG_8192C( "[%s] P2P IE Found!!\n", __func__ ); DBG_88E( "[%s] P2P IE Found!!\n", __func__ );
} }
while ( p2p_ie ) while ( p2p_ie )
@ -2374,7 +2374,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
//Check P2P Capability ATTR //Check P2P Capability ATTR
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) ) if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) )
{ {
DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __func__ ); DBG_88E( "[%s] Got P2P Capability Attr!!\n", __func__ );
cap_attr = le16_to_cpu(cap_attr); cap_attr = le16_to_cpu(cap_attr);
psta->dev_cap = cap_attr&0xff; psta->dev_cap = cap_attr&0xff;
} }
@ -2385,7 +2385,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
//Check P2P Device Info ATTR //Check P2P Device Info ATTR
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen)) if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen))
{ {
DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __func__ ); DBG_88E( "[%s] Got P2P DEVICE INFO Attr!!\n", __func__ );
pattr_content = pbuf = rtw_zmalloc(attr_contentlen); pattr_content = pbuf = rtw_zmalloc(attr_contentlen);
if (pattr_content) if (pattr_content)
{ {
@ -2590,7 +2590,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method); issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method);
} }
} }
DBG_871X( "[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); DBG_88E( "[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
return _TRUE; return _TRUE;
} }
@ -2713,7 +2713,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
} }
else else
{ {
DBG_871X( "[%s] WPS IE not Found!!\n", __func__ ); DBG_88E( "[%s] WPS IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
return( result ); return( result );
@ -2733,7 +2733,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( !p2p_ie ) if ( !p2p_ie )
{ {
DBG_871X( "[%s] P2P IE not Found!!\n", __func__ ); DBG_88E( "[%s] P2P IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
} }
@ -2765,7 +2765,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
{ {
DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 ); DBG_88E( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 );
pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values. pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values.
if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@ -2822,7 +2822,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( ch_num_inclusioned == 0) if ( ch_num_inclusioned == 0)
{ {
DBG_871X( "[%s] No common channel in channel list!\n", __func__ ); DBG_88E( "[%s] No common channel in channel list!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2836,7 +2836,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{ {
DBG_871X( "[%s] desired channel NOT Found!\n", __func__ ); DBG_88E( "[%s] desired channel NOT Found!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2859,13 +2859,13 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
* Change our operating channel as peer's for compatibility. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; pwdinfo->operating_channel = peer_operating_ch;
DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel); DBG_88E( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
} }
else else
{ {
// Take first channel of ch_list_inclusioned as operating channel // Take first channel of ch_list_inclusioned as operating channel
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel); DBG_88E( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
} }
} }
@ -2885,12 +2885,12 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
u8 attr_content[ 10 ] = { 0x00 }; u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
DBG_871X( "[%s] WFD IE Found!!\n", __func__ ); DBG_88E( "[%s] WFD IE Found!!\n", __func__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
} }
} }
#endif // CONFIG_WFD #endif // CONFIG_WFD
@ -2925,7 +2925,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
} }
else else
{ {
DBG_871X( "[%s] WPS IE not Found!!\n", __func__ ); DBG_88E( "[%s] WPS IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
} }
@ -2968,7 +2968,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 ) if ( attr_contentlen == 1 )
{ {
DBG_871X( "[%s] Status = %d\n", __func__, attr_content ); DBG_88E( "[%s] Status = %d\n", __func__, attr_content );
if ( attr_content == P2P_STATUS_SUCCESS ) if ( attr_content == P2P_STATUS_SUCCESS )
{ {
// Do nothing. // Do nothing.
@ -3001,7 +3001,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
{ {
DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 ); DBG_88E( "[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01 );
pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values. pwdinfo->peer_intent = attr_content; // include both intent and tie breaker values.
if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@ -3054,21 +3054,21 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen))
{ {
DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] ); DBG_88E( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] );
pwdinfo->peer_operating_ch = operatingch_info[4]; pwdinfo->peer_operating_ch = operatingch_info[4];
} }
// Try to get the channel list information // Try to get the channel list information
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) )
{ {
DBG_871X( "[%s] channel list attribute found, len = %d\n", __func__, pwdinfo->channel_list_attr_len ); DBG_88E( "[%s] channel list attribute found, len = %d\n", __func__, pwdinfo->channel_list_attr_len );
peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list); peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
if ( ch_num_inclusioned == 0) if ( ch_num_inclusioned == 0)
{ {
DBG_871X( "[%s] No common channel in channel list!\n", __func__ ); DBG_88E( "[%s] No common channel in channel list!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -3082,7 +3082,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{ {
DBG_871X( "[%s] desired channel NOT Found!\n", __func__ ); DBG_88E( "[%s] desired channel NOT Found!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -3105,13 +3105,13 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
* Change our operating channel as peer's for compatibility. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; pwdinfo->operating_channel = peer_operating_ch;
DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel); DBG_88E( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
} }
else else
{ {
// Take first channel of ch_list_inclusioned as operating channel // Take first channel of ch_list_inclusioned as operating channel
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel); DBG_88E( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
} }
} }
@ -3121,7 +3121,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
} }
else else
{ {
DBG_871X( "[%s] channel list attribute not found!\n", __func__); DBG_88E( "[%s] channel list attribute not found!\n", __func__);
} }
// Try to get the group id information if peer is GO // Try to get the group id information if peer is GO
@ -3147,12 +3147,12 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
u8 attr_content[ 10 ] = { 0x00 }; u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
DBG_8192C( "[%s] WFD IE Found!!\n", __func__ ); DBG_88E( "[%s] WFD IE Found!!\n", __func__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
} }
} }
#endif // CONFIG_WFD #endif // CONFIG_WFD
@ -3182,7 +3182,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 ) if ( attr_contentlen == 1 )
{ {
DBG_871X( "[%s] Status = %d\n", __func__, attr_content ); DBG_88E( "[%s] Status = %d\n", __func__, attr_content );
result = attr_content; result = attr_content;
if ( attr_content == P2P_STATUS_SUCCESS ) if ( attr_content == P2P_STATUS_SUCCESS )
@ -3237,7 +3237,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
_rtw_memset( groupid, 0x00, 38 ); _rtw_memset( groupid, 0x00, 38 );
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) ) if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
{ {
DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __func__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) ); DBG_88E( "[%s] Ssid = %s, ssidlen = %zu\n", __func__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN ); _rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
_rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN ); _rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
} }
@ -3245,7 +3245,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
attr_contentlen = 0; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) )
{ {
DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] ); DBG_88E( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] );
pwdinfo->peer_operating_ch = operatingch_info[4]; pwdinfo->peer_operating_ch = operatingch_info[4];
} }
@ -3404,7 +3404,7 @@ _func_enter_;
pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel; pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel;
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
DBG_871X("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel); DBG_88E("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
@ -3417,7 +3417,7 @@ _func_enter_;
// If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel. // If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel.
if ( pwdinfo->ext_listen_period > 0 ) if ( pwdinfo->ext_listen_period > 0 )
{ {
DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period ); DBG_88E( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period );
if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel ) if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )
{ {
@ -3440,7 +3440,7 @@ _func_enter_;
rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) ) rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) )
{ {
// Now, the driver is in the listen state of P2P mode. // Now, the driver is in the listen state of P2P mode.
DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __func__, pwdinfo->ext_listen_interval ); DBG_88E( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __func__, pwdinfo->ext_listen_interval );
// Commented by Albert 2012/11/01 // Commented by Albert 2012/11/01
// If the AP's channel is the same as the listen channel, we should still be in the listen state // If the AP's channel is the same as the listen channel, we should still be in the listen state
@ -3520,7 +3520,7 @@ _func_enter_;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
DBG_871X("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel); DBG_88E("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode); set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
@ -3538,13 +3538,13 @@ _func_enter_;
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo)); DBG_88E("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo));
#endif #endif
} }
pcfg80211_wdinfo->is_ro_ch = _FALSE; pcfg80211_wdinfo->is_ro_ch = _FALSE;
DBG_871X("cfg80211_remain_on_channel_expired\n"); DBG_88E("cfg80211_remain_on_channel_expired\n");
cfg80211_remain_on_channel_expired(pcfg80211_wdinfo->remain_on_ch_dev, cfg80211_remain_on_channel_expired(pcfg80211_wdinfo->remain_on_ch_dev,
pcfg80211_wdinfo->remain_on_ch_cookie, pcfg80211_wdinfo->remain_on_ch_cookie,
@ -3705,7 +3705,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
dialogToken = frame_body[6]; dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", DBG_88E("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken); cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3731,7 +3731,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
} }
else else
{ {
DBG_871X("%s, action frame category=%d\n", __func__, category); DBG_88E("%s, action frame category=%d\n", __func__, category);
//is_p2p_frame = (-1); //is_p2p_frame = (-1);
} }
@ -3762,7 +3762,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
dialogToken = frame_body[7]; dialogToken = frame_body[7];
is_p2p_frame = OUI_Subtype; is_p2p_frame = OUI_Subtype;
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_PUBLIC: ACT_PUBLIC_VENDOR, OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", DBG_88E("ACTION_CATEGORY_PUBLIC: ACT_PUBLIC_VENDOR, OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 2 ) ) ), OUI_Subtype, dialogToken); cpu_to_be32( *( ( u32* ) ( frame_body + 2 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3776,7 +3776,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
u8 *cont; u8 *cont;
uint cont_len; uint cont_len;
case P2P_GO_NEGO_REQ: case P2P_GO_NEGO_REQ:
DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); DBG_88E("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
if (tx) if (tx)
{ {
@ -3796,7 +3796,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
break; break;
case P2P_GO_NEGO_RESP: case P2P_GO_NEGO_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1); DBG_88E("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
if (!tx) if (!tx)
{ {
@ -3812,7 +3812,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
break; break;
case P2P_GO_NEGO_CONF: case P2P_GO_NEGO_CONF:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1); DBG_88E("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (tx) if (tx)
@ -3848,7 +3848,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
invit_info->flags = (flags==-1) ? 0x0 : flags; invit_info->flags = (flags==-1) ? 0x0 : flags;
invit_info->req_op_ch= op_ch; invit_info->req_op_ch= op_ch;
DBG_871X("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch); DBG_88E("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch);
break; break;
} }
case P2P_INVIT_RESP: case P2P_INVIT_RESP:
@ -3878,15 +3878,15 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
invit_info->rsp_op_ch= op_ch; invit_info->rsp_op_ch= op_ch;
} }
DBG_871X("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch); DBG_88E("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch);
break; break;
} }
case P2P_DEVDISC_REQ: case P2P_DEVDISC_REQ:
DBG_871X("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); DBG_88E("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
break; break;
case P2P_DEVDISC_RESP: case P2P_DEVDISC_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1); DBG_88E("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
break; break;
case P2P_PROVISION_DISC_REQ: case P2P_PROVISION_DISC_REQ:
{ {
@ -3895,7 +3895,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
uint p2p_ielen = 0; uint p2p_ielen = 0;
uint contentlen = 0; uint contentlen = 0;
DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); DBG_88E("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
//if (tx) //if (tx)
{ {
@ -3911,7 +3911,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
else else
{ {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("provdisc_req_issued is _TRUE\n"); DBG_88E("provdisc_req_issued is _TRUE\n");
#endif //CONFIG_DEBUG_CFG80211 #endif //CONFIG_DEBUG_CFG80211
pwdev_priv->provdisc_req_issued = _TRUE;//case: p2p_devices connection before Nego req. pwdev_priv->provdisc_req_issued = _TRUE;//case: p2p_devices connection before Nego req.
} }
@ -3921,10 +3921,10 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
} }
break; break;
case P2P_PROVISION_DISC_RESP: case P2P_PROVISION_DISC_RESP:
DBG_871X("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken); DBG_88E("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
break; break;
default: default:
DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken); DBG_88E("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken);
break; break;
} }
@ -3937,7 +3937,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
dialogToken = frame_body[6]; dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n", DBG_88E("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken); cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3946,26 +3946,26 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
switch (OUI_Subtype) switch (OUI_Subtype)
{ {
case P2P_NOTICE_OF_ABSENCE: case P2P_NOTICE_OF_ABSENCE:
DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); DBG_88E("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break; break;
case P2P_PRESENCE_REQUEST: case P2P_PRESENCE_REQUEST:
DBG_871X("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); DBG_88E("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break; break;
case P2P_PRESENCE_RESPONSE: case P2P_PRESENCE_RESPONSE:
DBG_871X("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); DBG_88E("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break; break;
case P2P_GO_DISC_REQUEST: case P2P_GO_DISC_REQUEST:
DBG_871X("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken); DBG_88E("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break; break;
default: default:
DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken); DBG_88E("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken);
break; break;
} }
} }
else else
{ {
DBG_871X("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category); DBG_88E("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category);
//is_p2p_frame = (-1); //is_p2p_frame = (-1);
} }
@ -4220,7 +4220,7 @@ _func_enter_;
if (pwrpriv->smart_ps != 0) if (pwrpriv->smart_ps != 0)
{ {
pwrpriv->smart_ps = 0; pwrpriv->smart_ps = 0;
DBG_871X("%s(): Enter CTW, change SmartPS\n", __func__); DBG_88E("%s(): Enter CTW, change SmartPS\n", __func__);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
} }
} }
@ -4306,7 +4306,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
DBG_871X( "[%s] In\n", __func__ ); DBG_88E( "[%s] In\n", __func__ );
// Reset the operation channel information // Reset the operation channel information
pwdinfo->rx_invitereq_info.operation_ch[0] = 0; pwdinfo->rx_invitereq_info.operation_ch[0] = 0;
pwdinfo->rx_invitereq_info.scan_op_ch_only = 0; pwdinfo->rx_invitereq_info.scan_op_ch_only = 0;
@ -4320,7 +4320,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
DBG_871X( "[%s] In\n", __func__ ); DBG_88E( "[%s] In\n", __func__ );
// Reset the operation channel information // Reset the operation channel information
pwdinfo->p2p_info.operation_ch[0] = 0; pwdinfo->p2p_info.operation_ch[0] = 0;
pwdinfo->p2p_info.scan_op_ch_only = 0; pwdinfo->p2p_info.scan_op_ch_only = 0;
@ -4376,7 +4376,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
} }
else else
{ {
DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) ); DBG_88E( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) );
} }
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -4583,7 +4583,7 @@ void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role)
rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE);
pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1); pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1);
//DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __func__, pwdinfo->listen_dwell ); //DBG_88E( "[%s] listen_dwell time is %d00ms\n", __func__, pwdinfo->listen_dwell );
_rtw_memset( &pwdinfo->tx_prov_disc_info, 0x00, sizeof( struct tx_provdisc_req_info ) ); _rtw_memset( &pwdinfo->tx_prov_disc_info, 0x00, sizeof( struct tx_provdisc_req_info ) );
pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE; pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE;
@ -4665,11 +4665,11 @@ void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state,
if (!_rtw_p2p_chk_state(wdinfo, state)) { if (!_rtw_p2p_chk_state(wdinfo, state)) {
enum P2P_STATE old_state = _rtw_p2p_state(wdinfo); enum P2P_STATE old_state = _rtw_p2p_state(wdinfo);
_rtw_p2p_set_state(wdinfo, state); _rtw_p2p_set_state(wdinfo, state);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line
, p2p_state_str[old_state], p2p_state_str[_rtw_p2p_state(wdinfo)] , p2p_state_str[old_state], p2p_state_str[_rtw_p2p_state(wdinfo)]
); );
} else { } else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state to same state %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_state to same state %s\n", caller, line
, p2p_state_str[_rtw_p2p_state(wdinfo)] , p2p_state_str[_rtw_p2p_state(wdinfo)]
); );
} }
@ -4679,11 +4679,11 @@ void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE st
if (_rtw_p2p_pre_state(wdinfo) != state) { if (_rtw_p2p_pre_state(wdinfo) != state) {
enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo); enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo);
_rtw_p2p_set_pre_state(wdinfo, state); _rtw_p2p_set_pre_state(wdinfo, state);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line
, p2p_state_str[old_state], p2p_state_str[_rtw_p2p_pre_state(wdinfo)] , p2p_state_str[old_state], p2p_state_str[_rtw_p2p_pre_state(wdinfo)]
); );
} else { } else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state to same state %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_pre_state to same state %s\n", caller, line
, p2p_state_str[_rtw_p2p_pre_state(wdinfo)] , p2p_state_str[_rtw_p2p_pre_state(wdinfo)]
); );
} }
@ -4694,11 +4694,11 @@ void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, co
if (wdinfo->role != role) { if (wdinfo->role != role) {
enum P2P_ROLE old_role = wdinfo->role; enum P2P_ROLE old_role = wdinfo->role;
_rtw_p2p_set_role(wdinfo, role); _rtw_p2p_set_role(wdinfo, role);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line
, p2p_role_str[old_role], p2p_role_str[wdinfo->role] , p2p_role_str[old_role], p2p_role_str[wdinfo->role]
); );
} else { } else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role to same role %s\n", caller, line DBG_88E("[CONFIG_DBG_P2P]%s:%d set_role to same role %s\n", caller, line
, p2p_role_str[wdinfo->role] , p2p_role_str[wdinfo->role]
); );
} }

120
core/rtw_pwrctrl.c
View file

@ -43,8 +43,8 @@ void ips_enter(_adapter * padapter)
if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF || if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF ||
pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) { pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) {
DBG_871X_LEVEL(_drv_always_, "There are some pkts to transmit\n"); DBG_88E_LEVEL(_drv_info_, "There are some pkts to transmit\n");
DBG_871X_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n", DBG_88E_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n",
pxmit_priv->free_xmitbuf_cnt, pxmit_priv->free_xmit_extbuf_cnt); pxmit_priv->free_xmitbuf_cnt, pxmit_priv->free_xmit_extbuf_cnt);
return; return;
} }
@ -57,14 +57,14 @@ void ips_enter(_adapter * padapter)
pwrpriv->ips_mode = pwrpriv->ips_mode_req; pwrpriv->ips_mode = pwrpriv->ips_mode_req;
pwrpriv->ips_enter_cnts++; pwrpriv->ips_enter_cnts++;
DBG_871X("==>ips_enter cnts:%d\n",pwrpriv->ips_enter_cnts); DBG_88E("==>ips_enter cnts:%d\n",pwrpriv->ips_enter_cnts);
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter); BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif #endif
if (rf_off == pwrpriv->change_rfpwrstate ) if (rf_off == pwrpriv->change_rfpwrstate )
{ {
pwrpriv->bpower_saving = _TRUE; pwrpriv->bpower_saving = _TRUE;
DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n"); DBG_88E_LEVEL(_drv_info_, "nolinked power save enter\n");
if (pwrpriv->ips_mode == IPS_LEVEL_2) if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE; pwrpriv->bkeepfwalive = _TRUE;
@ -94,16 +94,16 @@ int ips_leave(_adapter * padapter)
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = _TRUE;
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
pwrpriv->ips_leave_cnts++; pwrpriv->ips_leave_cnts++;
DBG_871X("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts); DBG_88E("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts);
if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) { if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) {
pwrpriv->rf_pwrstate = rf_on; pwrpriv->rf_pwrstate = rf_on;
} }
DBG_871X_LEVEL(_drv_always_, "nolinked power save leave\n"); DBG_88E_LEVEL(_drv_info_, "nolinked power save leave\n");
if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm))
{ {
DBG_871X("==>%s,channel(%d),processing(%x)\n",__func__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing); DBG_88E("==>%s,channel(%d),processing(%x)\n",__func__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing);
set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
for (keyid=0;keyid<4;keyid++){ for (keyid=0;keyid<4;keyid++){
if (pmlmepriv->key_mask & BIT(keyid)){ if (pmlmepriv->key_mask & BIT(keyid)){
@ -115,7 +115,7 @@ int ips_leave(_adapter * padapter)
} }
} }
DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c)); DBG_88E("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c));
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = _FALSE;
pwrpriv->bkeepfwalive = _FALSE; pwrpriv->bkeepfwalive = _FALSE;
@ -154,7 +154,7 @@ bool rtw_pwr_unassociated_idle(_adapter *adapter)
bool ret = _FALSE; bool ret = _FALSE;
if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time()) { if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time()) {
//DBG_871X("%s ips_deny_time\n", __func__); //DBG_88E("%s ips_deny_time\n", __func__);
goto exit; goto exit;
} }
@ -218,7 +218,7 @@ void rtw_ps_processor(_adapter*padapter)
if (pwrpriv->bips_processing == _TRUE) if (pwrpriv->bips_processing == _TRUE)
goto exit; goto exit;
//DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); //DBG_88E("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca));
if (padapter->pwrctrlpriv.bHWPwrPindetect) if (padapter->pwrctrlpriv.bHWPwrPindetect)
{ {
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
@ -230,7 +230,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->ps_flag = _TRUE; pwrpriv->ps_flag = _TRUE;
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); DBG_88E("@@@@- #1 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate) if (rfpwrstate!= pwrpriv->rf_pwrstate)
{ {
if (rfpwrstate == rf_off) if (rfpwrstate == rf_off)
@ -249,7 +249,7 @@ void rtw_ps_processor(_adapter*padapter)
#endif //CONFIG_AUTOSUSPEND #endif //CONFIG_AUTOSUSPEND
{ {
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); DBG_88E("@@@@- #2 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate) if (rfpwrstate!= pwrpriv->rf_pwrstate)
{ {
@ -265,7 +265,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
rtw_hw_resume(padapter ); rtw_hw_resume(padapter );
} }
DBG_871X("current rf_pwrstate(%s)\n",(pwrpriv->rf_pwrstate == rf_off)?"rf_off":"rf_on"); DBG_88E("current rf_pwrstate(%s)\n",(pwrpriv->rf_pwrstate == rf_off)?"rf_off":"rf_on");
} }
} }
pwrpriv->pwr_state_check_cnts ++; pwrpriv->pwr_state_check_cnts ++;
@ -284,7 +284,7 @@ void rtw_ps_processor(_adapter*padapter)
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0))
{ {
DBG_871X("==>%s .fw_state(%x)\n",__func__,get_fwstate(pmlmepriv)); DBG_88E("==>%s .fw_state(%x)\n",__func__,get_fwstate(pmlmepriv));
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
#else #else
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
@ -300,11 +300,11 @@ void rtw_ps_processor(_adapter*padapter)
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
if (_TRUE==pwrpriv->bInternalAutoSuspend) { if (_TRUE==pwrpriv->bInternalAutoSuspend) {
DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__func__,pwrpriv->bInternalAutoSuspend); DBG_88E("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__func__,pwrpriv->bInternalAutoSuspend);
} else { } else {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = _TRUE;
DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__func__,pwrpriv->bInternalAutoSuspend); DBG_88E("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__func__,pwrpriv->bInternalAutoSuspend);
autosuspend_enter(padapter); autosuspend_enter(padapter);
} }
#else #else
@ -370,7 +370,7 @@ _func_enter_;
#ifdef CONFIG_LPS_RPWM_TIMER #ifdef CONFIG_LPS_RPWM_TIMER
if (pwrpriv->brpwmtimeout == _TRUE) if (pwrpriv->brpwmtimeout == _TRUE)
{ {
DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv); DBG_88E("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv);
} }
else else
#endif // CONFIG_LPS_RPWM_TIMER #endif // CONFIG_LPS_RPWM_TIMER
@ -474,7 +474,7 @@ u8 PS_RDY_CHECK(_adapter * padapter)
#endif #endif
if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) ) if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) )
{ {
DBG_871X("Group handshake still in progress !!!\n"); DBG_88E("Group handshake still in progress !!!\n");
return _FALSE; return _FALSE;
} }
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
@ -532,7 +532,7 @@ _func_enter_;
if (pwdinfo->opp_ps == 0) if (pwdinfo->opp_ps == 0)
#endif //CONFIG_P2P_PS #endif //CONFIG_P2P_PS
{ {
DBG_871X("rtw_set_ps_mode: Leave 802.11 power save\n"); DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n");
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
@ -569,7 +569,7 @@ _func_enter_;
#endif #endif
) )
{ {
DBG_871X("%s: Enter 802.11 power save\n", __func__); DBG_88E("%s: Enter 802.11 power save\n", __func__);
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
@ -643,14 +643,14 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
if (_TRUE == padapter->bSurpriseRemoved) if (_TRUE == padapter->bSurpriseRemoved)
{ {
err = -2; err = -2;
DBG_871X("%s: device surprise removed!!\n", __func__); DBG_88E("%s: device surprise removed!!\n", __func__);
break; break;
} }
if (rtw_get_passing_time_ms(start_time) > delay_ms) if (rtw_get_passing_time_ms(start_time) > delay_ms)
{ {
err = -1; err = -1;
DBG_871X("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms); DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);
break; break;
} }
rtw_usleep_os(100); rtw_usleep_os(100);
@ -671,7 +671,7 @@ void LPS_Enter(PADAPTER padapter)
_func_enter_; _func_enter_;
// DBG_871X("+LeisurePSEnter\n"); // DBG_88E("+LeisurePSEnter\n");
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (padapter->iface_type != IFACE_PORT0) if (padapter->iface_type != IFACE_PORT0)
@ -714,7 +714,7 @@ _func_enter_;
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
{ {
pwrpriv->bpower_saving = _TRUE; pwrpriv->bpower_saving = _TRUE;
DBG_871X("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps); DBG_88E("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
//For Tenda W311R IOT issue //For Tenda W311R IOT issue
rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0); rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0);
} }
@ -723,7 +723,7 @@ _func_enter_;
pwrpriv->LpsIdleCount++; pwrpriv->LpsIdleCount++;
} }
// DBG_871X("-LeisurePSEnter\n"); // DBG_88E("-LeisurePSEnter\n");
_func_exit_; _func_exit_;
} }
@ -747,7 +747,7 @@ _func_enter_;
return; /* Skip power saving for concurrent mode port 1*/ return; /* Skip power saving for concurrent mode port 1*/
#endif #endif
// DBG_871X("+LeisurePSLeave\n"); // DBG_88E("+LeisurePSLeave\n");
if (pwrpriv->bLeisurePs) if (pwrpriv->bLeisurePs)
{ {
@ -762,7 +762,7 @@ _func_enter_;
pwrpriv->bpower_saving = _FALSE; pwrpriv->bpower_saving = _FALSE;
// DBG_871X("-LeisurePSLeave\n"); // DBG_88E("-LeisurePSLeave\n");
_func_exit_; _func_exit_;
} }
@ -779,7 +779,7 @@ void LeaveAllPowerSaveMode(IN PADAPTER Adapter)
_func_enter_; _func_enter_;
//DBG_871X("%s.....\n",__func__); //DBG_88E("%s.....\n",__func__);
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
{ //connect { //connect
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
@ -818,7 +818,7 @@ _func_enter_;
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
if (_FALSE == ips_leave(Adapter)) if (_FALSE == ips_leave(Adapter))
{ {
DBG_871X("======> ips_leave fail.............\n"); DBG_88E("======> ips_leave fail.............\n");
} }
#endif #endif
#endif //CONFIG_PLATFORM_SPRD && CONFIG_RTL8188E #endif //CONFIG_PLATFORM_SPRD && CONFIG_RTL8188E
@ -868,7 +868,7 @@ _func_enter_;
if (rtw_get_passing_time_ms(start_time)>100) if (rtw_get_passing_time_ms(start_time)>100)
{ {
DBG_871X("Wait for cpwm event than 100 ms!!!\n"); DBG_88E("Wait for cpwm event than 100 ms!!!\n");
break; break;
} }
rtw_msleep_os(1); rtw_msleep_os(1);
@ -898,7 +898,7 @@ _func_enter_;
#ifdef CONFIG_LPS_RPWM_TIMER #ifdef CONFIG_LPS_RPWM_TIMER
if (pwrpriv->rpwm < PS_STATE_S2) if (pwrpriv->rpwm < PS_STATE_S2)
{ {
DBG_871X("%s: Redundant CPWM Int. RPWM=0x%02X CPWM=0x%02x\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm); DBG_88E("%s: Redundant CPWM Int. RPWM=0x%02X CPWM=0x%02x\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
goto exit; goto exit;
} }
@ -931,7 +931,7 @@ static void cpwm_event_callback(struct work_struct *work)
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
struct reportpwrstate_parm report; struct reportpwrstate_parm report;
//DBG_871X("%s\n",__func__); //DBG_88E("%s\n",__func__);
report.state = PS_STATE_S2; report.state = PS_STATE_S2;
cpwm_int_hdl(adapter, &report); cpwm_int_hdl(adapter, &report);
@ -946,12 +946,12 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
pwrpriv = container_of(work, struct pwrctrl_priv, rpwmtimeoutwi); pwrpriv = container_of(work, struct pwrctrl_priv, rpwmtimeoutwi);
padapter = container_of(pwrpriv, _adapter, pwrctrlpriv); padapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
// DBG_871X("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm); // DBG_88E("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2)) if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{ {
DBG_871X("%s: rpwm=0x%02X cpwm=0x%02X CPWM done!\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm); DBG_88E("%s: rpwm=0x%02X cpwm=0x%02X CPWM done!\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
goto exit; goto exit;
} }
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
@ -962,10 +962,10 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
struct reportpwrstate_parm report; struct reportpwrstate_parm report;
report.state = PS_STATE_S2; report.state = PS_STATE_S2;
DBG_871X("\n%s: FW already leave 32K!\n\n", __func__); DBG_88E("\n%s: FW already leave 32K!\n\n", __func__);
cpwm_int_hdl(padapter, &report); cpwm_int_hdl(padapter, &report);
#else #else
DBG_871X("\n%s: FW already leave 32K!\n\n", __func__); DBG_88E("\n%s: FW already leave 32K!\n\n", __func__);
cpwm_event_callback(&pwrpriv->cpwm_event); cpwm_event_callback(&pwrpriv->cpwm_event);
#endif #endif
return; return;
@ -975,7 +975,7 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2)) if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{ {
DBG_871X("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm); DBG_88E("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
goto exit; goto exit;
} }
pwrpriv->brpwmtimeout = _TRUE; pwrpriv->brpwmtimeout = _TRUE;
@ -997,11 +997,11 @@ static void pwr_rpwm_timeout_handler(void *FunctionContext)
padapter = (PADAPTER)FunctionContext; padapter = (PADAPTER)FunctionContext;
pwrpriv = &padapter->pwrctrlpriv; pwrpriv = &padapter->pwrctrlpriv;
// DBG_871X("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm); // DBG_88E("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2)) if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{ {
DBG_871X("+%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm); DBG_88E("+%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
return; return;
} }
@ -1440,7 +1440,7 @@ static void resume_workitem_callback(struct work_struct *work)
struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work); struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work);
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter); rtw_resume_process(adapter);
@ -1468,7 +1468,7 @@ extern int rtw_resume_process(_adapter *padapter);
static void rtw_early_suspend(struct early_suspend *h) static void rtw_early_suspend(struct early_suspend *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
//jeff: do nothing but set do_late_resume to false //jeff: do nothing but set do_late_resume to false
pwrpriv->do_late_resume = _FALSE; pwrpriv->do_late_resume = _FALSE;
@ -1479,7 +1479,7 @@ static void rtw_late_resume(struct early_suspend *h)
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter); rtw_resume_process(adapter);
@ -1490,7 +1490,7 @@ static void rtw_late_resume(struct early_suspend *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
//jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit //jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit
pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -1503,7 +1503,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
pwrpriv->do_late_resume = _FALSE; pwrpriv->do_late_resume = _FALSE;
@ -1522,7 +1522,7 @@ extern int rtw_resume_process(PADAPTER padapter);
static void rtw_early_suspend(android_early_suspend_t *h) static void rtw_early_suspend(android_early_suspend_t *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
//jeff: do nothing but set do_late_resume to false //jeff: do nothing but set do_late_resume to false
pwrpriv->do_late_resume = _FALSE; pwrpriv->do_late_resume = _FALSE;
@ -1533,7 +1533,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
_adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
DBG_871X("%s\n",__func__); DBG_88E("%s\n",__func__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter); rtw_resume_process(adapter);
@ -1544,7 +1544,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
//jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit //jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit
pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -1555,7 +1555,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
pwrpriv->do_late_resume = _FALSE; pwrpriv->do_late_resume = _FALSE;
@ -1612,13 +1612,13 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
{ {
u32 start = rtw_get_current_time(); u32 start = rtw_get_current_time();
if (pwrpriv->ps_processing) { if (pwrpriv->ps_processing) {
DBG_871X("%s wait ps_processing...\n", __func__); DBG_88E("%s wait ps_processing...\n", __func__);
while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000) while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000)
rtw_msleep_os(10); rtw_msleep_os(10);
if (pwrpriv->ps_processing) if (pwrpriv->ps_processing)
DBG_871X("%s wait ps_processing timeout\n", __func__); DBG_88E("%s wait ps_processing timeout\n", __func__);
else else
DBG_871X("%s wait ps_processing done\n", __func__); DBG_88E("%s wait ps_processing done\n", __func__);
} }
} }
@ -1643,7 +1643,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm:\n"); DBG_88E( "can't get autopm:\n");
} }
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20)) #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf); usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf);
@ -1665,16 +1665,16 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
if (pwrpriv->brfoffbyhw==_TRUE) if (pwrpriv->brfoffbyhw==_TRUE)
{ {
DBG_8192C("hw still in rf_off state ...........\n"); DBG_88E("hw still in rf_off state ...........\n");
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
else if (padapter->registrypriv.usbss_enable) else if (padapter->registrypriv.usbss_enable)
{ {
DBG_8192C("%s call autoresume_enter....\n",__func__); DBG_88E("%s call autoresume_enter....\n",__func__);
if (_FAIL == autoresume_enter(padapter)) if (_FAIL == autoresume_enter(padapter))
{ {
DBG_8192C("======> autoresume fail.............\n"); DBG_88E("======> autoresume fail.............\n");
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
@ -1684,10 +1684,10 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#endif #endif
{ {
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
DBG_8192C("%s call ips_leave....\n",__func__); DBG_88E("%s call ips_leave....\n",__func__);
if (_FAIL == ips_leave(padapter)) if (_FAIL == ips_leave(padapter))
{ {
DBG_8192C("======> ips_leave fail.............\n"); DBG_88E("======> ips_leave fail.............\n");
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
@ -1700,7 +1700,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
|| !padapter->bup || !padapter->bup
|| !padapter->hw_init_completed || !padapter->hw_init_completed
){ ){
DBG_8192C("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n" DBG_88E("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n"
, caller , caller
, padapter->bDriverStopped , padapter->bDriverStopped
, padapter->bup , padapter->bup
@ -1751,12 +1751,12 @@ int rtw_pm_set_ips(_adapter *padapter, u8 mode)
if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) { if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) {
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __func__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2"); DBG_88E("%s %s\n", __func__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
return 0; return 0;
} }
else if (mode ==IPS_NONE){ else if (mode ==IPS_NONE){
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __func__, "IPS_NONE"); DBG_88E("%s %s\n", __func__, "IPS_NONE");
if ((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) ) if ((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
return -EFAULT; return -EFAULT;
} }

186
core/rtw_recv.c
View file

@ -400,7 +400,7 @@ u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter)
union recv_frame *pending_frame; union recv_frame *pending_frame;
while ((pending_frame=rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) { while ((pending_frame=rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) {
rtw_free_recvframe(pending_frame, &adapter->recvpriv.free_recv_queue); rtw_free_recvframe(pending_frame, &adapter->recvpriv.free_recv_queue);
DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__); DBG_88E("%s: dequeue uc_swdec_pending_queue\n", __func__);
cnt++; cnt++;
} }
@ -518,14 +518,14 @@ _func_enter_;
mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; 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", //DBG_88E("\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); // psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx);
if (psecuritypriv->binstallGrpkey==_FALSE) if (psecuritypriv->binstallGrpkey==_FALSE)
{ {
res=_FAIL; res=_FAIL;
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"));
DBG_871X("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"); DBG_88E("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n");
goto exit; goto exit;
} }
} }
@ -590,12 +590,12 @@ _func_enter_;
{ {
rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra)); rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra));
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted); DBG_88E(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
} }
else else
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted); DBG_88E(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
} }
res=_FAIL; res=_FAIL;
@ -647,7 +647,7 @@ _func_enter_;
if (prxattrib->key_index > WEP_KEYS) if (prxattrib->key_index > WEP_KEYS)
{ {
DBG_871X("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index); DBG_88E("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index);
switch (prxattrib->encrypt){ switch (prxattrib->encrypt){
case _WEP40_: case _WEP40_:
@ -672,7 +672,7 @@ _func_enter_;
psecuritypriv->hw_decrypted=_FALSE; psecuritypriv->hw_decrypted=_FALSE;
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
@ -703,14 +703,14 @@ _func_enter_;
{ {
psecuritypriv->hw_decrypted=_TRUE; psecuritypriv->hw_decrypted=_TRUE;
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n" DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
} }
else { else {
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, psecuritypriv->hw_decrypted:%d\n" DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, psecuritypriv->hw_decrypted:%d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted); , prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
} }
@ -878,7 +878,7 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
stop_sta_xmit(padapter, psta); stop_sta_xmit(padapter, psta);
//DBG_871X("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap); //DBG_88E("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
} }
} }
else else
@ -890,7 +890,7 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
wakeup_sta_to_xmit(padapter, psta); wakeup_sta_to_xmit(padapter, psta);
//DBG_871X("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap); //DBG_88E("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
} }
} }
@ -994,7 +994,7 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
if (ptdlsinfo->enable == 0) if (ptdlsinfo->enable == 0)
{ {
DBG_871X("recv tdls frame, " DBG_88E("recv tdls frame, "
"but tdls haven't enabled\n"); "but tdls haven't enabled\n");
ret = _FAIL; ret = _FAIL;
return ret; return ret;
@ -1002,35 +1002,35 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
switch (*paction){ switch (*paction){
case TDLS_SETUP_REQUEST: case TDLS_SETUP_REQUEST:
DBG_871X("recv tdls setup request frame\n"); DBG_88E("recv tdls setup request frame\n");
ret=On_TDLS_Setup_Req(adapter, precv_frame); ret=On_TDLS_Setup_Req(adapter, precv_frame);
break; break;
case TDLS_SETUP_RESPONSE: case TDLS_SETUP_RESPONSE:
DBG_871X("recv tdls setup response frame\n"); DBG_88E("recv tdls setup response frame\n");
ret=On_TDLS_Setup_Rsp(adapter, precv_frame); ret=On_TDLS_Setup_Rsp(adapter, precv_frame);
break; break;
case TDLS_SETUP_CONFIRM: case TDLS_SETUP_CONFIRM:
DBG_871X("recv tdls setup confirm frame\n"); DBG_88E("recv tdls setup confirm frame\n");
ret=On_TDLS_Setup_Cfm(adapter, precv_frame); ret=On_TDLS_Setup_Cfm(adapter, precv_frame);
break; break;
case TDLS_TEARDOWN: case TDLS_TEARDOWN:
DBG_871X("recv tdls teardown, free sta_info\n"); DBG_88E("recv tdls teardown, free sta_info\n");
ret=On_TDLS_Teardown(adapter, precv_frame); ret=On_TDLS_Teardown(adapter, precv_frame);
break; break;
case TDLS_DISCOVERY_REQUEST: case TDLS_DISCOVERY_REQUEST:
DBG_871X("recv tdls discovery request frame\n"); DBG_88E("recv tdls discovery request frame\n");
ret=On_TDLS_Dis_Req(adapter, precv_frame); ret=On_TDLS_Dis_Req(adapter, precv_frame);
break; break;
case TDLS_PEER_TRAFFIC_RESPONSE: case TDLS_PEER_TRAFFIC_RESPONSE:
DBG_871X("recv tdls peer traffic response frame\n"); DBG_88E("recv tdls peer traffic response frame\n");
ret=On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame); ret=On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame);
break; break;
case TDLS_CHANNEL_SWITCH_REQUEST: case TDLS_CHANNEL_SWITCH_REQUEST:
DBG_871X("recv tdls channel switch request frame\n"); DBG_88E("recv tdls channel switch request frame\n");
ret=On_TDLS_Ch_Switch_Req(adapter, precv_frame); ret=On_TDLS_Ch_Switch_Req(adapter, precv_frame);
break; break;
case TDLS_CHANNEL_SWITCH_RESPONSE: case TDLS_CHANNEL_SWITCH_RESPONSE:
DBG_871X("recv tdls channel switch response frame\n"); DBG_88E("recv tdls channel switch response frame\n");
ret=On_TDLS_Ch_Switch_Rsp(adapter, precv_frame); ret=On_TDLS_Ch_Switch_Rsp(adapter, precv_frame);
break; break;
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
@ -1041,20 +1041,20 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
{ {
//WFDTDLS: for sigma test, do not setup direct link automatically //WFDTDLS: for sigma test, do not setup direct link automatically
ptdlsinfo->dev_discovered = 1; ptdlsinfo->dev_discovered = 1;
DBG_871X("recv tunneled probe request frame\n"); DBG_88E("recv tunneled probe request frame\n");
issue_tunneled_probe_rsp(adapter, precv_frame); issue_tunneled_probe_rsp(adapter, precv_frame);
} }
if ( *(paction + 3) == 0x05) //Probe response frame if ( *(paction + 3) == 0x05) //Probe response frame
{ {
//WFDTDLS: for sigma test, do not setup direct link automatically //WFDTDLS: for sigma test, do not setup direct link automatically
ptdlsinfo->dev_discovered = 1; ptdlsinfo->dev_discovered = 1;
DBG_871X("recv tunneled probe response frame\n"); DBG_88E("recv tunneled probe response frame\n");
} }
} }
break; break;
#endif //CONFIG_WFD #endif //CONFIG_WFD
default: default:
DBG_871X("receive TDLS frame but not supported\n"); DBG_88E("receive TDLS frame but not supported\n");
ret=_FAIL; ret=_FAIL;
break; break;
} }
@ -1175,7 +1175,7 @@ _func_enter_;
{ {
if (GetFrameSubType(ptr)&(BIT(4)|BIT(5)|BIT(6))) if (GetFrameSubType(ptr)&(BIT(4)|BIT(5)|BIT(6)))
{ {
DBG_871X("drop QoS-Sybtype Data\n"); DBG_88E("drop QoS-Sybtype Data\n");
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
} }
@ -1209,7 +1209,7 @@ _func_enter_;
//NULL-frame with pwrbit=1, buffer_STA should buffer frames for sleep_STA //NULL-frame with pwrbit=1, buffer_STA should buffer frames for sleep_STA
if (GetPwrMgt(ptr)) if (GetPwrMgt(ptr))
{ {
DBG_871X("TDLS: recv peer null frame with pwr bit 1\n"); DBG_88E("TDLS: recv peer null frame with pwr bit 1\n");
ptdls_sta->tdls_sta_state|=TDLS_PEER_SLEEP_STATE; ptdls_sta->tdls_sta_state|=TDLS_PEER_SLEEP_STATE;
// it would be triggered when we are off channel and receiving NULL DATA // it would be triggered when we are off channel and receiving NULL DATA
// we can confirm that peer STA is at off channel // we can confirm that peer STA is at off channel
@ -1351,7 +1351,7 @@ _func_enter_;
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ 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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n", DBG_88E("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
__func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr)); __func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
#endif #endif
ret= _FAIL; ret= _FAIL;
@ -1364,7 +1364,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_, RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,
(" ap2sta_data_frame: compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst))); (" ap2sta_data_frame: compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst)));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst)); DBG_88E("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst));
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -1380,14 +1380,14 @@ _func_enter_;
(" ap2sta_data_frame: compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid))); (" ap2sta_data_frame: compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid)));
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid))); RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid)));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n", DBG_88E("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n",
__func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid)); __func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid));
DBG_871X( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type ); DBG_88E( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type );
#endif #endif
if (!bmcast) if (!bmcast)
{ {
DBG_871X("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); DBG_88E("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
} }
@ -1403,7 +1403,7 @@ _func_enter_;
if (*psta == NULL) { if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__);
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -1437,7 +1437,7 @@ _func_enter_;
if (*psta == NULL) { if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -1458,7 +1458,7 @@ _func_enter_;
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info
if (*psta == NULL) if (*psta == NULL)
{ {
DBG_871X("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); DBG_88E("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
} }
@ -1466,7 +1466,7 @@ _func_enter_;
ret = _FAIL; ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv)); DBG_88E("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
#endif #endif
} }
@ -1509,7 +1509,7 @@ _func_enter_;
if (*psta == NULL) if (*psta == NULL)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n"));
DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
@ -1536,7 +1536,7 @@ _func_enter_;
ret = RTW_RX_HANDLED; ret = RTW_RX_HANDLED;
goto exit; goto exit;
} }
DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
ret = RTW_RX_HANDLED; ret = RTW_RX_HANDLED;
goto exit; goto exit;
@ -1559,7 +1559,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
//uint len = precv_frame->u.hdr.len; //uint len = precv_frame->u.hdr.len;
//DBG_871X("+validate_recv_ctrl_frame\n"); //DBG_88E("+validate_recv_ctrl_frame\n");
if (GetFrameType(pframe) != WIFI_CTRL_TYPE) if (GetFrameType(pframe) != WIFI_CTRL_TYPE)
{ {
@ -1616,7 +1616,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
if (psta->state & WIFI_STA_ALIVE_CHK_STATE) if (psta->state & WIFI_STA_ALIVE_CHK_STATE)
{ {
DBG_871X("%s alive check-rx ps-poll\n", __func__); DBG_88E("%s alive check-rx ps-poll\n", __func__);
psta->expire_to = pstapriv->expire_to; psta->expire_to = pstapriv->expire_to;
psta->state ^= WIFI_STA_ALIVE_CHK_STATE; psta->state ^= WIFI_STA_ALIVE_CHK_STATE;
} }
@ -1649,7 +1649,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
pxmitframe->attrib.triggered = 1; pxmitframe->attrib.triggered = 1;
//DBG_871X("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); //DBG_88E("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
_exit_critical_bh(&psta->sleep_q.lock, &irqL); _exit_critical_bh(&psta->sleep_q.lock, &irqL);
if (rtw_hal_xmit(padapter, pxmitframe) == _TRUE) if (rtw_hal_xmit(padapter, pxmitframe) == _TRUE)
@ -1662,7 +1662,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
{ {
pstapriv->tim_bitmap &= ~BIT(psta->aid); pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap); //DBG_88E("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE //upate BCN for TIM IE
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
@ -1672,19 +1672,19 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
} }
else else
{ {
//DBG_871X("no buffered packets to xmit\n"); //DBG_88E("no buffered packets to xmit\n");
if (pstapriv->tim_bitmap&BIT(psta->aid)) if (pstapriv->tim_bitmap&BIT(psta->aid))
{ {
if (psta->sleepq_len==0) if (psta->sleepq_len==0)
{ {
DBG_871X("no buffered packets to xmit\n"); DBG_88E("no buffered packets to xmit\n");
//issue nulldata with More data bit = 0 to indicate we have no buffered packets //issue nulldata with More data bit = 0 to indicate we have no buffered packets
issue_nulldata(padapter, psta->hwaddr, 0, 0, 0); issue_nulldata(padapter, psta->hwaddr, 0, 0, 0);
} }
else else
{ {
DBG_871X("error!psta->sleepq_len=%d\n", psta->sleepq_len); DBG_88E("error!psta->sleepq_len=%d\n", psta->sleepq_len);
psta->sleepq_len=0; psta->sleepq_len=0;
} }
@ -1824,7 +1824,7 @@ _func_enter_;
if (pbssid == NULL){ if (pbssid == NULL){
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s pbssid == NULL\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s pbssid == NULL\n", __func__);
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -1870,7 +1870,7 @@ _func_enter_;
if (ret ==_FAIL){ if (ret ==_FAIL){
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret); DBG_88E("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret);
#endif #endif
goto exit; goto exit;
} else if (ret == RTW_RX_HANDLED) { } else if (ret == RTW_RX_HANDLED) {
@ -1881,7 +1881,7 @@ _func_enter_;
if (psta==NULL){ 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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__);
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -1926,7 +1926,7 @@ _func_enter_;
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decache : drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decache : drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n", __func__);
#endif #endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
@ -2013,15 +2013,15 @@ _func_enter_;
#ifdef RTK_DMP_PLATFORM #ifdef RTK_DMP_PLATFORM
if ( 0 ) if ( 0 )
{ {
DBG_871X("++\n"); DBG_88E("++\n");
{ {
int i; int i;
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i), DBG_88E("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7)); *(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_88E("--\n");
} }
#endif //RTK_DMP_PLATFORM #endif //RTK_DMP_PLATFORM
@ -2055,33 +2055,33 @@ _func_enter_;
rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt)); rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
if (bDumpRxPkt ==1){//dump all rx packets if (bDumpRxPkt ==1){//dump all rx packets
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_88E("%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)); *(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_88E("#############################\n");
} }
else if (bDumpRxPkt ==2){ else if (bDumpRxPkt ==2){
if (type== WIFI_MGT_TYPE){ if (type== WIFI_MGT_TYPE){
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_88E("%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)); *(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_88E("#############################\n");
} }
} }
else if (bDumpRxPkt ==3){ else if (bDumpRxPkt ==3){
if (type== WIFI_DATA_TYPE){ if (type== WIFI_DATA_TYPE){
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i=0; i<64;i=i+8) for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i), DBG_88E("%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)); *(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_88E("#############################\n");
} }
} }
} }
@ -2150,7 +2150,7 @@ _func_enter_;
default: default:
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! type=0x%x\n", type)); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! type=0x%x\n", type));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type); DBG_88E("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type);
#endif #endif
retval = _FAIL; retval = _FAIL;
break; break;
@ -2700,7 +2700,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
nSubframe_Length = RTW_GET_BE16(pdata + 12); nSubframe_Length = RTW_GET_BE16(pdata + 12);
if ( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) { if ( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) {
DBG_871X("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length); DBG_88E("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length);
goto exit; goto exit;
} }
@ -2730,7 +2730,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
} }
else else
{ {
DBG_871X("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes); DBG_88E("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes);
break; break;
} }
} }
@ -2755,7 +2755,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
#endif //PLATFORM_FREEBSD #endif //PLATFORM_FREEBSD
if (nr_subframes >= MAX_SUBFRAME_COUNT) { if (nr_subframes >= MAX_SUBFRAME_COUNT) {
DBG_871X("ParseSubframe(): Too many Subframes! Packets dropped!\n"); DBG_88E("ParseSubframe(): Too many Subframes! Packets dropped!\n");
break; break;
} }
@ -3138,7 +3138,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
{ {
preorder_ctrl->indicate_seq = seq_num; preorder_ctrl->indicate_seq = seq_num;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
@ -3154,7 +3154,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
//DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); //DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __func__, DBG_88E("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
@ -3171,7 +3171,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
{ {
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
} }
@ -3187,7 +3187,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1; preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
} }
@ -3290,7 +3290,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
pattrib = &prframe->u.hdr.attrib; pattrib = &prframe->u.hdr.attrib;
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
} }
@ -3315,7 +3315,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
{ {
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
} }
@ -3371,7 +3371,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
// Set new pending timer. // Set new pending timer.
//pTS->RxIndicateState = RXTS_INDICATE_REORDER; //pTS->RxIndicateState = RXTS_INDICATE_REORDER;
//PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime); //PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime);
//DBG_871X("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n"); //DBG_88E("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n");
_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME); _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
} }
else else
@ -3414,7 +3414,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
} }
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__);
#endif #endif
return _FAIL; return _FAIL;
@ -3426,7 +3426,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
//indicate this recv_frame //indicate this recv_frame
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3434,7 +3434,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3454,7 +3454,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
{ {
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3462,13 +3462,13 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
if (retval != _SUCCESS){ if (retval != _SUCCESS){
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif #endif
} }
@ -3496,7 +3496,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
//return _FAIL; //return _FAIL;
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__);
#endif #endif
rtw_recv_indicatepkt(padapter, prframe); rtw_recv_indicatepkt(padapter, prframe);
@ -3514,7 +3514,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
//_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql);
//return _FAIL; //return _FAIL;
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__);
#endif #endif
goto _err_exit; goto _err_exit;
} }
@ -3568,7 +3568,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
return; return;
} }
//DBG_871X("+rtw_reordering_ctrl_timeout_handler()=>\n"); //DBG_88E("+rtw_reordering_ctrl_timeout_handler()=>\n");
_enter_critical_bh(&ppending_recvframe_queue->lock, &irql); _enter_critical_bh(&ppending_recvframe_queue->lock, &irql);
@ -3610,7 +3610,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
if (recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)// including perform A-MPDU Rx Ordering Buffer Control if (recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)// including perform A-MPDU Rx Ordering Buffer Control
{ {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__);
#endif #endif
if ((padapter->bDriverStopped == _FALSE) && if ((padapter->bDriverStopped == _FALSE) &&
@ -3629,7 +3629,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
{ {
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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
#endif #endif
return retval; return retval;
} }
@ -3723,7 +3723,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
if (prframe == NULL) { if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto _recv_data_drop; goto _recv_data_drop;
@ -3746,7 +3746,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
if (prframe==NULL) { if (prframe==NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__);
#endif #endif
goto _recv_data_drop; goto _recv_data_drop;
} }
@ -3755,7 +3755,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
if (prframe == NULL) { 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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto _recv_data_drop; goto _recv_data_drop;
@ -3779,7 +3779,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
{ {
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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame
goto _recv_data_drop; goto _recv_data_drop;
@ -3792,7 +3792,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
{ {
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 #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame
goto _recv_data_drop; goto _recv_data_drop;
@ -3806,7 +3806,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
if (ret != _SUCCESS) if (ret != _SUCCESS)
{ {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
#endif #endif
goto _recv_data_drop; goto _recv_data_drop;
} }
@ -3816,7 +3816,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: rtw_free_recvframe\n" )); RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: rtw_free_recvframe\n" ));
RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __func__, DBG_88E("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __func__,
padapter->bDriverStopped, padapter->bSurpriseRemoved); padapter->bDriverStopped, padapter->bSurpriseRemoved);
#endif #endif
ret = _FAIL; ret = _FAIL;
@ -3831,7 +3831,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
if (ret != _SUCCESS) if (ret != _SUCCESS)
{ {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue); rtw_free_recvframe(orig_prframe, pfree_recv_queue);
goto _recv_data_drop; goto _recv_data_drop;
@ -3840,7 +3840,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
else else
{ {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__); DBG_88E("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__);
#endif #endif
goto _recv_data_drop; goto _recv_data_drop;
} }
@ -3872,7 +3872,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
while ((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) { while ((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) {
if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS) if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS)
DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__); DBG_88E("%s: dequeue uc_swdec_pending_queue\n", __func__);
} }
} }
@ -3887,7 +3887,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
!is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) && !is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) &&
!psecuritypriv->busetkipkey) { !psecuritypriv->busetkipkey) {
rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue); rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__); DBG_88E("%s: no key, enqueue uc_swdec_pending_queue\n", __func__);
goto exit; goto exit;
} }
@ -3996,7 +3996,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
recvpriv->signal_qual = tmp_q; recvpriv->signal_qual = tmp_q;
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
", num_signal_strength:%u, num_signal_qual:%u" ", num_signal_strength:%u, num_signal_qual:%u"
"\n" "\n"
, __func__ , __func__

18
core/rtw_security.c
View file

@ -795,10 +795,10 @@ _func_enter_;
if (psecuritypriv->binstallGrpkey==_FALSE) if (psecuritypriv->binstallGrpkey==_FALSE)
{ {
res=_FAIL; res=_FAIL;
DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__); DBG_88E("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
goto exit; goto exit;
} }
//DBG_871X("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n"); //DBG_88E("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n");
//prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
prwskeylen=16; prwskeylen=16;
@ -1576,7 +1576,7 @@ _func_enter_;
ptdls_sta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->dst[0] ); ptdls_sta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->dst[0] );
if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) ) if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) )
{ {
DBG_871X("[%s] for tdls link\n", __func__); DBG_88E("[%s] for tdls link\n", __func__);
prwskey=&ptdls_sta->tpk.tk[0]; prwskey=&ptdls_sta->tpk.tk[0];
} }
} }
@ -1874,7 +1874,7 @@ _func_enter_;
{ {
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])); 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_88E("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]); i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]);
res = _FAIL; res = _FAIL;
} }
@ -1913,18 +1913,18 @@ _func_enter_;
if (IS_MCAST(prxattrib->ra)) if (IS_MCAST(prxattrib->ra))
{ {
//in concurrent we should use sw descrypt in group key, so we remove this message //in concurrent we should use sw descrypt in group key, so we remove this message
//DBG_871X("rx bc/mc packets, to perform sw rtw_aes_decrypt\n"); //DBG_88E("rx bc/mc packets, to perform sw rtw_aes_decrypt\n");
//prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey; //prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
if (psecuritypriv->binstallGrpkey==_FALSE) if (psecuritypriv->binstallGrpkey==_FALSE)
{ {
res=_FAIL; res=_FAIL;
DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__); DBG_88E("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
goto exit; goto exit;
} }
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index)
{ {
DBG_871X("not match packet_index=%d, install_index=%d\n" DBG_88E("not match packet_index=%d, install_index=%d\n"
, prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid); , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid);
res=_FAIL; res=_FAIL;
goto exit; goto exit;
@ -2737,7 +2737,7 @@ int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq,
2 + timeoutie[1] + 2 + ftie[1]; 2 + timeoutie[1] + 2 + ftie[1];
buf = rtw_zmalloc(len); buf = rtw_zmalloc(len);
if (!buf) { if (!buf) {
DBG_871X("TDLS: No memory for MIC calculation\n"); DBG_88E("TDLS: No memory for MIC calculation\n");
return -1; return -1;
} }
@ -2829,7 +2829,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
} }
//Invalid MIC //Invalid MIC
DBG_871X( "[%s] Invalid MIC\n", __func__); DBG_88E( "[%s] Invalid MIC\n", __func__);
return 0; return 0;
} }

6
core/rtw_sreset.c
View file

@ -60,16 +60,16 @@ u8 sreset_get_wifi_status(_adapter *padapter)
psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST; psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST;
} }
else if (val32!=0){ else if (val32!=0){
DBG_8192C("txdmastatu(%x)\n",val32); DBG_88E("txdmastatu(%x)\n",val32);
psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR; psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR;
} }
if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status) if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status)
{ {
DBG_8192C("==>%s error_status(0x%x)\n",__func__,psrtpriv->Wifi_Error_Status); DBG_88E("==>%s error_status(0x%x)\n",__func__,psrtpriv->Wifi_Error_Status);
status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL))); status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL)));
} }
DBG_8192C("==> %s wifi_status(0x%x)\n",__func__,status); DBG_88E("==> %s wifi_status(0x%x)\n",__func__,status);
//status restore //status restore
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;

6
core/rtw_sta_mgt.c
View file

@ -168,7 +168,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)
int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info); int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info);
if (!stainfo_offset_valid(offset)) if (!stainfo_offset_valid(offset))
DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset); DBG_88E("%s invalid offset(%d), out of range!!!", __func__, offset);
return offset; return offset;
} }
@ -176,7 +176,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)
inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset) inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset)
{ {
if (!stainfo_offset_valid(offset)) if (!stainfo_offset_valid(offset))
DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset); DBG_88E("%s invalid offset(%d), out of range!!!", __func__, offset);
return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info)); return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info));
} }
@ -413,7 +413,7 @@ _func_enter_;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b= 0xffff; preorder_ctrl->wend_b= 0xffff;

58
core/rtw_tdls.c
View file

@ -271,7 +271,7 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta)
ptdlsinfo->setup_state=TDLS_STATE_NONE; ptdlsinfo->setup_state=TDLS_STATE_NONE;
} }
else else
DBG_871X("Remain tdls sta:%02x\n", ptdlsinfo->sta_cnt); DBG_88E("Remain tdls sta:%02x\n", ptdlsinfo->sta_cnt);
rtw_free_stainfo(padapter, ptdls_sta); rtw_free_stainfo(padapter, ptdls_sta);
@ -427,12 +427,12 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
int i; int i;
DBG_871X( "[%s] WFD IE Found!!\n", __func__ ); DBG_88E( "[%s] WFD IE Found!!\n", __func__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport ); DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport );
} }
_rtw_memset( attr_content, 0x00, 10); _rtw_memset( attr_content, 0x00, 10);
@ -441,7 +441,7 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
if ( attr_contentlen ) if ( attr_contentlen )
{ {
_rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4); _rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);
DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __func__, DBG_88E( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __func__,
ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1], ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],
ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3] ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]
); );
@ -458,7 +458,7 @@ void issue_tunneled_probe_req(_adapter *padapter)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
DBG_871X("[%s]\n", __func__); DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
@ -501,7 +501,7 @@ void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib;
DBG_871X("[%s]\n", __func__); DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{ {
@ -631,7 +631,7 @@ void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr)
ptdls_sta = rtw_get_stainfo(pstapriv, mac_addr); ptdls_sta = rtw_get_stainfo(pstapriv, mac_addr);
if (ptdls_sta==NULL){ if (ptdls_sta==NULL){
DBG_871X("issue tdls teardown unsuccessful\n"); DBG_88E("issue tdls teardown unsuccessful\n");
return; return;
}else{ }else{
ptdls_sta->tdls_sta_state=TDLS_STATE_NONE; ptdls_sta->tdls_sta_state=TDLS_STATE_NONE;
@ -721,7 +721,7 @@ void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr)
goto exit; goto exit;
} }
rtw_dump_xframe(padapter, pmgntframe); rtw_dump_xframe(padapter, pmgntframe);
DBG_871X("issue tdls dis req\n"); DBG_88E("issue tdls dis req\n");
exit: exit:
@ -1076,7 +1076,7 @@ sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame)
if ( pattrib->RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB); if ( pattrib->RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB);
{ {
DBG_871X("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB); DBG_88E("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB);
issue_tdls_setup_req(adapter, psa); issue_tdls_setup_req(adapter, psa);
} }
} }
@ -1133,17 +1133,17 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){ if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){
//If the direct link is already set up //If the direct link is already set up
//Process as re-setup after tear down //Process as re-setup after tear down
DBG_871X("re-setup a direct link\n"); DBG_88E("re-setup a direct link\n");
} }
//already receiving TDLS setup request //already receiving TDLS setup request
else if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ else if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){
DBG_871X("receive duplicated TDLS setup request frame in handshaking\n"); DBG_88E("receive duplicated TDLS setup request frame in handshaking\n");
goto exit; goto exit;
} }
//When receiving and sending setup_req to the same link at the same time, STA with higher MAC_addr would be initiator //When receiving and sending setup_req to the same link at the same time, STA with higher MAC_addr would be initiator
//following is to check out MAC_addr //following is to check out MAC_addr
else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){
DBG_871X("receive setup_req after sending setup_req\n"); DBG_88E("receive setup_req after sending setup_req\n");
for (i=0;i<6;i++){ for (i=0;i<6;i++){
if (*(pmyid+i)==*(psa+i)){ if (*(pmyid+i)==*(psa+i)){
} }
@ -1345,7 +1345,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
if (stat_code!=0) if (stat_code!=0)
{ {
DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __func__, stat_code ); DBG_88E( "[%s] status_code = %d, free_tdls_sta\n", __func__, stat_code );
free_tdls_sta(adapter, ptdls_sta); free_tdls_sta(adapter, ptdls_sta);
return _FAIL; return _FAIL;
} }
@ -1448,7 +1448,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
} }
} }
DBG_871X("issue_tdls_setup_cfm\n"); DBG_88E("issue_tdls_setup_cfm\n");
issue_tdls_setup_cfm(adapter, precv_frame); issue_tdls_setup_cfm(adapter, precv_frame);
if (ptdls_sta->stat_code==0) if (ptdls_sta->stat_code==0)
@ -1510,7 +1510,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
_rtw_memcpy(&stat_code, ptr+2, 2); _rtw_memcpy(&stat_code, ptr+2, 2);
if (stat_code!=0){ if (stat_code!=0){
DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __func__, stat_code ); DBG_88E( "[%s] stat_code = %d\n, free_tdls_sta", __func__, stat_code );
free_tdls_sta(adapter, ptdls_sta); free_tdls_sta(adapter, ptdls_sta);
return _FAIL; return _FAIL;
} }
@ -1740,7 +1740,7 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame)
if (ptdls_sta->sleepq_len==0) if (ptdls_sta->sleepq_len==0)
{ {
DBG_871X("no buffered packets for tdls to xmit\n"); DBG_88E("no buffered packets for tdls to xmit\n");
//on U-APSD + CH. switch state, when there is no buffered date to xmit, //on U-APSD + CH. switch state, when there is no buffered date to xmit,
// we should go back to base channel // we should go back to base channel
if (state==2){ if (state==2){
@ -1749,13 +1749,13 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame)
ptdls_sta->tdls_sta_state &= ~(TDLS_SW_OFF_STATE); ptdls_sta->tdls_sta_state &= ~(TDLS_SW_OFF_STATE);
ptdlsinfo->candidate_ch= pmlmeext->cur_channel; ptdlsinfo->candidate_ch= pmlmeext->cur_channel;
issue_tdls_ch_switch_req(adapter, pattrib->src); issue_tdls_ch_switch_req(adapter, pattrib->src);
DBG_871X("issue tdls ch switch req back to base channel\n"); DBG_88E("issue tdls ch switch req back to base channel\n");
} }
} }
else else
{ {
DBG_871X("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len); DBG_88E("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len);
ptdls_sta->sleepq_len=0; ptdls_sta->sleepq_len=0;
} }
@ -1828,10 +1828,10 @@ sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
issue_tdls_ch_switch_rsp(adapter, psa); issue_tdls_ch_switch_rsp(adapter, psa);
DBG_871X("issue tdls channel switch response\n"); DBG_88E("issue tdls channel switch response\n");
if ((ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE) && ptdls_sta->off_ch==pmlmeext->cur_channel){ if ((ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE) && ptdls_sta->off_ch==pmlmeext->cur_channel){
DBG_871X("back to base channel %x\n", pmlmeext->cur_channel); DBG_88E("back to base channel %x\n", pmlmeext->cur_channel);
ptdls_sta->option=7; ptdls_sta->option=7;
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_BASE_CH); rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_BASE_CH);
}else{ }else{
@ -1861,11 +1861,11 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
//it will go back to base channel and terminate this channel switch procedure //it will go back to base channel and terminate this channel switch procedure
if (ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE ){ if (ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE ){
if (pmlmeext->cur_channel==ptdls_sta->off_ch){ if (pmlmeext->cur_channel==ptdls_sta->off_ch){
DBG_871X("back to base channel %x\n", pmlmeext->cur_channel); DBG_88E("back to base channel %x\n", pmlmeext->cur_channel);
ptdls_sta->option=7; ptdls_sta->option=7;
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH); rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH);
}else{ }else{
DBG_871X("receive unsolicited channel switch response\n"); DBG_88E("receive unsolicited channel switch response\n");
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF); rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF);
} }
return _FAIL; return _FAIL;
@ -2165,7 +2165,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
if (ptdls_sta == NULL ) if (ptdls_sta == NULL )
{ {
DBG_871X("[%s] %d\n", __func__, __LINE__); DBG_88E("[%s] %d\n", __func__, __LINE__);
return; return;
} }
@ -2185,7 +2185,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
if (ptdls_sta->stat_code!=0) //invalid setup request if (ptdls_sta->stat_code!=0) //invalid setup request
{ {
DBG_871X("ptdls_sta->stat_code:%04x\n", ptdls_sta->stat_code); DBG_88E("ptdls_sta->stat_code:%04x\n", ptdls_sta->stat_code);
return; return;
} }
@ -2770,7 +2770,7 @@ void _tdls_handshake_timer_hdl(void *FunctionContext)
{ {
if ( !(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) ) if ( !(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) )
{ {
DBG_871X("tdls handshake time out\n"); DBG_88E("tdls handshake time out\n");
free_tdls_sta(ptdls_sta->padapter, ptdls_sta); free_tdls_sta(ptdls_sta->padapter, ptdls_sta);
} }
} }
@ -2796,7 +2796,7 @@ void _tdls_alive_timer_phase1_hdl(void *FunctionContext)
ptdls_sta->tdls_sta_state &= (~TDLS_ALIVE_STATE); ptdls_sta->tdls_sta_state &= (~TDLS_ALIVE_STATE);
DBG_871X("issue_tdls_dis_req to check alive\n"); DBG_88E("issue_tdls_dis_req to check alive\n");
issue_tdls_dis_req( padapter, ptdls_sta->hwaddr); issue_tdls_dis_req( padapter, ptdls_sta->hwaddr);
rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH1); rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH1);
sta_update_last_rx_pkts(ptdls_sta); sta_update_last_rx_pkts(ptdls_sta);
@ -2826,7 +2826,7 @@ void _tdls_alive_timer_phase2_hdl(void *FunctionContext)
if ( (ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) && if ( (ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) &&
(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)) ) (sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)) )
{ {
DBG_871X("TDLS STA ALIVE, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n", DBG_88E("TDLS STA ALIVE, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta)); sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta));
ptdls_sta->alive_count = 0; ptdls_sta->alive_count = 0;
@ -2835,9 +2835,9 @@ void _tdls_alive_timer_phase2_hdl(void *FunctionContext)
else else
{ {
if ( !(ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) ) if ( !(ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) )
DBG_871X("TDLS STA TOO FAR\n"); DBG_88E("TDLS STA TOO FAR\n");
if ( !(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta))) if ( !(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)))
DBG_871X("TDLS LINK WITH LOW TRAFFIC, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n", DBG_88E("TDLS LINK WITH LOW TRAFFIC, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta)); sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta));
ptdls_sta->alive_count++; ptdls_sta->alive_count++;

76
core/rtw_wlan_util.c
View file

@ -551,7 +551,7 @@ void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char
if ( padapter->bNotifyChannelChange ) if ( padapter->bNotifyChannelChange )
{ {
DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __func__, channel, channel_offset, bwmode ); DBG_88E( "[%s] ch = %d, offset = %d, bwmode = %d\n", __func__, channel, channel_offset, bwmode );
} }
if ((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE)) if ((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE))
@ -756,7 +756,7 @@ void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
//cmd = CAM_POLLINIG | CAM_WRITE | (addr + j); //cmd = CAM_POLLINIG | CAM_WRITE | (addr + j);
//rtw_write32(padapter, RWCAM, cmd); //rtw_write32(padapter, RWCAM, cmd);
//DBG_871X("%s=> cam write: %x, %x\n",__func__, cmd, val); //DBG_88E("%s=> cam write: %x, %x\n",__func__, cmd, val);
} }
@ -858,18 +858,18 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
u8 attr_content[ 10 ] = { 0x00 }; u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
DBG_871X( "[%s] Found WFD IE\n", __func__ ); DBG_88E( "[%s] Found WFD IE\n", __func__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
return( _TRUE ); return( _TRUE );
} }
} }
else else
{ {
DBG_871X( "[%s] NO WFD IE\n", __func__ ); DBG_88E( "[%s] NO WFD IE\n", __func__ );
} }
return( _FAIL ); return( _FAIL );
@ -981,7 +981,7 @@ void WMMOnAssocRsp(_adapter *padapter)
break; break;
} }
DBG_871X("WMM(%x): %x, %x\n", ACI, ACM, acParm); DBG_88E("WMM(%x): %x, %x\n", ACI, ACM, acParm);
} }
if (padapter->registrypriv.acm_method == 1) if (padapter->registrypriv.acm_method == 1)
@ -1030,7 +1030,7 @@ void WMMOnAssocRsp(_adapter *padapter)
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
pxmitpriv->wmm_para_seq[i] = inx[i]; pxmitpriv->wmm_para_seq[i] = inx[i];
DBG_871X("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]); DBG_88E("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
} }
return; return;
@ -1252,7 +1252,7 @@ void HTOnAssocRsp(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
{ {
@ -1387,12 +1387,12 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr); len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr);
if (len > MAX_IE_SZ) { if (len > MAX_IE_SZ) {
DBG_871X("%s IE too long for survey event\n", __func__); DBG_88E("%s IE too long for survey event\n", __func__);
return _FAIL; return _FAIL;
} }
if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == _FALSE) { if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == _FALSE) {
DBG_871X("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT, DBG_88E("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT,
MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress)); MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress));
return _TRUE; return _TRUE;
} }
@ -1429,11 +1429,11 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
} }
if (ht_cap_info != cur_network->BcnInfo.ht_cap_info || if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||
((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) { ((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) {
DBG_871X("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__, DBG_88E("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
ht_cap_info, ht_info_infos_0); ht_cap_info, ht_info_infos_0);
DBG_871X("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__, DBG_88E("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
cur_network->BcnInfo.ht_cap_info, cur_network->BcnInfo.ht_info_infos_0); cur_network->BcnInfo.ht_cap_info, cur_network->BcnInfo.ht_info_infos_0);
DBG_871X("%s bw mode change, disconnect\n", __func__); DBG_88E("%s bw mode change, disconnect\n", __func__);
{ {
//bcn_info_update //bcn_info_update
cur_network->BcnInfo.ht_cap_info = ht_cap_info; cur_network->BcnInfo.ht_cap_info = ht_cap_info;
@ -1452,19 +1452,19 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
if (pht_info) { if (pht_info) {
bcn_channel = pht_info->primary_channel; bcn_channel = pht_info->primary_channel;
} else { /* we don't find channel IE, so don't check it */ } 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_88E("Oops: %s we don't find channel IE, so don't check it\n", __func__);
bcn_channel = Adapter->mlmeextpriv.cur_channel; bcn_channel = Adapter->mlmeextpriv.cur_channel;
} }
} }
if (bcn_channel != Adapter->mlmeextpriv.cur_channel) { if (bcn_channel != Adapter->mlmeextpriv.cur_channel) {
DBG_871X("%s beacon channel:%d cur channel:%d disconnect\n", __func__, DBG_88E("%s beacon channel:%d cur channel:%d disconnect\n", __func__,
bcn_channel, Adapter->mlmeextpriv.cur_channel); bcn_channel, Adapter->mlmeextpriv.cur_channel);
goto _mismatch; goto _mismatch;
} }
/* checking SSID */ /* checking SSID */
if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) { if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) {
DBG_871X("%s marc: cannot find SSID for survey event\n", __func__); DBG_88E("%s marc: cannot find SSID for survey event\n", __func__);
hidden_ssid = _TRUE; hidden_ssid = _TRUE;
} else { } else {
hidden_ssid = _FALSE; hidden_ssid = _FALSE;
@ -1486,7 +1486,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == _FALSE || if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == _FALSE ||
bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) { bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {
if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */ if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */
DBG_871X("%s(), SSID is not match return FAIL\n", __func__); DBG_88E("%s(), SSID is not match return FAIL\n", __func__);
goto _mismatch; goto _mismatch;
} }
} }
@ -1503,7 +1503,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
("%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n", ("%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n",
__func__, cur_network->network.Privacy,bssid->Privacy)); __func__, cur_network->network.Privacy,bssid->Privacy));
if (cur_network->network.Privacy != bssid->Privacy) { if (cur_network->network.Privacy != bssid->Privacy) {
DBG_871X("%s(), privacy is not match return FAIL\n",__func__); DBG_88E("%s(), privacy is not match return FAIL\n",__func__);
goto _mismatch; goto _mismatch;
} }
@ -1519,7 +1519,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
} }
if (cur_network->BcnInfo.encryp_protocol != encryp_protocol) { if (cur_network->BcnInfo.encryp_protocol != encryp_protocol) {
DBG_871X("%s(): enctyp is not match ,return FAIL\n",__func__); DBG_88E("%s(): enctyp is not match ,return FAIL\n",__func__);
goto _mismatch; goto _mismatch;
} }
@ -1546,14 +1546,14 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_, RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
("%s cur_network->group_cipher is %d: %d\n",__func__, cur_network->BcnInfo.group_cipher, group_cipher)); ("%s cur_network->group_cipher is %d: %d\n",__func__, cur_network->BcnInfo.group_cipher, group_cipher));
if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher) { if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher) {
DBG_871X("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match ,return FAIL\n",__func__, DBG_88E("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match ,return FAIL\n",__func__,
pairwise_cipher, cur_network->BcnInfo.pairwise_cipher, pairwise_cipher, cur_network->BcnInfo.pairwise_cipher,
group_cipher, cur_network->BcnInfo.group_cipher); group_cipher, cur_network->BcnInfo.group_cipher);
goto _mismatch; goto _mismatch;
} }
if (is_8021x != cur_network->BcnInfo.is_8021x) { if (is_8021x != cur_network->BcnInfo.is_8021x) {
DBG_871X("%s authentication is not match ,return FAIL\n", __func__); DBG_88E("%s authentication is not match ,return FAIL\n", __func__);
goto _mismatch; goto _mismatch;
} }
} }
@ -2000,19 +2000,19 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
case _VENDOR_SPECIFIC_IE_: case _VENDOR_SPECIFIC_IE_:
if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3))) if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3)))
{ {
DBG_871X("link to Artheros AP\n"); DBG_88E("link to Artheros AP\n");
return HT_IOT_PEER_ATHEROS; return HT_IOT_PEER_ATHEROS;
} }
else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3)) else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3))
|| (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)) || (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3))
|| (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3))) || (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)))
{ {
DBG_871X("link to Broadcom AP\n"); DBG_88E("link to Broadcom AP\n");
return HT_IOT_PEER_BROADCOM; return HT_IOT_PEER_BROADCOM;
} }
else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3)) else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3))
{ {
DBG_871X("link to Marvell AP\n"); DBG_88E("link to Marvell AP\n");
return HT_IOT_PEER_MARVELL; return HT_IOT_PEER_MARVELL;
} }
else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3)) else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3))
@ -2020,33 +2020,33 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
if (!ralink_vendor_flag) { if (!ralink_vendor_flag) {
ralink_vendor_flag = 1; ralink_vendor_flag = 1;
} else { } else {
DBG_871X("link to Ralink AP\n"); DBG_88E("link to Ralink AP\n");
return HT_IOT_PEER_RALINK; return HT_IOT_PEER_RALINK;
} }
} }
else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3)) else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3))
{ {
DBG_871X("link to Cisco AP\n"); DBG_88E("link to Cisco AP\n");
return HT_IOT_PEER_CISCO; return HT_IOT_PEER_CISCO;
} }
else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3)) else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3))
{ {
DBG_871X("link to Realtek 96B\n"); DBG_88E("link to Realtek 96B\n");
return HT_IOT_PEER_REALTEK; return HT_IOT_PEER_REALTEK;
} }
else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI,3)) else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI,3))
{ {
DBG_871X("link to Airgo Cap\n"); DBG_88E("link to Airgo Cap\n");
return HT_IOT_PEER_AIRGO; return HT_IOT_PEER_AIRGO;
} }
else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3)) else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3))
{ {
epigram_vendor_flag = 1; epigram_vendor_flag = 1;
if (ralink_vendor_flag) { if (ralink_vendor_flag) {
DBG_871X("link to Tenda W311R AP\n"); DBG_88E("link to Tenda W311R AP\n");
return HT_IOT_PEER_TENDA; return HT_IOT_PEER_TENDA;
} else { } else {
DBG_871X("Capture EPIGRAM_OUI\n"); DBG_88E("Capture EPIGRAM_OUI\n");
} }
} }
else else
@ -2062,13 +2062,13 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
} }
if (ralink_vendor_flag && !epigram_vendor_flag) { if (ralink_vendor_flag && !epigram_vendor_flag) {
DBG_871X("link to Ralink AP\n"); DBG_88E("link to Ralink AP\n");
return HT_IOT_PEER_RALINK; return HT_IOT_PEER_RALINK;
} else if (ralink_vendor_flag && epigram_vendor_flag){ } else if (ralink_vendor_flag && epigram_vendor_flag){
DBG_871X("link to Tenda W311R AP\n"); DBG_88E("link to Tenda W311R AP\n");
return HT_IOT_PEER_TENDA; return HT_IOT_PEER_TENDA;
} else { } else {
DBG_871X("link to new AP\n"); DBG_88E("link to new AP\n");
return HT_IOT_PEER_UNKNOWN; return HT_IOT_PEER_UNKNOWN;
} }
} }
@ -2313,7 +2313,7 @@ void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr)
#ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ #ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
preorder_ctrl->indicate_seq = start_seq; preorder_ctrl->indicate_seq = start_seq;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__, DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, start_seq); preorder_ctrl->indicate_seq, start_seq);
#endif #endif
#else #else
@ -2360,13 +2360,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
if (init) { if (init) {
if (pbuddy_padapter == NULL) { if (pbuddy_padapter == NULL) {
pbuddy_padapter = adapter; pbuddy_padapter = adapter;
DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__func__); DBG_88E("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__func__);
} else { } else {
adapter->pbuddy_adapter = pbuddy_padapter; adapter->pbuddy_adapter = pbuddy_padapter;
pbuddy_padapter->pbuddy_adapter = adapter; pbuddy_padapter->pbuddy_adapter = adapter;
// clear global value // clear global value
pbuddy_padapter = NULL; pbuddy_padapter = NULL;
DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__func__); DBG_88E("%s(): pbuddy_padapter exist, Exchange Information\n",__func__);
} }
#ifdef CONFIG_DUALMAC_CONCURRENT #ifdef CONFIG_DUALMAC_CONCURRENT
if (dvobj->InterfaceNumber == 0) { if (dvobj->InterfaceNumber == 0) {
@ -2374,13 +2374,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
adapter->isprimary = _TRUE; adapter->isprimary = _TRUE;
adapter->adapter_type = PRIMARY_ADAPTER; adapter->adapter_type = PRIMARY_ADAPTER;
adapter->iface_type = IFACE_PORT0; adapter->iface_type = IFACE_PORT0;
DBG_871X("%s(): PRIMARY_ADAPTER\n",__func__); DBG_88E("%s(): PRIMARY_ADAPTER\n",__func__);
} else { } else {
//set adapter_type/iface type //set adapter_type/iface type
adapter->isprimary = _FALSE; adapter->isprimary = _FALSE;
adapter->adapter_type = SECONDARY_ADAPTER; adapter->adapter_type = SECONDARY_ADAPTER;
adapter->iface_type = IFACE_PORT1; adapter->iface_type = IFACE_PORT1;
DBG_871X("%s(): SECONDARY_ADAPTER\n",__func__); DBG_88E("%s(): SECONDARY_ADAPTER\n",__func__);
} }
#endif #endif
}else { }else {

80
core/rtw_xmit.c
View file

@ -573,7 +573,7 @@ u8 qos_acm(u8 acm_mask, u8 priority)
change_priority = 5; change_priority = 5;
break; break;
default: default:
DBG_871X("qos_acm(): invalid pattrib->priority: %d!!!\n", priority); DBG_88E("qos_acm(): invalid pattrib->priority: %d!!!\n", priority);
break; break;
} }
@ -677,7 +677,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
} }
} }
} else if (0x888e == pattrib->ether_type) { } else if (0x888e == pattrib->ether_type) {
DBG_871X_LEVEL(_drv_always_, "send eapol packet\n"); DBG_88E_LEVEL(_drv_info_, "send eapol packet\n");
} }
if ( (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) ) if ( (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
@ -707,7 +707,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
if (psta == NULL) { // if we cannot get psta => drrp the pkt if (psta == NULL) { // if we cannot get psta => drrp the pkt
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra))); RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra)));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
#endif #endif
res =_FAIL; res =_FAIL;
goto exit; goto exit;
@ -722,7 +722,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
if (psta) if (psta)
{ {
pattrib->mac_id = psta->mac_id; pattrib->mac_id = psta->mac_id;
//DBG_8192C("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id ); //DBG_88E("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id );
pattrib->psta = psta; pattrib->psta = psta;
} }
else else
@ -730,7 +730,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
// if we cannot get psta => drop the pkt // if we cannot get psta => drop the pkt
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra))); RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra)));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
#endif #endif
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -774,7 +774,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
{ {
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __func__,pattrib->ether_type); DBG_88E("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __func__,pattrib->ether_type);
#endif #endif
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -826,7 +826,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
{ {
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npadapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", padapter->securitypriv.busetkipkey)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npadapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", padapter->securitypriv.busetkipkey));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __func__, padapter->securitypriv.busetkipkey); DBG_88E("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __func__, padapter->securitypriv.busetkipkey);
#endif #endif
res =_FAIL; res =_FAIL;
goto exit; goto exit;
@ -1037,7 +1037,7 @@ _func_enter_;
//if ((psecuritypriv->sw_encrypt)||(pattrib->bswenc)) //if ((psecuritypriv->sw_encrypt)||(pattrib->bswenc))
if (pattrib->bswenc) if (pattrib->bswenc)
{ {
//DBG_871X("start xmitframe_swencrypt\n"); //DBG_88E("start xmitframe_swencrypt\n");
RT_TRACE(_module_rtl871x_xmit_c_,_drv_alert_,("### xmitframe_swencrypt\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_alert_,("### xmitframe_swencrypt\n"));
switch (pattrib->encrypt){ switch (pattrib->encrypt){
case _WEP40_: case _WEP40_:
@ -1221,7 +1221,7 @@ _func_enter_;
//check BA_starting_seqctrl //check BA_starting_seqctrl
if (SN_LESS(pattrib->seqnum, tx_seq)) if (SN_LESS(pattrib->seqnum, tx_seq))
{ {
//DBG_871X("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq); //DBG_88E("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq);
pattrib->ampdu_en = _FALSE;//AGG BK pattrib->ampdu_en = _FALSE;//AGG BK
} }
else if (SN_EQUAL(pattrib->seqnum, tx_seq)) else if (SN_EQUAL(pattrib->seqnum, tx_seq))
@ -1232,7 +1232,7 @@ _func_enter_;
} }
else else
{ {
//DBG_871X("tx ampdu over run\n"); //DBG_88E("tx ampdu over run\n");
psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff; psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff;
pattrib->ampdu_en = _TRUE;//AGG EN pattrib->ampdu_en = _TRUE;//AGG EN
} }
@ -1651,7 +1651,7 @@ _func_enter_;
return _FAIL; return _FAIL;
if (pxmitframe->buf_addr == NULL){ if (pxmitframe->buf_addr == NULL){
DBG_8192C("==> %s buf_addr==NULL\n",__func__); DBG_88E("==> %s buf_addr==NULL\n",__func__);
return _FAIL; return _FAIL;
} }
@ -1671,7 +1671,7 @@ _func_enter_;
if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) { if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n"));
DBG_8192C("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n"); DBG_88E("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n");
res = _FAIL; res = _FAIL;
goto exit; goto exit;
} }
@ -1793,7 +1793,7 @@ _func_enter_;
if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) if (xmitframe_addmic(padapter, pxmitframe) == _FAIL)
{ {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n"));
DBG_8192C("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n"); DBG_88E("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n");
res = _FAIL; res = _FAIL;
goto exit; goto exit;
} }
@ -1954,7 +1954,7 @@ _func_enter_;
{ {
pxmitpriv->free_xmit_extbuf_cnt--; pxmitpriv->free_xmit_extbuf_cnt--;
#ifdef DBG_XMIT_BUF_EXT #ifdef DBG_XMIT_BUF_EXT
DBG_871X("DBG_XMIT_BUF_EXT ALLOC no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt); DBG_88E("DBG_XMIT_BUF_EXT ALLOC no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt);
#endif #endif
@ -1970,7 +1970,7 @@ _func_enter_;
#endif #endif
if (pxmitbuf->sctx) { if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
} }
@ -2002,7 +2002,7 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue));
pxmitpriv->free_xmit_extbuf_cnt++; pxmitpriv->free_xmit_extbuf_cnt++;
#ifdef DBG_XMIT_BUF_EXT #ifdef DBG_XMIT_BUF_EXT
DBG_871X("DBG_XMIT_BUF_EXT FREE no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmit_extbuf_cnt); DBG_88E("DBG_XMIT_BUF_EXT FREE no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmit_extbuf_cnt);
#endif #endif
_exit_critical(&pfree_queue->lock, &irqL); _exit_critical(&pfree_queue->lock, &irqL);
@ -2021,7 +2021,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
_func_enter_; _func_enter_;
//DBG_871X("+rtw_alloc_xmitbuf\n"); //DBG_88E("+rtw_alloc_xmitbuf\n");
_enter_critical(&pfree_xmitbuf_queue->lock, &irqL); _enter_critical(&pfree_xmitbuf_queue->lock, &irqL);
@ -2042,9 +2042,9 @@ _func_enter_;
{ {
pxmitpriv->free_xmitbuf_cnt--; pxmitpriv->free_xmitbuf_cnt--;
#ifdef DBG_XMIT_BUF #ifdef DBG_XMIT_BUF
DBG_871X("DBG_XMIT_BUF ALLOC no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmitbuf_cnt); DBG_88E("DBG_XMIT_BUF ALLOC no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmitbuf_cnt);
#endif #endif
//DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); //DBG_88E("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
//pxmitbuf->ext_tag = _FALSE; //pxmitbuf->ext_tag = _FALSE;
@ -2059,14 +2059,14 @@ _func_enter_;
#endif #endif
if (pxmitbuf->sctx) { if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
} }
} }
#ifdef DBG_XMIT_BUF #ifdef DBG_XMIT_BUF
else else
{ {
DBG_871X("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n"); DBG_88E("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n");
} }
#endif #endif
@ -2084,7 +2084,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
_func_enter_; _func_enter_;
//DBG_871X("+rtw_free_xmitbuf\n"); //DBG_88E("+rtw_free_xmitbuf\n");
if (pxmitbuf==NULL) if (pxmitbuf==NULL)
{ {
@ -2092,7 +2092,7 @@ _func_enter_;
} }
if (pxmitbuf->sctx) { if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__); DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_FREE); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_FREE);
} }
@ -2109,9 +2109,9 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue));
pxmitpriv->free_xmitbuf_cnt++; pxmitpriv->free_xmitbuf_cnt++;
//DBG_871X("FREE, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt); //DBG_88E("FREE, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
#ifdef DBG_XMIT_BUF #ifdef DBG_XMIT_BUF
DBG_871X("DBG_XMIT_BUF FREE no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmitbuf_cnt); DBG_88E("DBG_XMIT_BUF FREE no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmitbuf_cnt);
#endif #endif
_exit_critical(&pfree_xmitbuf_queue->lock, &irqL); _exit_critical(&pfree_xmitbuf_queue->lock, &irqL);
} }
@ -2545,7 +2545,7 @@ _func_enter_;
if (psta == NULL) { if (psta == NULL) {
res = _FAIL; res = _FAIL;
DBG_8192C("rtw_xmit_classifier: psta == NULL\n"); DBG_88E("rtw_xmit_classifier: psta == NULL\n");
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("rtw_xmit_classifier: psta == NULL\n")); RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("rtw_xmit_classifier: psta == NULL\n"));
goto exit; goto exit;
} }
@ -2907,7 +2907,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n"));
//#ifdef DBG_TX_DROP_FRAME //#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__); DBG_88E("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__);
//#endif //#endif
return -1; return -1;
} }
@ -2949,7 +2949,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
if (res == _FAIL) { if (res == _FAIL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__); DBG_88E("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__);
#endif #endif
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
return -1; return -1;
@ -3089,7 +3089,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
if (pattrib->triggered==1) if (pattrib->triggered==1)
{ {
//DBG_871X("directly xmit pspoll_triggered packet\n"); //DBG_88E("directly xmit pspoll_triggered packet\n");
//pattrib->triggered=0; //pattrib->triggered=0;
@ -3120,7 +3120,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
pstapriv->tim_bitmap |= BIT(0);// pstapriv->tim_bitmap |= BIT(0);//
pstapriv->sta_dz_bitmap |= BIT(0); pstapriv->sta_dz_bitmap |= BIT(0);
//DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); //DBG_88E("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
update_beacon(padapter, _TIM_IE_, NULL, _FALSE);//tx bc/mc packets after upate bcn update_beacon(padapter, _TIM_IE_, NULL, _FALSE);//tx bc/mc packets after upate bcn
@ -3181,11 +3181,11 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
{ {
pstapriv->tim_bitmap |= BIT(psta->aid); pstapriv->tim_bitmap |= BIT(psta->aid);
//DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); //DBG_88E("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
if (psta->sleepq_len==1) if (psta->sleepq_len==1)
{ {
//DBG_871X("sleepq_len==1, update BCNTIM\n"); //DBG_88E("sleepq_len==1, update BCNTIM\n");
//upate BCN for TIM IE //upate BCN for TIM IE
update_beacon(padapter, _TIM_IE_, NULL, _FALSE); update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
} }
@ -3392,7 +3392,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
pstapriv->tim_bitmap &= ~BIT(psta->aid); pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); //DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE //upate BCN for TIM IE
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
update_mask = BIT(0); update_mask = BIT(0);
@ -3456,7 +3456,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
pstapriv->tim_bitmap &= ~BIT(0); pstapriv->tim_bitmap &= ~BIT(0);
pstapriv->sta_dz_bitmap &= ~BIT(0); pstapriv->sta_dz_bitmap &= ~BIT(0);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); //DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE //upate BCN for TIM IE
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
update_mask |= BIT(1); update_mask |= BIT(1);
@ -3552,7 +3552,7 @@ void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
pstapriv->tim_bitmap &= ~BIT(psta->aid); pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap); //DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE //upate BCN for TIM IE
//update_BCNTIM(padapter); //update_BCNTIM(padapter);
update_beacon(padapter, _TIM_IE_, NULL, _FALSE); update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
@ -3658,7 +3658,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
} }
else else
{ {
DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__); DBG_88E("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
} }
#else #else
type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET); type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET);
@ -3736,7 +3736,7 @@ int rtw_sctx_wait(struct submit_ctx *sctx)
if (!wait_for_completion_timeout(&sctx->done, expire)) { if (!wait_for_completion_timeout(&sctx->done, expire)) {
/* timeout, do something?? */ /* timeout, do something?? */
status = RTW_SCTX_DONE_TIMEOUT; status = RTW_SCTX_DONE_TIMEOUT;
DBG_871X("%s timeout\n", __func__); DBG_88E("%s timeout\n", __func__);
} else { } else {
status = sctx->status; status = sctx->status;
} }
@ -3768,7 +3768,7 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status)
{ {
if (*sctx) { if (*sctx) {
if (rtw_sctx_chk_waring_status(status)) if (rtw_sctx_chk_waring_status(status))
DBG_871X("%s status:%d\n", __func__, status); DBG_88E("%s status:%d\n", __func__, status);
(*sctx)->status = status; (*sctx)->status = status;
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
complete(&((*sctx)->done)); complete(&((*sctx)->done));
@ -3825,7 +3825,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) { if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) {
pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT; pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT;
DBG_871X("%s timeout\n", __func__); DBG_88E("%s timeout\n", __func__);
} }
if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS) if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS)
@ -3857,7 +3857,7 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
if (pxmitpriv->ack_tx) { if (pxmitpriv->ack_tx) {
rtw_sctx_done_err(&pack_tx_ops, status); rtw_sctx_done_err(&pack_tx_ops, status);
} else { } else {
DBG_871X("%s ack_tx not set\n", __func__); DBG_88E("%s ack_tx not set\n", __func__);
} }
} }
#endif //CONFIG_XMIT_ACK #endif //CONFIG_XMIT_ACK

2
hal/HalPwrSeqCmd.c
View file

@ -151,7 +151,7 @@ u8 HalPwrSeqCmdParsing(
rtw_udelay_os(10); rtw_udelay_os(10);
if (pollingCount++ > maxPollingCnt) { if (pollingCount++ > maxPollingCnt) {
DBG_871X("Fail to polling Offset[%#x]\n", offset); DBG_88E("Fail to polling Offset[%#x]\n", offset);
return _FALSE; return _FALSE;
} }
} while (!bPollingBit); } while (!bPollingBit);

4
hal/hal_com.c
View file

@ -73,7 +73,7 @@ void dump_chip_info(HAL_VERSION ChipVersion)
cnt += sprintf((buf+cnt), "RomVer(%d)\n", ChipVersion.ROMVer); cnt += sprintf((buf+cnt), "RomVer(%d)\n", ChipVersion.ROMVer);
DBG_871X("%s", buf); DBG_88E("%s", buf);
} }
@ -369,7 +369,7 @@ s32 c2h_evt_read(_adapter *adapter, u8 *buf)
&c2h_evt , sizeof(c2h_evt)); &c2h_evt , sizeof(c2h_evt));
if (0) { if (0) {
DBG_871X("%s id:%u, len:%u, seq:%u, trigger:0x%02x\n", __func__ DBG_88E("%s id:%u, len:%u, seq:%u, trigger:0x%02x\n", __func__
, c2h_evt->id, c2h_evt->plen, c2h_evt->seq, trigger); , c2h_evt->id, c2h_evt->plen, c2h_evt->seq, trigger);
} }

16
hal/hal_intf.c
View file

@ -99,7 +99,7 @@ uint rtw_hal_init(_adapter *padapter)
#ifdef CONFIG_DUALMAC_CONCURRENT #ifdef CONFIG_DUALMAC_CONCURRENT
if (padapter->hw_init_completed == _TRUE) if (padapter->hw_init_completed == _TRUE)
{ {
DBG_871X("rtw_hal_init: hw_init_completed == _TRUE\n"); DBG_88E("rtw_hal_init: hw_init_completed == _TRUE\n");
return status; return status;
} }
@ -109,7 +109,7 @@ uint rtw_hal_init(_adapter *padapter)
{ {
if (padapter->pbuddy_adapter->hw_init_completed == _TRUE) if (padapter->pbuddy_adapter->hw_init_completed == _TRUE)
{ {
DBG_871X("rtw_hal_init: pbuddy_adapter hw_init_completed == _TRUE\n"); DBG_88E("rtw_hal_init: pbuddy_adapter hw_init_completed == _TRUE\n");
} }
else else
{ {
@ -120,7 +120,7 @@ uint rtw_hal_init(_adapter *padapter)
else{ else{
padapter->pbuddy_adapter->hw_init_completed = _FALSE; padapter->pbuddy_adapter->hw_init_completed = _FALSE;
RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n")); RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"));
DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"); DBG_88E("rtw_hal_init: hal__init fail(pbuddy_adapter)\n");
return status; return status;
} }
} }
@ -141,7 +141,7 @@ uint rtw_hal_init(_adapter *padapter)
} }
else{ else{
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = _FALSE;
DBG_871X("rtw_hal_init: hal__init fail\n"); DBG_88E("rtw_hal_init: hal__init fail\n");
} }
RT_TRACE(_module_hal_init_c_,_drv_err_,("-rtl871x_hal_init:status=0x%x\n",status)); RT_TRACE(_module_hal_init_c_,_drv_err_,("-rtl871x_hal_init:status=0x%x\n",status));
@ -163,7 +163,7 @@ _func_enter_;
} }
else else
{ {
DBG_871X("\n rtw_hal_deinit: hal_init fail\n"); DBG_88E("\n rtw_hal_deinit: hal_init fail\n");
} }
_func_exit_; _func_exit_;
@ -212,7 +212,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter)
if (padapter->HalFunc.enable_interrupt) if (padapter->HalFunc.enable_interrupt)
padapter->HalFunc.enable_interrupt(padapter); padapter->HalFunc.enable_interrupt(padapter);
else else
DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __func__); DBG_88E("%s: HalFunc.enable_interrupt is NULL!\n", __func__);
} }
void rtw_hal_disable_interrupt(_adapter *padapter) void rtw_hal_disable_interrupt(_adapter *padapter)
@ -220,7 +220,7 @@ void rtw_hal_disable_interrupt(_adapter *padapter)
if (padapter->HalFunc.disable_interrupt) if (padapter->HalFunc.disable_interrupt)
padapter->HalFunc.disable_interrupt(padapter); padapter->HalFunc.disable_interrupt(padapter);
else else
DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __func__); DBG_88E("%s: HalFunc.disable_interrupt is NULL!\n", __func__);
} }
@ -231,7 +231,7 @@ u32 rtw_hal_inirp_init(_adapter *padapter)
if (padapter->HalFunc.inirp_init) if (padapter->HalFunc.inirp_init)
rst = padapter->HalFunc.inirp_init(padapter); rst = padapter->HalFunc.inirp_init(padapter);
else else
DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__func__); DBG_88E(" %s HalFunc.inirp_init is NULL!!!\n",__func__);
return rst; return rst;
} }

10
hal/odm.c
View file

@ -4440,7 +4440,7 @@ odm_TXPowerTrackingThermalMeterInit(
if ( *(pDM_Odm->mp_mode) != 1) if ( *(pDM_Odm->mp_mode) != 1)
pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE; pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = _TRUE;
//#endif//#if (MP_DRIVER != 1) //#endif//#if (MP_DRIVER != 1)
MSG_8192C("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl); MSG_88E("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl);
} }
#else #else
{ {
@ -4459,7 +4459,7 @@ odm_TXPowerTrackingThermalMeterInit(
pdmpriv->TxPowerTrackControl = _TRUE; pdmpriv->TxPowerTrackControl = _TRUE;
//#endif//#if (MP_DRIVER != 1) //#endif//#if (MP_DRIVER != 1)
} }
MSG_8192C("pdmpriv->TxPowerTrackControl = %d\n", pdmpriv->TxPowerTrackControl); MSG_88E("pdmpriv->TxPowerTrackControl = %d\n", pdmpriv->TxPowerTrackControl);
} }
#endif//endif (CONFIG_RTL8188E==1) #endif//endif (CONFIG_RTL8188E==1)
@ -4549,7 +4549,7 @@ odm_TXPowerTrackingCheckCE(
//pHalData->TxPowerCheckCnt++; //cosa add for debug //pHalData->TxPowerCheckCnt++; //cosa add for debug
//ODM_SetRFReg(pDM_Odm, RF_PATH_A, RF_T_METER, bRFRegOffsetMask, 0x60); //ODM_SetRFReg(pDM_Odm, RF_PATH_A, RF_T_METER, bRFRegOffsetMask, 0x60);
PHY_SetRFReg(Adapter, RF_PATH_A, RF_T_METER_88E, BIT17 | BIT16, 0x03); PHY_SetRFReg(Adapter, RF_PATH_A, RF_T_METER_88E, BIT17 | BIT16, 0x03);
//DBG_8192C("Trigger 92C Thermal Meter!!\n"); //DBG_88E("Trigger 92C Thermal Meter!!\n");
pDM_Odm->RFCalibrateInfo.TM_Trigger = 1; pDM_Odm->RFCalibrateInfo.TM_Trigger = 1;
return; return;
@ -4557,7 +4557,7 @@ odm_TXPowerTrackingCheckCE(
} }
else else
{ {
//DBG_8192C("Schedule TxPowerTracking direct call!!\n"); //DBG_88E("Schedule TxPowerTracking direct call!!\n");
odm_TXPowerTrackingCallback_ThermalMeter_8188E(Adapter); odm_TXPowerTrackingCallback_ThermalMeter_8188E(Adapter);
pDM_Odm->RFCalibrateInfo.TM_Trigger = 0; pDM_Odm->RFCalibrateInfo.TM_Trigger = 0;
} }
@ -11312,7 +11312,7 @@ void odm_dtc(PDM_ODM_T pDM_Odm)
resp_txagc = resp_txagc | (resp_txagc << 5); resp_txagc = resp_txagc | (resp_txagc << 5);
ODM_Write1Byte(pDM_Odm, 0x06d9, resp_txagc); ODM_Write1Byte(pDM_Odm, 0x06d9, resp_txagc);
DBG_871X("%s RSSI_Min:%u, set RESP_TXAGC to %s %u\n", DBG_88E("%s RSSI_Min:%u, set RESP_TXAGC to %s %u\n",
__func__, pDM_Odm->RSSI_Min, sign?"minus":"plus", dtc_steps); __func__, pDM_Odm->RSSI_Min, sign?"minus":"plus", dtc_steps);
#endif /* CONFIG_RESP_TXAGC_ADJUST */ #endif /* CONFIG_RESP_TXAGC_ADJUST */
} }

90
hal/rtl8188e_cmd.c
View file

@ -45,7 +45,7 @@ static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num)
u8 valid; u8 valid;
//DBG_8192C(" _is_fw_read_cmd_down ,reg_1cc(%x),msg_box(%d)...\n",rtw_read8(padapter,REG_HMETFR),msgbox_num); //DBG_88E(" _is_fw_read_cmd_down ,reg_1cc(%x),msg_box(%d)...\n",rtw_read8(padapter,REG_HMETFR),msgbox_num);
do{ do{
valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num); valid = rtw_read8(padapter,REG_HMETFR) & BIT(msgbox_num);
@ -89,7 +89,7 @@ _func_enter_;
if (padapter->bFWReady == _FALSE) if (padapter->bFWReady == _FALSE)
{ {
DBG_8192C("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n"); DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n");
return ret; return ret;
} }
@ -120,7 +120,7 @@ _func_enter_;
h2c_box_num = pHalData->LastHMEBoxNum; h2c_box_num = pHalData->LastHMEBoxNum;
if (!_is_fw_read_cmd_down(padapter, h2c_box_num)){ if (!_is_fw_read_cmd_down(padapter, h2c_box_num)){
DBG_8192C(" fw read cmd failed...\n"); DBG_88E(" fw read cmd failed...\n");
goto exit; goto exit;
} }
@ -159,7 +159,7 @@ _func_enter_;
bcmd_down = _TRUE; bcmd_down = _TRUE;
// DBG_8192C("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n" // DBG_88E("MSG_BOX:%d,CmdLen(%d), reg:0x%x =>h2c_cmd:0x%x, reg:0x%x =>h2c_cmd_ex:0x%x ..\n"
// ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex); // ,pHalData->LastHMEBoxNum ,CmdLen,msgbox_addr,h2c_cmd,msgbox_ex_addr,h2c_cmd_ex);
pHalData->LastHMEBoxNum = (h2c_box_num+1) % RTL88E_MAX_H2C_BOX_NUMS; pHalData->LastHMEBoxNum = (h2c_box_num+1) % RTL88E_MAX_H2C_BOX_NUMS;
@ -203,7 +203,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
struct H2C_SS_RFOFF_PARAM param; struct H2C_SS_RFOFF_PARAM param;
DBG_8192C("==>%s bfwpoll(%x)\n",__func__,bfwpoll); DBG_88E("==>%s bfwpoll(%x)\n",__func__,bfwpoll);
param.gpio_period = period;//Polling GPIO_11 period time param.gpio_period = period;//Polling GPIO_11 period time
param.ROFOn = (_TRUE == bfwpoll)?1:0; param.ROFOn = (_TRUE == bfwpoll)?1:0;
FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(&param)); FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(&param));
@ -220,7 +220,7 @@ _func_enter_;
if (pHalData->fw_ractrl == _TRUE){ if (pHalData->fw_ractrl == _TRUE){
; ;
}else{ }else{
DBG_8192C("==>%s fw dont support RA\n",__func__); DBG_88E("==>%s fw dont support RA\n",__func__);
res=_FAIL; res=_FAIL;
} }
@ -242,7 +242,7 @@ _func_enter_;
FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf); FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf);
}else{ }else{
DBG_8192C("==>%s fw dont support RA\n",__func__); DBG_88E("==>%s fw dont support RA\n",__func__);
res=_FAIL; res=_FAIL;
} }
@ -295,7 +295,7 @@ void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
bitmap &= 0x0fffffff; bitmap &= 0x0fffffff;
DBG_871X("%s=> mac_id:%d , raid:%d , ra_bitmap=0x%x, shortGIrate=0x%02x\n", DBG_88E("%s=> mac_id:%d , raid:%d , ra_bitmap=0x%x, shortGIrate=0x%02x\n",
__func__,macid ,raid ,bitmap, shortGIrate); __func__,macid ,raid ,bitmap, shortGIrate);
@ -318,7 +318,7 @@ void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode)
u8 RLBM = 0; // 0:Min, 1:Max , 2:User define u8 RLBM = 0; // 0:Min, 1:Max , 2:User define
_func_enter_; _func_enter_;
DBG_871X("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__, DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,
Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable); Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable);
switch (Mode) switch (Mode)
@ -376,7 +376,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt )
opmode = (u8) mst_rpt; opmode = (u8) mst_rpt;
macid = (u8)(mst_rpt >> 8) ; macid = (u8)(mst_rpt >> 8) ;
DBG_871X("### %s: MStatus=%x MACID=%d\n", __func__,opmode,macid); DBG_88E("### %s: MStatus=%x MACID=%d\n", __func__,opmode,macid);
FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
} }
@ -391,7 +391,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -427,7 +427,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
{ {
//DBG_871X("ie len=%d\n", cur_network->IELength); //DBG_88E("ie len=%d\n", cur_network->IELength);
pktlen += cur_network->IELength - sizeof(NDIS_802_11_FIXED_IEs); pktlen += cur_network->IELength - sizeof(NDIS_802_11_FIXED_IEs);
_rtw_memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen); _rtw_memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen);
@ -472,13 +472,13 @@ _ConstructBeacon:
if ((pktlen + TXDESC_SIZE) > 512) if ((pktlen + TXDESC_SIZE) > 512)
{ {
DBG_871X("beacon frame too large\n"); DBG_88E("beacon frame too large\n");
return; return;
} }
*pLength = pktlen; *pLength = pktlen;
//DBG_871X("%s bcn_sz=%d\n", __func__, pktlen); //DBG_88E("%s bcn_sz=%d\n", __func__, pktlen);
} }
@ -490,7 +490,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -531,7 +531,7 @@ void ConstructNullFunctionData(
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
//DBG_871X("%s:%d\n", __func__, bForcePowerSave); //DBG_88E("%s:%d\n", __func__, bForcePowerSave);
pwlanhdr = (struct rtw_ieee80211_hdr*)pframe; pwlanhdr = (struct rtw_ieee80211_hdr*)pframe;
@ -596,7 +596,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -672,11 +672,11 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished)
RSVDPAGE_LOC RsvdPageLoc; RSVDPAGE_LOC RsvdPageLoc;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
ReservedPagePacket = (u8*)rtw_zmalloc(1000); ReservedPagePacket = (u8*)rtw_zmalloc(1000);
if (ReservedPagePacket == NULL) { if (ReservedPagePacket == NULL) {
DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__); DBG_88E("%s: alloc ReservedPagePacket fail!\n", __func__);
return; return;
} }
@ -786,7 +786,7 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished)
rtw_hal_mgnt_xmit(padapter, pmgntframe); rtw_hal_mgnt_xmit(padapter, pmgntframe);
DBG_871X("%s: Set RSVD page location to Fw\n", __func__); DBG_88E("%s: Set RSVD page location to Fw\n", __func__);
FillH2CCmd_88E(padapter, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc); FillH2CCmd_88E(padapter, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc);
exit: exit:
@ -806,7 +806,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
_func_enter_; _func_enter_;
DBG_871X("%s mstatus(%x)\n", __func__,mstatus); DBG_88E("%s mstatus(%x)\n", __func__,mstatus);
if (mstatus == 1) if (mstatus == 1)
{ {
@ -833,7 +833,7 @@ _func_enter_;
if (pHalData->RegFwHwTxQCtrl&BIT6) if (pHalData->RegFwHwTxQCtrl&BIT6)
{ {
DBG_871X("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n"); DBG_88E("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n");
bSendBeacon = _TRUE; bSendBeacon = _TRUE;
} }
@ -866,9 +866,9 @@ _func_enter_;
{ {
} }
else if (!bcn_valid) else if (!bcn_valid)
DBG_871X("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll); DBG_88E("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll);
else else
DBG_871X("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll); DBG_88E("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);
// //
// We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) // We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower)
// becuase we need to free the Tx BCN Desc which is used by the first reserved page packet. // becuase we need to free the Tx BCN Desc which is used by the first reserved page packet.
@ -903,9 +903,9 @@ _func_enter_;
{ {
} }
else if (!bcn_valid) else if (!bcn_valid)
DBG_871X("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll); DBG_88E("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll);
else else
DBG_871X("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll); DBG_88E("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);
} }
} }
@ -932,7 +932,7 @@ _func_enter_;
if (bcn_valid) if (bcn_valid)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
DBG_871X("Set RSVD page location to Fw.\n"); DBG_88E("Set RSVD page location to Fw.\n");
//FillH2CCmd88E(Adapter, H2C_88E_RSVDPAGE, H2C_RSVDPAGE_LOC_LENGTH, pMgntInfo->u1RsvdPageLoc); //FillH2CCmd88E(Adapter, H2C_88E_RSVDPAGE, H2C_RSVDPAGE_LOC_LENGTH, pMgntInfo->u1RsvdPageLoc);
} }
@ -949,9 +949,9 @@ _func_enter_;
JoinBssRptParm.OpMode = mstatus; JoinBssRptParm.OpMode = mstatus;
JoinBssRptParm.MacID = 0; JoinBssRptParm.MacID = 0;
FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(JoinBssRptParm), (u8 *)&JoinBssRptParm); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(JoinBssRptParm), (u8 *)&JoinBssRptParm);
DBG_871X_LEVEL(_drv_info_, "%s opmode:%d MacId:%d\n", __func__, JoinBssRptParm.OpMode, JoinBssRptParm.MacID); DBG_88E_LEVEL(_drv_info_, "%s opmode:%d MacId:%d\n", __func__, JoinBssRptParm.OpMode, JoinBssRptParm.MacID);
} else { } else {
DBG_871X_LEVEL(_drv_info_, "%s wowlan_mode is off\n", __func__); DBG_88E_LEVEL(_drv_info_, "%s wowlan_mode is off\n", __func__);
} }
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
_func_exit_; _func_exit_;
@ -972,11 +972,11 @@ _func_enter_;
switch (p2p_ps_state) switch (p2p_ps_state)
{ {
case P2P_PS_DISABLE: case P2P_PS_DISABLE:
DBG_8192C("P2P_PS_DISABLE\n"); DBG_88E("P2P_PS_DISABLE\n");
_rtw_memset(p2p_ps_offload, 0 ,1); _rtw_memset(p2p_ps_offload, 0 ,1);
break; break;
case P2P_PS_ENABLE: case P2P_PS_ENABLE:
DBG_8192C("P2P_PS_ENABLE\n"); DBG_88E("P2P_PS_ENABLE\n");
// update CTWindow value. // update CTWindow value.
if ( pwdinfo->ctwindow > 0 ) if ( pwdinfo->ctwindow > 0 )
{ {
@ -995,16 +995,16 @@ _func_enter_;
p2p_ps_offload->NoA1_En = 1; p2p_ps_offload->NoA1_En = 1;
// config P2P NoA Descriptor Register // config P2P NoA Descriptor Register
//DBG_8192C("%s(): noa_duration = %x\n",__func__,pwdinfo->noa_duration[i]); //DBG_88E("%s(): noa_duration = %x\n",__func__,pwdinfo->noa_duration[i]);
rtw_write32(padapter, REG_NOA_DESC_DURATION, pwdinfo->noa_duration[i]); rtw_write32(padapter, REG_NOA_DESC_DURATION, pwdinfo->noa_duration[i]);
//DBG_8192C("%s(): noa_interval = %x\n",__func__,pwdinfo->noa_interval[i]); //DBG_88E("%s(): noa_interval = %x\n",__func__,pwdinfo->noa_interval[i]);
rtw_write32(padapter, REG_NOA_DESC_INTERVAL, pwdinfo->noa_interval[i]); rtw_write32(padapter, REG_NOA_DESC_INTERVAL, pwdinfo->noa_interval[i]);
//DBG_8192C("%s(): start_time = %x\n",__func__,pwdinfo->noa_start_time[i]); //DBG_88E("%s(): start_time = %x\n",__func__,pwdinfo->noa_start_time[i]);
rtw_write32(padapter, REG_NOA_DESC_START, pwdinfo->noa_start_time[i]); rtw_write32(padapter, REG_NOA_DESC_START, pwdinfo->noa_start_time[i]);
//DBG_8192C("%s(): noa_count = %x\n",__func__,pwdinfo->noa_count[i]); //DBG_88E("%s(): noa_count = %x\n",__func__,pwdinfo->noa_count[i]);
rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]); rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]);
} }
@ -1029,11 +1029,11 @@ _func_enter_;
} }
break; break;
case P2P_PS_SCAN: case P2P_PS_SCAN:
DBG_8192C("P2P_PS_SCAN\n"); DBG_88E("P2P_PS_SCAN\n");
p2p_ps_offload->discovery = 1; p2p_ps_offload->discovery = 1;
break; break;
case P2P_PS_SCAN_DONE: case P2P_PS_SCAN_DONE:
DBG_8192C("P2P_PS_SCAN_DONE\n"); DBG_88E("P2P_PS_SCAN_DONE\n");
p2p_ps_offload->discovery = 0; p2p_ps_offload->discovery = 0;
pwdinfo->p2p_ps_state = P2P_PS_ENABLE; pwdinfo->p2p_ps_state = P2P_PS_ENABLE;
break; break;
@ -1108,7 +1108,7 @@ void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable)
struct pwrctrl_priv *pwrpriv=&padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv=&padapter->pwrctrlpriv;
_func_enter_; _func_enter_;
DBG_871X_LEVEL(_drv_always_, "+%s+\n", __func__); DBG_88E_LEVEL(_drv_info_, "+%s+\n", __func__);
pwowlan_parm.mode =0; pwowlan_parm.mode =0;
pwowlan_parm.gpio_index=0; pwowlan_parm.gpio_index=0;
@ -1124,21 +1124,21 @@ _func_enter_;
if (pwrpriv->wowlan_pattern ==_TRUE){ if (pwrpriv->wowlan_pattern ==_TRUE){
pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH; pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH;
DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); DBG_88E_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode );
} }
if (pwrpriv->wowlan_magic ==_TRUE){ if (pwrpriv->wowlan_magic ==_TRUE){
pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT; pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT;
DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); DBG_88E_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode );
} }
if (pwrpriv->wowlan_unicast ==_TRUE){ if (pwrpriv->wowlan_unicast ==_TRUE){
pwowlan_parm.mode |=FW_WOWLAN_UNICAST; pwowlan_parm.mode |=FW_WOWLAN_UNICAST;
DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); DBG_88E_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode );
} }
if (!(padapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect)) if (!(padapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect))
rtl8188e_set_FwJoinBssReport_cmd(padapter, 1); rtl8188e_set_FwJoinBssReport_cmd(padapter, 1);
else else
DBG_871X_LEVEL(_drv_always_, "%s, disconnected, no FwJoinBssReport\n",__func__); DBG_88E_LEVEL(_drv_info_, "%s, disconnected, no FwJoinBssReport\n",__func__);
rtw_msleep_os(2); rtw_msleep_os(2);
//WOWLAN_GPIO_ACTIVE means GPIO high active //WOWLAN_GPIO_ACTIVE means GPIO high active
@ -1155,8 +1155,8 @@ _func_enter_;
pwowlan_parm.gpio_index=0x80; pwowlan_parm.gpio_index=0x80;
#endif //CONFIG_SDIO_HCI #endif //CONFIG_SDIO_HCI
DBG_871X_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode); DBG_88E_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode);
DBG_871X_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__func__,pwowlan_parm.gpio_index); DBG_88E_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__func__,pwowlan_parm.gpio_index);
res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm); res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm);
rtw_msleep_os(2); rtw_msleep_os(2);
@ -1193,7 +1193,7 @@ _func_enter_;
res = FillH2CCmd_88E(padapter, H2C_COM_REMOTE_WAKE_CTRL, 3, (u8 *)&pwowlan_parm); res = FillH2CCmd_88E(padapter, H2C_COM_REMOTE_WAKE_CTRL, 3, (u8 *)&pwowlan_parm);
} }
_func_exit_; _func_exit_;
DBG_871X_LEVEL(_drv_always_, "-%s res:%d-\n", __func__, res); DBG_88E_LEVEL(_drv_info_, "-%s res:%d-\n", __func__, res);
return ; return ;
} }
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN

12
hal/rtl8188e_dm.c
View file

@ -100,7 +100,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
{ {
// Here we only set bPbcPressed to true // Here we only set bPbcPressed to true
// After trigger PBC, the variable will be set to false // After trigger PBC, the variable will be set to false
DBG_8192C("CheckPbcGPIO - PBC is pressed\n"); DBG_88E("CheckPbcGPIO - PBC is pressed\n");
#ifdef RTK_DMP_PLATFORM #ifdef RTK_DMP_PLATFORM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
@ -165,7 +165,7 @@ dm_InterruptMigration(
//Update current settings. //Update current settings.
if ( bCurrentIntMt != IntMtToSet ){ if ( bCurrentIntMt != IntMtToSet ){
DBG_8192C("%s(): Update interrrupt migration(%d)\n",__func__,IntMtToSet); DBG_88E("%s(): Update interrrupt migration(%d)\n",__func__,IntMtToSet);
if (IntMtToSet) if (IntMtToSet)
{ {
// //
@ -185,7 +185,7 @@ dm_InterruptMigration(
} }
/*if ( bCurrentACIntDisable != ACIntToSet ){ /*if ( bCurrentACIntDisable != ACIntToSet ){
DBG_8192C("%s(): Update AC interrrupt(%d)\n",__func__,ACIntToSet); DBG_88E("%s(): Update AC interrrupt(%d)\n",__func__,ACIntToSet);
if (ACIntToSet) // Disable four ACs interrupts. if (ACIntToSet) // Disable four ACs interrupts.
{ {
// //
@ -559,7 +559,7 @@ void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
if (0 != pHalData->AntDivCfg ) if (0 != pHalData->AntDivCfg )
{ {
//DBG_8192C("update_network=> orgRSSI(%d)(%d),newRSSI(%d)(%d)\n",dst->Rssi,query_rx_pwr_percentage(dst->Rssi), //DBG_88E("update_network=> orgRSSI(%d)(%d),newRSSI(%d)(%d)\n",dst->Rssi,query_rx_pwr_percentage(dst->Rssi),
// src->Rssi,query_rx_pwr_percentage(src->Rssi)); // src->Rssi,query_rx_pwr_percentage(src->Rssi));
//select optimum_antenna for before linked =>For antenna diversity //select optimum_antenna for before linked =>For antenna diversity
if (dst->Rssi >= src->Rssi )//keep org parameter if (dst->Rssi >= src->Rssi )//keep org parameter
@ -582,7 +582,7 @@ u8 AntDivBeforeLink8188E(PADAPTER Adapter )
// Condition that does not need to use antenna diversity. // Condition that does not need to use antenna diversity.
if (pHalData->AntDivCfg==0) if (pHalData->AntDivCfg==0)
{ {
//DBG_8192C("odm_AntDivBeforeLink8192C(): No AntDiv Mechanism.\n"); //DBG_88E("odm_AntDivBeforeLink8192C(): No AntDiv Mechanism.\n");
return _FALSE; return _FALSE;
} }
@ -599,7 +599,7 @@ u8 AntDivBeforeLink8188E(PADAPTER Adapter )
//PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna); //PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna);
rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE); rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE);
//DBG_8192C("%s change antenna to ANT_( %s ).....\n",__func__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B"); //DBG_88E("%s change antenna to ANT_( %s ).....\n",__func__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B");
return _TRUE; return _TRUE;
} }
else else

150
hal/rtl8188e_hal_init.c
View file

@ -38,7 +38,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable)
{ {
//Enable initial offload //Enable initial offload
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
//DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); //DBG_88E("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN);
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0|SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0|SW_OFFLOAD_EN);
if (padapter->bFWReady == _FALSE) if (padapter->bFWReady == _FALSE)
@ -52,7 +52,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable)
{ {
//disable initial offload //disable initial offload
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
//DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); //DBG_88E("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN);
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN);
} }
} }
@ -66,7 +66,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
u32 t1,t2; u32 t1,t2;
control = control&0x0f; control = control&0x0f;
reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0); reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0);
//DBG_871X("%s reg_0x88:0x%02x, write 0x%02x\n", __func__, reg_0x88, reg_0x88|control); //DBG_88E("%s reg_0x88:0x%02x, write 0x%02x\n", __func__, reg_0x88, reg_0x88|control);
rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88|control); rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88|control);
t1 = start = rtw_get_current_time(); t1 = start = rtw_get_current_time();
@ -75,7 +75,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
(reg_0x88=rtw_read8(padapter, REG_HMEBOX_E0)) & control (reg_0x88=rtw_read8(padapter, REG_HMEBOX_E0)) & control
&& (passing_time=rtw_get_passing_time_ms(start))<1000 && (passing_time=rtw_get_passing_time_ms(start))<1000
) { ) {
//DBG_871X("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __func__, reg_0x88,rtw_read8(padapter, 0x1c7) ); //DBG_88E("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __func__, reg_0x88,rtw_read8(padapter, 0x1c7) );
//rtw_udelay_os(100); //rtw_udelay_os(100);
} }
@ -85,7 +85,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
status = _FAIL; status = _FAIL;
t2= rtw_get_current_time(); t2= rtw_get_current_time();
//printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0)); //printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0));
//DBG_871X("%s in %u ms, reg_0x88:0x%02x\n", __func__, passing_time, reg_0x88); //DBG_88E("%s in %u ms, reg_0x88:0x%02x\n", __func__, passing_time, reg_0x88);
return status; return status;
} }
@ -97,7 +97,7 @@ static s32 iol_InitLLTTable(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
iol_mode_enable(padapter, 1); iol_mode_enable(padapter, 1);
//DBG_871X("%s txpktbuf_bndy:%u\n", __func__, txpktbuf_bndy); //DBG_88E("%s txpktbuf_bndy:%u\n", __func__, txpktbuf_bndy);
rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy); rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy);
rst = iol_execute(padapter, CMD_INIT_LLT); rst = iol_execute(padapter, CMD_INIT_LLT);
iol_mode_enable(padapter, 0); iol_mode_enable(padapter, 0);
@ -121,14 +121,14 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) if (efuseTbl == NULL)
{ {
DBG_871X("%s: alloc efuseTbl fail!\n", __func__); DBG_88E("%s: alloc efuseTbl fail!\n", __func__);
goto exit; goto exit;
} }
eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
if (eFuseWord == NULL) if (eFuseWord == NULL)
{ {
DBG_871X("%s: alloc eFuseWord fail!\n", __func__); DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
goto exit; goto exit;
} }
@ -150,7 +150,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
} }
else else
{ {
DBG_871X("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, rtemp8); DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, rtemp8);
goto exit; goto exit;
} }
@ -303,28 +303,28 @@ void efuse_read_phymap_from_txpktbuf(
if (bcnhead<0) //if not valid if (bcnhead<0) //if not valid
bcnhead = rtw_read8(adapter, REG_TDECTRL+1); bcnhead = rtw_read8(adapter, REG_TDECTRL+1);
DBG_871X("%s bcnhead:%d\n", __func__, bcnhead); DBG_88E("%s bcnhead:%d\n", __func__, bcnhead);
//reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); //reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL);
//DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); //DBG_88E("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69);
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
//DBG_871X("%s reg_0x106:0x%02x\n", __func__, rtw_read8(adapter, 0x106)); //DBG_88E("%s reg_0x106:0x%02x\n", __func__, rtw_read8(adapter, 0x106));
dbg_addr = bcnhead*128/8; //8-bytes addressing dbg_addr = bcnhead*128/8; //8-bytes addressing
while (1) while (1)
{ {
//DBG_871X("%s dbg_addr:0x%x\n", __func__, dbg_addr+i); //DBG_88E("%s dbg_addr:0x%x\n", __func__, dbg_addr+i);
rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr+i); rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr+i);
//DBG_871X("%s write reg_0x143:0x00\n", __func__); //DBG_88E("%s write reg_0x143:0x00\n", __func__);
rtw_write8(adapter, REG_TXPKTBUF_DBG, 0); rtw_write8(adapter, REG_TXPKTBUF_DBG, 0);
start = rtw_get_current_time(); start = rtw_get_current_time();
while (!(reg_0x143=rtw_read8(adapter, REG_TXPKTBUF_DBG))//dbg while (!(reg_0x143=rtw_read8(adapter, REG_TXPKTBUF_DBG))//dbg
//while (rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 //while (rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0
&& (passing_time=rtw_get_passing_time_ms(start))<1000 && (passing_time=rtw_get_passing_time_ms(start))<1000
) { ) {
DBG_871X("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106)); DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106));
rtw_usleep_os(100); rtw_usleep_os(100);
} }
@ -346,7 +346,7 @@ void efuse_read_phymap_from_txpktbuf(
limit = (len-2<limit)?len-2:limit; limit = (len-2<limit)?len-2:limit;
DBG_871X("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __func__, len, lenbak, aaa, aaabak); DBG_88E("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __func__, len, lenbak, aaa, aaabak);
_rtw_memcpy(pos, ((u8*)&lo32)+2, (limit>=count+2)?2:limit-count); _rtw_memcpy(pos, ((u8*)&lo32)+2, (limit>=count+2)?2:limit-count);
count+= (limit>=count+2)?2:limit-count; count+= (limit>=count+2)?2:limit-count;
@ -374,7 +374,7 @@ void efuse_read_phymap_from_txpktbuf(
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);
DBG_871X("%s read count:%u\n", __func__, count); DBG_88E("%s read count:%u\n", __func__, count);
*size = count; *size = count;
} }
@ -399,9 +399,9 @@ static s32 iol_read_efuse(
_rtw_memset(physical_map, 0xFF, 512); _rtw_memset(physical_map, 0xFF, 512);
///reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); ///reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL);
//DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); //DBG_88E("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69);
rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
//DBG_871X("%s reg_0x106:0x%02x\n", __func__, rtw_read8(padapter, 0x106)); //DBG_88E("%s reg_0x106:0x%02x\n", __func__, rtw_read8(padapter, 0x106));
status = iol_execute(padapter, CMD_READ_EFUSE_MAP); status = iol_execute(padapter, CMD_READ_EFUSE_MAP);
@ -416,7 +416,7 @@ static s32 iol_read_efuse(
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) s32 rtl8188e_iol_efuse_patch(PADAPTER padapter)
{ {
s32 result = _SUCCESS; s32 result = _SUCCESS;
printk("==> %s\n",__func__); DBG_88E("==> %s\n",__func__);
if (rtw_IOL_applied(padapter)){ if (rtw_IOL_applied(padapter)){
iol_mode_enable(padapter, 1); iol_mode_enable(padapter, 1);
@ -436,7 +436,7 @@ static s32 iol_ioconfig(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
//DBG_871X("%s iocfg_bndy:%u\n", __func__, iocfg_bndy); //DBG_88E("%s iocfg_bndy:%u\n", __func__, iocfg_bndy);
rtw_write8(padapter, REG_TDECTRL+1, iocfg_bndy); rtw_write8(padapter, REG_TDECTRL+1, iocfg_bndy);
rst = iol_execute(padapter, CMD_IOCONFIG); rst = iol_execute(padapter, CMD_IOCONFIG);
@ -767,7 +767,7 @@ void _8051Reset88E(PADAPTER padapter)
u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1); u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2)); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2));
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2)); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2));
DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");
} }
@ -784,10 +784,10 @@ static s32 _FWFreeToGo(PADAPTER padapter)
} while (counter++ < POLLING_READY_TIMEOUT_COUNT); } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
if (counter >= POLLING_READY_TIMEOUT_COUNT) { if (counter >= POLLING_READY_TIMEOUT_COUNT) {
DBG_871X("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __func__, value32); DBG_88E("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __func__, value32);
return _FAIL; return _FAIL;
} }
DBG_871X("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, value32); DBG_88E("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, value32);
value32 = rtw_read32(padapter, REG_MCUFWDL); value32 = rtw_read32(padapter, REG_MCUFWDL);
@ -802,13 +802,13 @@ static s32 _FWFreeToGo(PADAPTER padapter)
do { do {
value32 = rtw_read32(padapter, REG_MCUFWDL); value32 = rtw_read32(padapter, REG_MCUFWDL);
if (value32 & WINTINI_RDY) { if (value32 & WINTINI_RDY) {
DBG_871X("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __func__, value32); DBG_88E("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __func__, value32);
return _SUCCESS; return _SUCCESS;
} }
rtw_udelay_os(5); rtw_udelay_os(5);
} while (counter++ < POLLING_READY_TIMEOUT_COUNT); } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
DBG_871X ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __func__, value32); DBG_88E ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __func__, value32);
return _FAIL; return _FAIL;
} }
@ -871,7 +871,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter)
#ifdef CONFIG_FILE_FWIMG #ifdef CONFIG_FILE_FWIMG
if (rtw_is_file_readable(rtw_fw_file_path) == _TRUE) if (rtw_is_file_readable(rtw_fw_file_path) == _TRUE)
{ {
DBG_871X("%s accquire FW from file:%s\n", __func__, rtw_fw_file_path); DBG_88E("%s accquire FW from file:%s\n", __func__, rtw_fw_file_path);
pFirmware->eFWSource = FW_SOURCE_IMG_FILE; pFirmware->eFWSource = FW_SOURCE_IMG_FILE;
} }
else else
@ -916,7 +916,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter)
{ {
pFirmwareBuf = pFirmware->szFwBuffer; pFirmwareBuf = pFirmware->szFwBuffer;
FirmwareLen = pFirmware->ulFwLength; FirmwareLen = pFirmware->ulFwLength;
DBG_871X_LEVEL(_drv_info_, "+%s: !bUsedWoWLANFw, FmrmwareLen:%d+\n", __func__, FirmwareLen); DBG_88E_LEVEL(_drv_info_, "+%s: !bUsedWoWLANFw, FmrmwareLen:%d+\n", __func__, FirmwareLen);
// To Check Fw header. Added by tynli. 2009.12.04. // To Check Fw header. Added by tynli. 2009.12.04.
pFwHdr = (PRT_8188E_FIRMWARE_HDR)pFirmware->szFwBuffer; pFwHdr = (PRT_8188E_FIRMWARE_HDR)pFirmware->szFwBuffer;
@ -926,7 +926,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter)
pHalData->FirmwareSubVersion = pFwHdr->Subversion; pHalData->FirmwareSubVersion = pFwHdr->Subversion;
pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature); pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature);
DBG_871X ("%s: fw_ver=%d fw_subver=%d sig=0x%x\n", DBG_88E ("%s: fw_ver=%d fw_subver=%d sig=0x%x\n",
__func__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature); __func__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature);
if (IS_FW_HEADER_EXIST(pFwHdr)) if (IS_FW_HEADER_EXIST(pFwHdr))
@ -957,20 +957,20 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter)
) )
break; break;
DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __func__ DBG_88E("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __func__
, writeFW_retry , writeFW_retry
, rtw_get_passing_time_ms(fwdl_start_time) , rtw_get_passing_time_ms(fwdl_start_time)
); );
} }
_FWDownloadEnable(padapter, _FALSE); _FWDownloadEnable(padapter, _FALSE);
if (_SUCCESS != rtStatus){ if (_SUCCESS != rtStatus){
DBG_871X("DL Firmware failed!\n"); DBG_88E("DL Firmware failed!\n");
goto Exit; goto Exit;
} }
rtStatus = _FWFreeToGo(padapter); rtStatus = _FWFreeToGo(padapter);
if (_SUCCESS != rtStatus) { if (_SUCCESS != rtStatus) {
DBG_871X("DL Firmware failed!\n"); DBG_88E("DL Firmware failed!\n");
goto Exit; goto Exit;
} }
RT_TRACE(_module_hal_init_c_, _drv_info_, ("Firmware is ready to run!\n")); RT_TRACE(_module_hal_init_c_, _drv_info_, ("Firmware is ready to run!\n"));
@ -985,7 +985,7 @@ Exit:
if (padapter->pwrctrlpriv.wowlan_mode) if (padapter->pwrctrlpriv.wowlan_mode)
rtl8188e_InitializeFirmwareVars(padapter); rtl8188e_InitializeFirmwareVars(padapter);
else else
DBG_871X_LEVEL(_drv_always_, "%s: wowland_mode:%d wowlan_wake_reason:%d\n", DBG_88E_LEVEL(_drv_always_, "%s: wowland_mode:%d wowlan_wake_reason:%d\n",
__func__, padapter->pwrctrlpriv.wowlan_mode, __func__, padapter->pwrctrlpriv.wowlan_mode,
padapter->pwrctrlpriv.wowlan_wake_reason); padapter->pwrctrlpriv.wowlan_wake_reason);
#endif #endif
@ -1030,10 +1030,10 @@ SetFwRelatedForWoWLAN8188ES(
// //
status = rtl8188e_FirmwareDownload(padapter, bHostIsGoingtoSleep); status = rtl8188e_FirmwareDownload(padapter, bHostIsGoingtoSleep);
if (status != _SUCCESS) { if (status != _SUCCESS) {
DBG_871X("ConfigFwRelatedForWoWLAN8188ES(): Re-Download Firmware failed!!\n"); DBG_88E("ConfigFwRelatedForWoWLAN8188ES(): Re-Download Firmware failed!!\n");
return; return;
} else { } else {
DBG_871X("ConfigFwRelatedForWoWLAN8188ES(): Re-Download Firmware Success !!\n"); DBG_88E("ConfigFwRelatedForWoWLAN8188ES(): Re-Download Firmware Success !!\n");
} }
// //
// 2. Re-Init the variables about Fw related setting. // 2. Re-Init the variables about Fw related setting.
@ -1228,21 +1228,21 @@ Hal_EfuseReadEFuse88E(
// //
if ((_offset + _size_byte)>EFUSE_MAP_LEN_88E) if ((_offset + _size_byte)>EFUSE_MAP_LEN_88E)
{// total E-Fuse table is 512bytes {// total E-Fuse table is 512bytes
DBG_8192C("Hal_EfuseReadEFuse88E(): Invalid offset(%#x) with read bytes(%#x)!!\n",_offset, _size_byte); DBG_88E("Hal_EfuseReadEFuse88E(): Invalid offset(%#x) with read bytes(%#x)!!\n",_offset, _size_byte);
goto exit; goto exit;
} }
efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) if (efuseTbl == NULL)
{ {
DBG_871X("%s: alloc efuseTbl fail!\n", __func__); DBG_88E("%s: alloc efuseTbl fail!\n", __func__);
goto exit; goto exit;
} }
eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
if (eFuseWord == NULL) if (eFuseWord == NULL)
{ {
DBG_871X("%s: alloc eFuseWord fail!\n", __func__); DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
goto exit; goto exit;
} }
@ -1259,12 +1259,12 @@ Hal_EfuseReadEFuse88E(
if (*rtemp8 != 0xFF) if (*rtemp8 != 0xFF)
{ {
efuse_utilized++; efuse_utilized++;
//DBG_8192C("efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8); //DBG_88E("efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8);
eFuse_Addr++; eFuse_Addr++;
} }
else else
{ {
DBG_871X("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8); DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8);
goto exit; goto exit;
} }
@ -1492,16 +1492,16 @@ exit:
if (_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == _FALSE) if (_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == _FALSE)
{ {
int i; int i;
DBG_871X("%s compare first 0x130 byte fail\n", __func__); DBG_88E("%s compare first 0x130 byte fail\n", __func__);
for (i=0;i<512;i++) for (i=0;i<512;i++)
{ {
if (i%16==0) if (i%16==0)
DBG_871X("0x%03x: ", i); DBG_88E("0x%03x: ", i);
DBG_871X("%02x ", logical_map[i]); DBG_88E("%02x ", logical_map[i]);
if (i%16==15) if (i%16==15)
DBG_871X("\n"); DBG_88E("\n");
} }
DBG_871X("\n"); DBG_88E("\n");
} }
#endif #endif
@ -1961,7 +1961,7 @@ hal_EfusePgPacketRead_8188e(
} }
else else
{ {
DBG_8192C("Error, All words disabled\n"); DBG_88E("Error, All words disabled\n");
efuse_addr++; efuse_addr++;
continue; continue;
} }
@ -2696,7 +2696,7 @@ ReadChipVersion8188E(
pHalData->NumTotalRFPath = 1; pHalData->NumTotalRFPath = 1;
} }
MSG_8192C("RF_Type is %x!!\n", pHalData->rf_type); MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
return ChipVersion; return ChipVersion;
} }
@ -2741,14 +2741,14 @@ void rtl8188e_SetHalODMVar(
} }
#endif #endif
if (bSet){ if (bSet){
DBG_8192C("### Set STA_(%d) info\n",psta->mac_id); DBG_88E("### Set STA_(%d) info\n",psta->mac_id);
ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS,psta->mac_id,psta); ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS,psta->mac_id,psta);
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
ODM_RAInfo_Init(podmpriv,psta->mac_id); ODM_RAInfo_Init(podmpriv,psta->mac_id);
#endif #endif
} }
else{ else{
DBG_8192C("### Clean STA_(%d) info\n",psta->mac_id); DBG_88E("### Clean STA_(%d) info\n",psta->mac_id);
//_enter_critical_bh(&pHalData->odm_stainfo_lock, &irqL); //_enter_critical_bh(&pHalData->odm_stainfo_lock, &irqL);
ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS,psta->mac_id,NULL); ODM_CmnInfoPtrArrayHook(podmpriv, ODM_CMNINFO_STA_STATUS,psta->mac_id,NULL);
@ -2832,10 +2832,10 @@ void rtl8188e_stop_thread(_adapter *padapter)
void hal_notch_filter_8188e(_adapter *adapter, bool enable) void hal_notch_filter_8188e(_adapter *adapter, bool enable)
{ {
if (enable) { if (enable) {
DBG_871X("Enable notch filter\n"); DBG_88E("Enable notch filter\n");
rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) | BIT1); rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) | BIT1);
} else { } else {
DBG_871X("Disable notch filter\n"); DBG_88E("Disable notch filter\n");
rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1); rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1);
} }
} }
@ -2913,7 +2913,7 @@ u8 GetEEPROMSize8188E(PADAPTER padapter)
// 6: EEPROM used is 93C46, 4: boot from E-Fuse. // 6: EEPROM used is 93C46, 4: boot from E-Fuse.
size = (cr & BOOT_FROM_EEPROM) ? 6 : 4; size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
MSG_8192C("EEPROM type is %s\n", size==4 ? "E-FUSE" : "93C46"); MSG_88E("EEPROM type is %s\n", size==4 ? "E-FUSE" : "93C46");
return size; return size;
} }
@ -3076,7 +3076,7 @@ Hal_EfuseParseIDCode88E(
EEPROMId = le16_to_cpu(*((u16*)hwinfo)); EEPROMId = le16_to_cpu(*((u16*)hwinfo));
if (EEPROMId != RTL_EEPROM_ID) if (EEPROMId != RTL_EEPROM_ID)
{ {
DBG_8192C("EEPROM ID(%#x) is invalid!!\n", EEPROMId); DBG_88E("EEPROM ID(%#x) is invalid!!\n", EEPROMId);
pEEPROM->bautoload_fail_flag = _TRUE; pEEPROM->bautoload_fail_flag = _TRUE;
} }
else else
@ -3084,7 +3084,7 @@ Hal_EfuseParseIDCode88E(
pEEPROM->bautoload_fail_flag = _FALSE; pEEPROM->bautoload_fail_flag = _FALSE;
} }
DBG_871X("EEPROM ID=0x%04x\n", EEPROMId); DBG_88E("EEPROM ID=0x%04x\n", EEPROMId);
} }
static void static void
@ -3369,10 +3369,10 @@ void Hal_ReadPowerSavingMode88E(
//if (SUPPORT_HW_RADIO_DETECT(Adapter)) //if (SUPPORT_HW_RADIO_DETECT(Adapter))
//Adapter->registrypriv.usbss_enable = Adapter->pwrctrlpriv.bSupportRemoteWakeup ; //Adapter->registrypriv.usbss_enable = Adapter->pwrctrlpriv.bSupportRemoteWakeup ;
DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__, DBG_88E("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__,
padapter->pwrctrlpriv.bHWPwrPindetect,padapter->pwrctrlpriv.bHWPowerdown ,padapter->pwrctrlpriv.bSupportRemoteWakeup); padapter->pwrctrlpriv.bHWPwrPindetect,padapter->pwrctrlpriv.bHWPowerdown ,padapter->pwrctrlpriv.bSupportRemoteWakeup);
DBG_8192C("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n",padapter->registrypriv.power_mgnt,padapter->registrypriv.usbss_enable); DBG_88E("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n",padapter->registrypriv.power_mgnt,padapter->registrypriv.usbss_enable);
} }
@ -3414,9 +3414,9 @@ Hal_ReadTxPowerInfo88E(
if (bIn24G) if (bIn24G)
{ {
DBG_871X("======= Path %d, Channel %d =======\n",rfPath,ch ); DBG_88E("======= Path %d, Channel %d =======\n",rfPath,ch );
DBG_871X("Index24G_CCK_Base[%d][%d] = 0x%x\n",rfPath,ch ,pHalData->Index24G_CCK_Base[rfPath][ch]); DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n",rfPath,ch ,pHalData->Index24G_CCK_Base[rfPath][ch]);
DBG_871X("Index24G_BW40_Base[%d][%d] = 0x%x\n",rfPath,ch ,pHalData->Index24G_BW40_Base[rfPath][ch]); DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n",rfPath,ch ,pHalData->Index24G_BW40_Base[rfPath][ch]);
} }
} }
@ -3427,11 +3427,11 @@ Hal_ReadTxPowerInfo88E(
pHalData->BW20_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW20_Diff[rfPath][TxCount]; pHalData->BW20_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW20_Diff[rfPath][TxCount];
pHalData->BW40_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW40_Diff[rfPath][TxCount]; pHalData->BW40_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW40_Diff[rfPath][TxCount];
#if DBG #if DBG
DBG_871X("======= TxCount %d =======\n",TxCount ); DBG_88E("======= TxCount %d =======\n",TxCount );
DBG_871X("CCK_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->CCK_24G_Diff[rfPath][TxCount]); DBG_88E("CCK_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->CCK_24G_Diff[rfPath][TxCount]);
DBG_871X("OFDM_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->OFDM_24G_Diff[rfPath][TxCount]); DBG_88E("OFDM_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->OFDM_24G_Diff[rfPath][TxCount]);
DBG_871X("BW20_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW20_24G_Diff[rfPath][TxCount]); DBG_88E("BW20_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW20_24G_Diff[rfPath][TxCount]);
DBG_871X("BW40_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW40_24G_Diff[rfPath][TxCount]); DBG_88E("BW40_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW40_24G_Diff[rfPath][TxCount]);
#endif #endif
} }
} }
@ -3448,7 +3448,7 @@ Hal_ReadTxPowerInfo88E(
{ {
pHalData->EEPROMRegulatory = 0; pHalData->EEPROMRegulatory = 0;
} }
DBG_871X("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory); DBG_88E("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory);
} }
@ -3472,7 +3472,7 @@ Hal_EfuseParseXtal_8188E(
{ {
pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E; pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E;
} }
DBG_871X("CrystalCap: 0x%2x\n", pHalData->CrystalCap); DBG_88E("CrystalCap: 0x%2x\n", pHalData->CrystalCap);
} }
void void
@ -3488,7 +3488,7 @@ Hal_EfuseParseBoardType88E(
pHalData->BoardType = ((hwinfo[EEPROM_RF_BOARD_OPTION_88E]&0xE0)>>5); pHalData->BoardType = ((hwinfo[EEPROM_RF_BOARD_OPTION_88E]&0xE0)>>5);
else else
pHalData->BoardType = 0; pHalData->BoardType = 0;
DBG_871X("Board Type: 0x%2x\n", pHalData->BoardType); DBG_88E("Board Type: 0x%2x\n", pHalData->BoardType);
} }
void void
@ -3527,7 +3527,7 @@ rtl8188e_EfuseParseChnlPlan(
, AutoLoadFail , AutoLoadFail
); );
DBG_871X("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan); DBG_88E("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan);
} }
void void
@ -3549,8 +3549,8 @@ Hal_EfuseParseCustomerID88E(
pHalData->EEPROMCustomerID = 0; pHalData->EEPROMCustomerID = 0;
pHalData->EEPROMSubCustomerID = 0; pHalData->EEPROMSubCustomerID = 0;
} }
DBG_871X("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID); DBG_88E("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID);
//DBG_871X("EEPROM SubCustomer ID: 0x%02x\n", pHalData->EEPROMSubCustomerID); //DBG_88E("EEPROM SubCustomer ID: 0x%02x\n", pHalData->EEPROMSubCustomerID);
} }
@ -3597,7 +3597,7 @@ Hal_ReadAntennaDiversity88E(
pHalData->TRxAntDivType = pHalData->TRxAntDivType; // The value in the driver setting of device manager. pHalData->TRxAntDivType = pHalData->TRxAntDivType; // The value in the driver setting of device manager.
} }
DBG_871X("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType); DBG_88E("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType);
} }
@ -3628,7 +3628,7 @@ Hal_ReadThermalMeter_88E(
} }
//pHalData->ThermalMeter[0] = pHalData->EEPROMThermalMeter; //pHalData->ThermalMeter[0] = pHalData->EEPROMThermalMeter;
DBG_871X("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter); DBG_88E("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter);
} }
@ -3658,7 +3658,7 @@ bool HalDetectPwrDownMode88E(PADAPTER Adapter)
pHalData->pwrdown = _FALSE; pHalData->pwrdown = _FALSE;
} }
DBG_8192C("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown); DBG_88E("HalDetectPwrDownMode(): PDN=%d\n", pHalData->pwrdown);
return pHalData->pwrdown; return pHalData->pwrdown;
} // HalDetectPwrDownMode } // HalDetectPwrDownMode
@ -3667,7 +3667,7 @@ bool HalDetectPwrDownMode88E(PADAPTER Adapter)
void Hal_DetectWoWMode(PADAPTER pAdapter) void Hal_DetectWoWMode(PADAPTER pAdapter)
{ {
pAdapter->pwrctrlpriv.bSupportRemoteWakeup = _TRUE; pAdapter->pwrctrlpriv.bSupportRemoteWakeup = _TRUE;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
#endif #endif
@ -3687,7 +3687,7 @@ void Hal_ReadRFGainOffset(
Adapter->eeprompriv.EEPROMRFGainOffset = buff[EEPROM_RF_GAIN_OFFSET_88E]; Adapter->eeprompriv.EEPROMRFGainOffset = buff[EEPROM_RF_GAIN_OFFSET_88E];
else else
Adapter->eeprompriv.EEPROMRFGainOffset = EEPROM_Default_RFGainOffset; Adapter->eeprompriv.EEPROMRFGainOffset = EEPROM_Default_RFGainOffset;
DBG_871X("EEPRORFGainOffset = 0x%02x\n", Adapter->eeprompriv.EEPROMRFGainOffset); DBG_88E("EEPRORFGainOffset = 0x%02x\n", Adapter->eeprompriv.EEPROMRFGainOffset);
} }
#endif //CONFIG_RF_GAIN_OFFSET #endif //CONFIG_RF_GAIN_OFFSET

10
hal/rtl8188e_phycfg.c
View file

@ -539,14 +539,14 @@ phy_RFSerialRead(
if (RfPiEnable) if (RfPiEnable)
{ // Read from BBreg8b8, 12 bits for 8190, 20bits for T65 RF { // Read from BBreg8b8, 12 bits for 8190, 20bits for T65 RF
retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBackPi, bLSSIReadBackData); retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBackPi, bLSSIReadBackData);
//DBG_8192C("Readback from RF-PI : 0x%x\n", retValue); //DBG_88E("Readback from RF-PI : 0x%x\n", retValue);
} }
else else
{ //Read from BBreg8a0, 12 bits for 8190, 20 bits for T65 RF { //Read from BBreg8a0, 12 bits for 8190, 20 bits for T65 RF
retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBack, bLSSIReadBackData); retValue = PHY_QueryBBReg(Adapter, pPhyReg->rfLSSIReadBack, bLSSIReadBackData);
//DBG_8192C("Readback from RF-SI : 0x%x\n", retValue); //DBG_88E("Readback from RF-SI : 0x%x\n", retValue);
} }
//DBG_8192C("RFR-%d Addr[0x%x]=0x%x\n", eRFPath, pPhyReg->rfLSSIReadBack, retValue); //DBG_88E("RFR-%d Addr[0x%x]=0x%x\n", eRFPath, pPhyReg->rfLSSIReadBack, retValue);
return retValue; return retValue;
@ -1517,7 +1517,7 @@ phy_BB8188E_Config_ParaFile(
//if (pHalData->rf_type == RF_1T2R) //if (pHalData->rf_type == RF_1T2R)
//{ //{
//phy_BB8192C_Config_1T(Adapter); //phy_BB8192C_Config_1T(Adapter);
//DBG_8192C("phy_BB8188E_Config_ParaFile():Config to 1T!!\n"); //DBG_88E("phy_BB8188E_Config_ParaFile():Config to 1T!!\n");
//} //}
// //
@ -2611,7 +2611,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel)
if ( Adapter->bNotifyChannelChange ) if ( Adapter->bNotifyChannelChange )
{ {
DBG_871X( "[%s] ch = %d\n", __func__, channel ); DBG_88E( "[%s] ch = %d\n", __func__, channel );
} }
//s1. pre common command - CmdID_SetTxPowerLevel //s1. pre common command - CmdID_SetTxPowerLevel

6
hal/rtl8188e_rf6052.c
View file

@ -304,7 +304,7 @@ void getPowerBase88E(
powerBase0 = (powerBase0<<24) | (powerBase0<<16) |(powerBase0<<8) |powerBase0; powerBase0 = (powerBase0<<24) | (powerBase0<<16) |(powerBase0<<8) |powerBase0;
*(OfdmBase+i) = powerBase0; *(OfdmBase+i) = powerBase0;
//DBG_871X(" [OFDM power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(OfdmBase+i)); //DBG_88E(" [OFDM power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(OfdmBase+i));
} }
for (i=0; i<pHalData->NumTotalRFPath; i++) for (i=0; i<pHalData->NumTotalRFPath; i++)
@ -321,7 +321,7 @@ void getPowerBase88E(
powerBase1 = powerlevel[i]; powerBase1 = powerlevel[i];
powerBase1 = (powerBase1<<24) | (powerBase1<<16) |(powerBase1<<8) |powerBase1; powerBase1 = (powerBase1<<24) | (powerBase1<<16) |(powerBase1<<8) |powerBase1;
*(MCSBase+i) = powerBase1; *(MCSBase+i) = powerBase1;
//DBG_871X(" [MCS power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(MCSBase+i)); //DBG_88E(" [MCS power base index rf(%c) = 0x%x]\n", ((i==0)?'A':'B'), *(MCSBase+i));
} }
} }
@ -592,7 +592,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
u8 index = 0; u8 index = 0;
//DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel); //DBG_88E("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel);
getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]); getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]);

6
hal/rtl8188e_rxdesc.c
View file

@ -45,7 +45,7 @@ static void process_rssi(_adapter *padapter,union recv_frame *prframe)
struct signal_stat * signal_stat = &padapter->recvpriv.signal_strength_data; struct signal_stat * signal_stat = &padapter->recvpriv.signal_strength_data;
#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS #endif //CONFIG_NEW_SIGNAL_STAT_PROCESS
//DBG_8192C("process_rssi=> pattrib->rssil(%d) signal_strength(%d)\n ",pattrib->RecvSignalPower,pattrib->signal_strength); //DBG_88E("process_rssi=> pattrib->rssil(%d) signal_strength(%d)\n ",pattrib->RecvSignalPower,pattrib->signal_strength);
//if (pRfd->Status.bPacketToSelf || pRfd->Status.bPacketBeacon) //if (pRfd->Status.bPacketToSelf || pRfd->Status.bPacketBeacon)
{ {
@ -110,7 +110,7 @@ static void process_link_qual(_adapter *padapter,union recv_frame *prframe)
signal_stat = &padapter->recvpriv.signal_qual_data; signal_stat = &padapter->recvpriv.signal_qual_data;
#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS #endif //CONFIG_NEW_SIGNAL_STAT_PROCESS
//DBG_8192C("process_link_qual=> pattrib->signal_qual(%d)\n ",pattrib->signal_qual); //DBG_88E("process_link_qual=> pattrib->signal_qual(%d)\n ",pattrib->signal_qual);
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
if (signal_stat->update_req) { if (signal_stat->update_req) {
@ -308,7 +308,7 @@ void update_recvframe_phyinfo_88e(
if (psta) if (psta)
{ {
pkt_info.StationID = psta->mac_id; pkt_info.StationID = psta->mac_id;
//DBG_8192C("%s ==> StationID(%d)\n",__func__,pkt_info.StationID); //DBG_88E("%s ==> StationID(%d)\n",__func__,pkt_info.StationID);
} }
pkt_info.Rate = pattrib->mcs_rate; pkt_info.Rate = pattrib->mcs_rate;
//rtl8188e_query_rx_phy_status(precvframe, pphy_status); //rtl8188e_query_rx_phy_status(precvframe, pphy_status);

14
hal/rtl8188e_sreset.c
View file

@ -142,7 +142,7 @@ void rtl8188e_silentreset_for_specific_platform(_adapter *padapter)
#ifdef DBG_CONFIG_ERROR_RESET #ifdef DBG_CONFIG_ERROR_RESET
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
@ -189,13 +189,13 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
u32 txdma_status; u32 txdma_status;
if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00){ if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00){
DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status); DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
rtw_write32(padapter,REG_TXDMA_STATUS,txdma_status); rtw_write32(padapter,REG_TXDMA_STATUS,txdma_status);
rtl8188e_silentreset_for_specific_platform(padapter); rtl8188e_silentreset_for_specific_platform(padapter);
} }
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
//total xmit irp = 4 //total xmit irp = 4
//DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__func__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); //DBG_88E("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__func__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt);
//if (pxmitpriv->txirp_cnt == NR_XMITBUFF+1) //if (pxmitpriv->txirp_cnt == NR_XMITBUFF+1)
current_time = rtw_get_current_time(); current_time = rtw_get_current_time();
if (0==pxmitpriv->free_xmitbuf_cnt) if (0==pxmitpriv->free_xmitbuf_cnt)
@ -210,7 +210,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time); diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time);
if (diff_time > 4000){ if (diff_time > 4000){
//padapter->Wifi_Error_Status = WIFI_TX_HANG; //padapter->Wifi_Error_Status = WIFI_TX_HANG;
DBG_8192C("%s tx hang\n", __func__); DBG_88E("%s tx hang\n", __func__);
rtl8188e_silentreset_for_specific_platform(padapter); rtl8188e_silentreset_for_specific_platform(padapter);
} }
} }
@ -225,16 +225,16 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter)
u8 fw_status=0; u8 fw_status=0;
rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS); rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS);
if (rx_dma_status!= 0x00){ if (rx_dma_status!= 0x00){
DBG_8192C("%s REG_RXDMA_STATUS:0x%08x\n",__func__,rx_dma_status); DBG_88E("%s REG_RXDMA_STATUS:0x%08x\n",__func__,rx_dma_status);
rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status); rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status);
} }
fw_status = rtw_read8(padapter,REG_FMETHR); fw_status = rtw_read8(padapter,REG_FMETHR);
if (fw_status != 0x00) if (fw_status != 0x00)
{ {
if (fw_status == 1) if (fw_status == 1)
DBG_8192C("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__func__,fw_status); DBG_88E("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__func__,fw_status);
else if (fw_status == 2) else if (fw_status == 2)
DBG_8192C("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__func__,fw_status); DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__func__,fw_status);
} }
} }
#endif #endif

38
hal/rtl8188e_xmit.c
View file

@ -29,7 +29,7 @@ void dump_txrpt_ccx_88e(void *buf)
{ {
struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
DBG_871X("%s:\n" DBG_88E("%s:\n"
"tag1:%u, pkt_num:%u, txdma_underflow:%u, int_bt:%u, int_tri:%u, int_ccx:%u\n" "tag1:%u, pkt_num:%u, txdma_underflow:%u, int_bt:%u, int_tri:%u, int_ccx:%u\n"
"mac_id:%u, pkt_ok:%u, bmc:%u\n" "mac_id:%u, pkt_ok:%u, bmc:%u\n"
"retry_cnt:%u, lifetime_over:%u, retry_over:%u\n" "retry_cnt:%u, lifetime_over:%u, retry_over:%u\n"
@ -70,13 +70,13 @@ void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc)
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt)); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt));
if (bDumpTxPkt ==1){//dump txdesc for data frame if (bDumpTxPkt ==1){//dump txdesc for data frame
DBG_871X("dump tx_desc for data frame\n"); DBG_88E("dump tx_desc for data frame\n");
if ((frame_tag&0x0f) == DATA_FRAMETAG){ if ((frame_tag&0x0f) == DATA_FRAMETAG){
bDumpTxDesc = _TRUE; bDumpTxDesc = _TRUE;
} }
} }
else if (bDumpTxPkt ==2){//dump txdesc for mgnt frame else if (bDumpTxPkt ==2){//dump txdesc for mgnt frame
DBG_871X("dump tx_desc for mgnt frame\n"); DBG_88E("dump tx_desc for mgnt frame\n");
if ((frame_tag&0x0f) == MGNT_FRAMETAG){ if ((frame_tag&0x0f) == MGNT_FRAMETAG){
bDumpTxDesc = _TRUE; bDumpTxDesc = _TRUE;
} }
@ -87,16 +87,16 @@ void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc)
if (bDumpTxDesc){ if (bDumpTxDesc){
// ptxdesc->txdw4 = cpu_to_le32(0x00001006);//RTS Rate=24M // ptxdesc->txdw4 = cpu_to_le32(0x00001006);//RTS Rate=24M
// ptxdesc->txdw6 = 0x6666f800; // ptxdesc->txdw6 = 0x6666f800;
DBG_8192C("=====================================\n"); DBG_88E("=====================================\n");
DBG_8192C("txdw0(0x%08x)\n",ptxdesc->txdw0); DBG_88E("txdw0(0x%08x)\n",ptxdesc->txdw0);
DBG_8192C("txdw1(0x%08x)\n",ptxdesc->txdw1); DBG_88E("txdw1(0x%08x)\n",ptxdesc->txdw1);
DBG_8192C("txdw2(0x%08x)\n",ptxdesc->txdw2); DBG_88E("txdw2(0x%08x)\n",ptxdesc->txdw2);
DBG_8192C("txdw3(0x%08x)\n",ptxdesc->txdw3); DBG_88E("txdw3(0x%08x)\n",ptxdesc->txdw3);
DBG_8192C("txdw4(0x%08x)\n",ptxdesc->txdw4); DBG_88E("txdw4(0x%08x)\n",ptxdesc->txdw4);
DBG_8192C("txdw5(0x%08x)\n",ptxdesc->txdw5); DBG_88E("txdw5(0x%08x)\n",ptxdesc->txdw5);
DBG_8192C("txdw6(0x%08x)\n",ptxdesc->txdw6); DBG_88E("txdw6(0x%08x)\n",ptxdesc->txdw6);
DBG_8192C("txdw7(0x%08x)\n",ptxdesc->txdw7); DBG_88E("txdw7(0x%08x)\n",ptxdesc->txdw7);
DBG_8192C("=====================================\n"); DBG_88E("=====================================\n");
} }
} }
@ -145,9 +145,9 @@ InsertEMContent_8188E(
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
{ {
int i; int i;
DBG_8192C("\n%s ==> pEMInfo->EMPktNum =%d\n",__func__,pEMInfo->EMPktNum); DBG_88E("\n%s ==> pEMInfo->EMPktNum =%d\n",__func__,pEMInfo->EMPktNum);
for (i=0;i< EARLY_MODE_MAX_PKT_NUM;i++){ for (i=0;i< EARLY_MODE_MAX_PKT_NUM;i++){
DBG_8192C("%s ==> pEMInfo->EMPktLen[%d] =%d\n",__func__,i,pEMInfo->EMPktLen[i]); DBG_88E("%s ==> pEMInfo->EMPktLen[%d] =%d\n",__func__,i,pEMInfo->EMPktLen[i]);
} }
} }
@ -227,12 +227,12 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit
pmem= pframe->buf_addr; pmem= pframe->buf_addr;
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
DBG_8192C("\n%s ==> agg_num:%d\n",__func__, pframe->agg_num); DBG_88E("\n%s ==> agg_num:%d\n",__func__, pframe->agg_num);
for (index=0;index<pframe->agg_num;index++){ for (index=0;index<pframe->agg_num;index++){
offset = pxmitpriv->agg_pkt[index].offset; offset = pxmitpriv->agg_pkt[index].offset;
pktlen = pxmitpriv->agg_pkt[index].pkt_len; pktlen = pxmitpriv->agg_pkt[index].pkt_len;
DBG_8192C("%s ==> agg_pkt[%d].offset=%d\n",__func__,index,offset); DBG_88E("%s ==> agg_pkt[%d].offset=%d\n",__func__,index,offset);
DBG_8192C("%s ==> agg_pkt[%d].pkt_len=%d\n",__func__,index,pktlen); DBG_88E("%s ==> agg_pkt[%d].pkt_len=%d\n",__func__,index,pktlen);
} }
#endif #endif
@ -277,7 +277,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit
} }
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
DBG_8192C("%s ==> desc.pkt_len=%d\n",__func__,ptxdesc->pktlen); DBG_88E("%s ==> desc.pkt_len=%d\n",__func__,ptxdesc->pktlen);
#endif #endif
InsertEMContent_8188E(&eminfo,pEMInfo_mem); InsertEMContent_8188E(&eminfo,pEMInfo_mem);
} }

8
hal/rtl8188eu_recv.c
View file

@ -80,14 +80,14 @@ int rtl8188eu_init_recv_priv(_adapter *padapter)
precvpriv->int_in_urb = usb_alloc_urb(0, GFP_KERNEL); precvpriv->int_in_urb = usb_alloc_urb(0, GFP_KERNEL);
if (precvpriv->int_in_urb == NULL){ if (precvpriv->int_in_urb == NULL){
res= _FAIL; res= _FAIL;
DBG_8192C("alloc_urb for interrupt in endpoint fail !!!!\n"); DBG_88E("alloc_urb for interrupt in endpoint fail !!!!\n");
goto exit; goto exit;
} }
#endif #endif
precvpriv->int_in_buf = rtw_zmalloc(INTERRUPT_MSG_FORMAT_LEN); precvpriv->int_in_buf = rtw_zmalloc(INTERRUPT_MSG_FORMAT_LEN);
if (precvpriv->int_in_buf == NULL){ if (precvpriv->int_in_buf == NULL){
res= _FAIL; res= _FAIL;
DBG_8192C("alloc_mem for interrupt in endpoint fail !!!!\n"); DBG_88E("alloc_mem for interrupt in endpoint fail !!!!\n");
goto exit; goto exit;
} }
#endif #endif
@ -217,7 +217,7 @@ void rtl8188eu_free_recv_priv (_adapter *padapter)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
if (skb_queue_len(&precvpriv->rx_skb_queue)) { if (skb_queue_len(&precvpriv->rx_skb_queue)) {
DBG_8192C(KERN_WARNING "rx_skb_queue not empty\n"); DBG_88E(KERN_WARNING "rx_skb_queue not empty\n");
} }
skb_queue_purge(&precvpriv->rx_skb_queue); skb_queue_purge(&precvpriv->rx_skb_queue);
@ -225,7 +225,7 @@ void rtl8188eu_free_recv_priv (_adapter *padapter)
#ifdef CONFIG_PREALLOC_RECV_SKB #ifdef CONFIG_PREALLOC_RECV_SKB
if (skb_queue_len(&precvpriv->free_recv_skb_queue)) { if (skb_queue_len(&precvpriv->free_recv_skb_queue)) {
DBG_8192C(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue)); DBG_88E(KERN_WARNING "free_recv_skb_queue not empty, %d\n", skb_queue_len(&precvpriv->free_recv_skb_queue));
} }
skb_queue_purge(&precvpriv->free_recv_skb_queue); skb_queue_purge(&precvpriv->free_recv_skb_queue);

68
hal/rtl8188eu_xmit.c
View file

@ -194,7 +194,7 @@ void fill_txdesc_sectype(struct pkt_attrib *pattrib, struct tx_desc *ptxdesc)
void fill_txdesc_vcs(struct pkt_attrib *pattrib, u32 *pdw) void fill_txdesc_vcs(struct pkt_attrib *pattrib, u32 *pdw)
{ {
//DBG_8192C("cvs_mode=%d\n", pattrib->vcs_mode); //DBG_88E("cvs_mode=%d\n", pattrib->vcs_mode);
switch (pattrib->vcs_mode) switch (pattrib->vcs_mode)
{ {
@ -231,7 +231,7 @@ void fill_txdesc_vcs(struct pkt_attrib *pattrib, u32 *pdw)
void fill_txdesc_phy(struct pkt_attrib *pattrib, u32 *pdw) void fill_txdesc_phy(struct pkt_attrib *pattrib, u32 *pdw)
{ {
//DBG_8192C("bwmode=%d, ch_off=%d\n", pattrib->bwmode, pattrib->ch_offset); //DBG_88E("bwmode=%d, ch_off=%d\n", pattrib->bwmode, pattrib->ch_offset);
if (pattrib->ht_en) if (pattrib->ht_en)
{ {
@ -280,7 +280,7 @@ if (padapter->registrypriv.mp_mode == 0)
//if ((!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==_FALSE)) //if ((!bagg_pkt) &&(rtw_usb_bulk_size_boundary(padapter,TXDESC_SIZE+sz)==_FALSE))
{ {
ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ); ptxdesc = (struct tx_desc *)(pmem+PACKET_OFFSET_SZ);
//DBG_8192C("==> non-agg-pkt,shift pointer...\n"); //DBG_88E("==> non-agg-pkt,shift pointer...\n");
pull = 1; pull = 1;
} }
} }
@ -290,7 +290,7 @@ if (padapter->registrypriv.mp_mode == 0)
//4 offset 0 //4 offset 0
ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG);
//DBG_8192C("%s==> pkt_len=%d,bagg_pkt=%02x\n",__func__,sz,bagg_pkt); //DBG_88E("%s==> pkt_len=%d,bagg_pkt=%02x\n",__func__,sz,bagg_pkt);
ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);//update TXPKTSIZE ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);//update TXPKTSIZE
offset = TXDESC_SIZE + OFFSET_SZ; offset = TXDESC_SIZE + OFFSET_SZ;
@ -300,7 +300,7 @@ if (padapter->registrypriv.mp_mode == 0)
offset += EARLY_MODE_INFO_SIZE ;//0x28 offset += EARLY_MODE_INFO_SIZE ;//0x28
} }
#endif #endif
//DBG_8192C("%s==>offset(0x%02x)\n",__func__,offset); //DBG_88E("%s==>offset(0x%02x)\n",__func__,offset);
ptxdesc->txdw0 |= cpu_to_le32(((offset) << OFFSET_SHT) & 0x00ff0000);//32 bytes for TX Desc ptxdesc->txdw0 |= cpu_to_le32(((offset) << OFFSET_SHT) & 0x00ff0000);//32 bytes for TX Desc
if (bmcst) ptxdesc->txdw0 |= cpu_to_le32(BMC); if (bmcst) ptxdesc->txdw0 |= cpu_to_le32(BMC);
@ -315,7 +315,7 @@ if (padapter->registrypriv.mp_mode == 0)
} }
} }
#endif #endif
//DBG_8192C("%s, pkt_offset=0x%02x\n",__func__,pxmitframe->pkt_offset); //DBG_88E("%s, pkt_offset=0x%02x\n",__func__,pxmitframe->pkt_offset);
// pkt_offset, unit:8 bytes padding // pkt_offset, unit:8 bytes padding
if (pxmitframe->pkt_offset > 0) if (pxmitframe->pkt_offset > 0)
@ -326,13 +326,13 @@ if (padapter->registrypriv.mp_mode == 0)
if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG)
{ {
//DBG_8192C("pxmitframe->frame_tag == DATA_FRAMETAG\n"); //DBG_88E("pxmitframe->frame_tag == DATA_FRAMETAG\n");
//offset 4 //offset 4
ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3F); ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3F);
qsel = (uint)(pattrib->qsel & 0x0000001f); qsel = (uint)(pattrib->qsel & 0x0000001f);
//DBG_8192C("==> macid(%d) qsel:0x%02x\n",pattrib->mac_id,qsel); //DBG_88E("==> macid(%d) qsel:0x%02x\n",pattrib->mac_id,qsel);
ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00); ptxdesc->txdw1 |= cpu_to_le32((qsel << QSEL_SHT) & 0x00001f00);
ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< RATE_ID_SHT) & 0x000F0000); ptxdesc->txdw1 |= cpu_to_le32((pattrib->raid<< RATE_ID_SHT) & 0x000F0000);
@ -367,7 +367,7 @@ if (padapter->registrypriv.mp_mode == 0)
//offset 20 //offset 20
#ifdef CONFIG_USB_TX_AGGREGATION #ifdef CONFIG_USB_TX_AGGREGATION
if (pxmitframe->agg_num > 1){ if (pxmitframe->agg_num > 1){
//DBG_8192C("%s agg_num:%d\n",__func__,pxmitframe->agg_num ); //DBG_88E("%s agg_num:%d\n",__func__,pxmitframe->agg_num );
ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000); ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000);
} }
#endif #endif
@ -432,13 +432,13 @@ if (padapter->registrypriv.mp_mode == 0)
// ptxdesc->txdw6 = 0; // clear TCP_CHECKSUM and IP_CHECKSUM. It's zero already!! // ptxdesc->txdw6 = 0; // clear TCP_CHECKSUM and IP_CHECKSUM. It's zero already!!
u8 ip_hdr_offset = 32 + pattrib->hdrlen + pattrib->iv_len + 8; u8 ip_hdr_offset = 32 + pattrib->hdrlen + pattrib->iv_len + 8;
ptxdesc->txdw7 = (1 << 31) | (ip_hdr_offset << 16); ptxdesc->txdw7 = (1 << 31) | (ip_hdr_offset << 16);
DBG_8192C("ptxdesc->txdw7 = %08x\n", ptxdesc->txdw7); DBG_88E("ptxdesc->txdw7 = %08x\n", ptxdesc->txdw7);
} }
#endif #endif
} }
else if ((pxmitframe->frame_tag&0x0f)== MGNT_FRAMETAG) else if ((pxmitframe->frame_tag&0x0f)== MGNT_FRAMETAG)
{ {
//DBG_8192C("pxmitframe->frame_tag == MGNT_FRAMETAG\n"); //DBG_88E("pxmitframe->frame_tag == MGNT_FRAMETAG\n");
//offset 4 //offset 4
ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3f); ptxdesc->txdw1 |= cpu_to_le32(pattrib->mac_id&0x3f);
@ -457,7 +457,7 @@ if (padapter->registrypriv.mp_mode == 0)
#ifdef DBG_CCX #ifdef DBG_CCX
static u16 ccx_sw = 0x123; static u16 ccx_sw = 0x123;
ptxdesc->txdw7 |= cpu_to_le32(((ccx_sw)<<16)&0x0fff0000); ptxdesc->txdw7 |= cpu_to_le32(((ccx_sw)<<16)&0x0fff0000);
DBG_871X("%s set ccx, sw:0x%03x\n", __func__, ccx_sw); DBG_88E("%s set ccx, sw:0x%03x\n", __func__, ccx_sw);
ccx_sw = (ccx_sw+1)%0xfff; ccx_sw = (ccx_sw+1)%0xfff;
#endif #endif
ptxdesc->txdw2 |= cpu_to_le32(BIT(19)); ptxdesc->txdw2 |= cpu_to_le32(BIT(19));
@ -476,7 +476,7 @@ if (padapter->registrypriv.mp_mode == 0)
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if ((padapter->proximity.proxim_on==_TRUE)&&(pattrib->intel_proxim==_TRUE)){ if ((padapter->proximity.proxim_on==_TRUE)&&(pattrib->intel_proxim==_TRUE)){
DBG_871X("\n %s pattrib->rate=%d\n",__func__,pattrib->rate); DBG_88E("\n %s pattrib->rate=%d\n",__func__,pattrib->rate);
ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate);
} }
else else
@ -487,7 +487,7 @@ if (padapter->registrypriv.mp_mode == 0)
} }
else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG) else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG)
{ {
DBG_8192C("pxmitframe->frame_tag == TXAGG_FRAMETAG\n"); DBG_88E("pxmitframe->frame_tag == TXAGG_FRAMETAG\n");
} }
#ifdef CONFIG_MP_INCLUDED #ifdef CONFIG_MP_INCLUDED
else if (((pxmitframe->frame_tag&0x0f) == MP_FRAMETAG) && else if (((pxmitframe->frame_tag&0x0f) == MP_FRAMETAG) &&
@ -498,7 +498,7 @@ if (padapter->registrypriv.mp_mode == 0)
#endif #endif
else else
{ {
DBG_8192C("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag); DBG_88E("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag);
//offset 4 //offset 4
ptxdesc->txdw1 |= cpu_to_le32((4)&0x3f);//CAM_ID(MAC_ID) ptxdesc->txdw1 |= cpu_to_le32((4)&0x3f);//CAM_ID(MAC_ID)
@ -683,7 +683,7 @@ static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe)
rtw_count_tx_stats(padapter, pxmitframe, sz); rtw_count_tx_stats(padapter, pxmitframe, sz);
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_write_port, w_sz=%d\n", w_sz)); RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("rtw_write_port, w_sz=%d\n", w_sz));
//DBG_8192C("rtw_write_port, w_sz=%d, sz=%d, txdesc_sz=%d, tid=%d\n", w_sz, sz, w_sz-sz, pattrib->priority); //DBG_88E("rtw_write_port, w_sz=%d, sz=%d, txdesc_sz=%d, tid=%d\n", w_sz, sz, w_sz-sz, pattrib->priority);
mem_addr += w_sz; mem_addr += w_sz;
@ -755,12 +755,12 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL){ if (pxmitbuf == NULL){
//DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__func__); //DBG_88E("%s #1, connot alloc xmitbuf!!!!\n",__func__);
return _FALSE; return _FALSE;
} }
} }
//DBG_8192C("%s =====================================\n",__func__); //DBG_88E("%s =====================================\n",__func__);
//3 1. pick up first frame //3 1. pick up first frame
do { do {
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
@ -768,7 +768,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
pxmitframe = rtw_dequeue_xframe(pxmitpriv, pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry); pxmitframe = rtw_dequeue_xframe(pxmitpriv, pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
// no more xmit frame, release xmit buffer // no more xmit frame, release xmit buffer
//DBG_8192C("no more xmit frame ,return\n"); //DBG_88E("no more xmit frame ,return\n");
rtw_free_xmitbuf(pxmitpriv, pxmitbuf); rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
return _FALSE; return _FALSE;
} }
@ -792,7 +792,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
continue; continue;
} }
#endif #endif
//DBG_8192C("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority); //DBG_88E("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority);
pxmitframe->pxmitbuf = pxmitbuf; pxmitframe->pxmitbuf = pxmitbuf;
pxmitframe->buf_addr = pxmitbuf->pbuf; pxmitframe->buf_addr = pxmitbuf->pbuf;
pxmitbuf->priv_data = pxmitframe; pxmitbuf->priv_data = pxmitframe;
@ -864,7 +864,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
phwxmit = pxmitpriv->hwxmits + 2; phwxmit = pxmitpriv->hwxmits + 2;
break; break;
} }
//DBG_8192C("==> pkt_no=%d,pkt_len=%d,len=%d,RND8_LEN=%d,pkt_offset=0x%02x\n", //DBG_88E("==> pkt_no=%d,pkt_len=%d,len=%d,RND8_LEN=%d,pkt_offset=0x%02x\n",
//pxmitframe->agg_num,pxmitframe->attrib.last_txcmdsz,len,pbuf,pxmitframe->pkt_offset ); //pxmitframe->agg_num,pxmitframe->attrib.last_txcmdsz,len,pbuf,pxmitframe->pkt_offset );
@ -890,7 +890,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) if (_RND8(pbuf + len) > MAX_XMITBUF_SZ)
//if (_RND8(pbuf + len) > (MAX_XMITBUF_SZ/2))//to do : for TX TP finial tune , Georgia 2012-0323 //if (_RND8(pbuf + len) > (MAX_XMITBUF_SZ/2))//to do : for TX TP finial tune , Georgia 2012-0323
{ {
//DBG_8192C("%s....len> MAX_XMITBUF_SZ\n",__func__); //DBG_88E("%s....len> MAX_XMITBUF_SZ\n",__func__);
pxmitframe->agg_num = 1; pxmitframe->agg_num = 1;
pxmitframe->pkt_offset = 1; pxmitframe->pkt_offset = 1;
break; break;
@ -928,12 +928,12 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
#else #else
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
if (res == _FALSE) { if (res == _FALSE) {
DBG_871X("%s coalesce failed\n",__func__); DBG_88E("%s coalesce failed\n",__func__);
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
continue; continue;
} }
#endif #endif
//DBG_8192C("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority); //DBG_88E("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority);
// always return ndis_packet after rtw_xmitframe_coalesce // always return ndis_packet after rtw_xmitframe_coalesce
rtw_os_xmit_complete(padapter, pxmitframe); rtw_os_xmit_complete(padapter, pxmitframe);
@ -987,7 +987,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
pbuf_tail -= PACKET_OFFSET_SZ; pbuf_tail -= PACKET_OFFSET_SZ;
pfirstframe->buf_addr += PACKET_OFFSET_SZ; pfirstframe->buf_addr += PACKET_OFFSET_SZ;
pfirstframe->pkt_offset--; pfirstframe->pkt_offset--;
//DBG_8192C("$$$$$ buf size equal to USB block size $$$$$$\n"); //DBG_88E("$$$$$ buf size equal to USB block size $$$$$$\n");
} }
#endif // CONFIG_USE_USB_BUFFER_ALLOC_TX #endif // CONFIG_USE_USB_BUFFER_ALLOC_TX
@ -1003,7 +1003,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
//3 4. write xmit buffer to USB FIFO //3 4. write xmit buffer to USB FIFO
ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe); ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe);
//DBG_8192C("%s ===================================== write port,buf_size(%d)\n",__func__,pbuf_tail); //DBG_88E("%s ===================================== write port,buf_size(%d)\n",__func__,pbuf_tail);
// xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr // xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf); rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf);
@ -1063,7 +1063,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
{ {
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
} }
//DBG_8192C("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority); //DBG_88E("==> pxmitframe->attrib.priority:%d\n",pxmitframe->attrib.priority);
rtw_os_xmit_complete(padapter, pxmitframe);//always return ndis_packet after rtw_xmitframe_coalesce rtw_os_xmit_complete(padapter, pxmitframe);//always return ndis_packet after rtw_xmitframe_coalesce
} }
@ -1104,14 +1104,14 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
//DBG_8192C("==> %s\n",__func__); //DBG_88E("==> %s\n",__func__);
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
if (res == _SUCCESS) { if (res == _SUCCESS) {
rtw_dump_xframe(padapter, pxmitframe); rtw_dump_xframe(padapter, pxmitframe);
} }
else{ else{
DBG_8192C("==> %s xmitframe_coalsece failed\n",__func__); DBG_88E("==> %s xmitframe_coalsece failed\n",__func__);
} }
return res; return res;
@ -1137,11 +1137,11 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
_enter_critical_bh(&pxmitpriv->lock, &irqL); _enter_critical_bh(&pxmitpriv->lock, &irqL);
//DBG_8192C("==> %s\n",__func__); //DBG_88E("==> %s\n",__func__);
if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0)
{ {
//DBG_8192C("enqueue AC(%d)\n",pattrib->priority); //DBG_88E("enqueue AC(%d)\n",pattrib->priority);
goto enqueue; goto enqueue;
} }
@ -1210,7 +1210,7 @@ static void rtl8188eu_hostap_mgnt_xmit_cb(struct urb *urb)
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
struct sk_buff *skb = (struct sk_buff *)urb->context; struct sk_buff *skb = (struct sk_buff *)urb->context;
//DBG_8192C("%s\n", __func__); //DBG_88E("%s\n", __func__);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
#endif #endif
@ -1233,7 +1233,7 @@ s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
//DBG_8192C("%s\n", __func__); //DBG_88E("%s\n", __func__);
skb = pkt; skb = pkt;
@ -1306,7 +1306,7 @@ s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
pxmitbuf = pxmitbuf + TXDESC_SIZE; pxmitbuf = pxmitbuf + TXDESC_SIZE;
_rtw_memcpy(pxmitbuf, skb->data, len); _rtw_memcpy(pxmitbuf, skb->data, len);
//DBG_8192C("mgnt_xmit, len=%x\n", pxmit_skb->len); //DBG_88E("mgnt_xmit, len=%x\n", pxmit_skb->len);
// ----- prepare urb for submit ----- // ----- prepare urb for submit -----

168
hal/usb_halinit.c
View file

@ -88,7 +88,7 @@ _ConfigNormalChipOutEP_8188E(
break; break;
} }
DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__func__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); DBG_88E("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__func__,pHalData->OutEpQueueSel,pHalData->OutEpNumber );
} }
@ -165,7 +165,7 @@ static u32 rtl8188eu_InitPowerOn(_adapter *padapter)
if (!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW)) if (!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW))
{ {
DBG_871X(KERN_ERR "%s: run power on flow fail\n", __func__); DBG_88E(KERN_ERR "%s: run power on flow fail\n", __func__);
return _FAIL; return _FAIL;
} }
@ -197,7 +197,7 @@ static void _dbg_dump_macreg(_adapter *padapter)
{ {
offset = index*4; offset = index*4;
val32 = rtw_read32(padapter,offset); val32 = rtw_read32(padapter,offset);
DBG_8192C("offset : 0x%02x ,val:0x%08x\n",offset,val32); DBG_88E("offset : 0x%02x ,val:0x%08x\n",offset,val32);
} }
} }
@ -256,7 +256,7 @@ static void _InitBTCoexist(_adapter *padapter)
if (pbtpriv->BT_Ant_isolation) if (pbtpriv->BT_Ant_isolation)
{ {
rtw_write8( padapter,REG_GPIO_MUXCFG, 0xa0); rtw_write8( padapter,REG_GPIO_MUXCFG, 0xa0);
DBG_8192C("BT write 0x%x = 0x%x\n", REG_GPIO_MUXCFG, 0xa0); DBG_88E("BT write 0x%x = 0x%x\n", REG_GPIO_MUXCFG, 0xa0);
} }
} }
//#endif //#endif
@ -266,28 +266,28 @@ static void _InitBTCoexist(_adapter *padapter)
((pbtpriv->BT_Ant_isolation==1)?0:BIT1) | ((pbtpriv->BT_Ant_isolation==1)?0:BIT1) |
((pbtpriv->BT_Service==BT_SCO)?0:BIT2); ((pbtpriv->BT_Service==BT_SCO)?0:BIT2);
rtw_write8( padapter, 0x4fd, u1Tmp); rtw_write8( padapter, 0x4fd, u1Tmp);
DBG_8192C("BT write 0x%x = 0x%x for non-isolation\n", 0x4fd, u1Tmp); DBG_88E("BT write 0x%x = 0x%x for non-isolation\n", 0x4fd, u1Tmp);
rtw_write32(padapter, REG_BT_COEX_TABLE+4, 0xaaaa9aaa); rtw_write32(padapter, REG_BT_COEX_TABLE+4, 0xaaaa9aaa);
DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+4, 0xaaaa9aaa); DBG_88E("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+4, 0xaaaa9aaa);
rtw_write32(padapter, REG_BT_COEX_TABLE+8, 0xffbd0040); rtw_write32(padapter, REG_BT_COEX_TABLE+8, 0xffbd0040);
DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+8, 0xffbd0040); DBG_88E("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+8, 0xffbd0040);
rtw_write32(padapter, REG_BT_COEX_TABLE+0xc, 0x40000010); rtw_write32(padapter, REG_BT_COEX_TABLE+0xc, 0x40000010);
DBG_8192C("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+0xc, 0x40000010); DBG_88E("BT write 0x%x = 0x%x\n", REG_BT_COEX_TABLE+0xc, 0x40000010);
//Config to 1T1R //Config to 1T1R
u1Tmp = rtw_read8(padapter,rOFDM0_TRxPathEnable); u1Tmp = rtw_read8(padapter,rOFDM0_TRxPathEnable);
u1Tmp &= ~(BIT1); u1Tmp &= ~(BIT1);
rtw_write8( padapter, rOFDM0_TRxPathEnable, u1Tmp); rtw_write8( padapter, rOFDM0_TRxPathEnable, u1Tmp);
DBG_8192C("BT write 0xC04 = 0x%x\n", u1Tmp); DBG_88E("BT write 0xC04 = 0x%x\n", u1Tmp);
u1Tmp = rtw_read8(padapter, rOFDM1_TRxPathEnable); u1Tmp = rtw_read8(padapter, rOFDM1_TRxPathEnable);
u1Tmp &= ~(BIT1); u1Tmp &= ~(BIT1);
rtw_write8( padapter, rOFDM1_TRxPathEnable, u1Tmp); rtw_write8( padapter, rOFDM1_TRxPathEnable, u1Tmp);
DBG_8192C("BT write 0xD04 = 0x%x\n", u1Tmp); DBG_88E("BT write 0xD04 = 0x%x\n", u1Tmp);
} }
} }
@ -1076,14 +1076,14 @@ _InitRFType(
if (_FALSE == is92CU){ if (_FALSE == is92CU){
pHalData->rf_type = RF_1T1R; pHalData->rf_type = RF_1T1R;
DBG_8192C("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n"); DBG_88E("Set RF Chip ID to RF_6052 and RF type to 1T1R.\n");
return; return;
} }
// TODO: Consider that EEPROM set 92CU to 1T1R later. // TODO: Consider that EEPROM set 92CU to 1T1R later.
// Force to overwrite setting according to chip version. Ignore EEPROM setting. // Force to overwrite setting according to chip version. Ignore EEPROM setting.
//pHalData->RF_Type = is92CU ? RF_2T2R : RF_1T1R; //pHalData->RF_Type = is92CU ? RF_2T2R : RF_1T1R;
MSG_8192C("Set RF Chip ID to RF_6052 and RF type to %d.\n", pHalData->rf_type); MSG_88E("Set RF Chip ID to RF_6052 and RF type to %d.\n", pHalData->rf_type);
} }
@ -1135,7 +1135,7 @@ _InitAntenna_Selection( PADAPTER Adapter)
if (pHalData->AntDivCfg==0) if (pHalData->AntDivCfg==0)
return; return;
DBG_8192C("==> %s ....\n",__func__); DBG_88E("==> %s ....\n",__func__);
rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0)|BIT23); rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0)|BIT23);
PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01);
@ -1144,7 +1144,7 @@ _InitAntenna_Selection( PADAPTER Adapter)
pHalData->CurAntenna = Antenna_A; pHalData->CurAntenna = Antenna_A;
else else
pHalData->CurAntenna = Antenna_B; pHalData->CurAntenna = Antenna_B;
DBG_8192C("%s,Cur_ant:(%x)%s\n",__func__,pHalData->CurAntenna,(pHalData->CurAntenna == Antenna_A)?"Antenna_A":"Antenna_B"); DBG_88E("%s,Cur_ant:(%x)%s\n",__func__,pHalData->CurAntenna,(pHalData->CurAntenna == Antenna_A)?"Antenna_A":"Antenna_B");
} }
@ -1226,14 +1226,14 @@ rt_rf_power_state RfOnOffDetect( PADAPTER pAdapter )
if (pAdapter->pwrctrlpriv.bHWPowerdown) if (pAdapter->pwrctrlpriv.bHWPowerdown)
{ {
val8 = rtw_read8(pAdapter, REG_HSISR); val8 = rtw_read8(pAdapter, REG_HSISR);
DBG_8192C("pwrdown, 0x5c(BIT7)=%02x\n", val8); DBG_88E("pwrdown, 0x5c(BIT7)=%02x\n", val8);
rfpowerstate = (val8 & BIT7) ? rf_off: rf_on; rfpowerstate = (val8 & BIT7) ? rf_off: rf_on;
} }
else // rf on/off else // rf on/off
{ {
rtw_write8( pAdapter, REG_MAC_PINMUX_CFG,rtw_read8(pAdapter, REG_MAC_PINMUX_CFG)&~(BIT3)); rtw_write8( pAdapter, REG_MAC_PINMUX_CFG,rtw_read8(pAdapter, REG_MAC_PINMUX_CFG)&~(BIT3));
val8 = rtw_read8(pAdapter, REG_GPIO_IO_SEL); val8 = rtw_read8(pAdapter, REG_GPIO_IO_SEL);
DBG_8192C("GPIO_IN=%02x\n", val8); DBG_88E("GPIO_IN=%02x\n", val8);
rfpowerstate = (val8 & BIT3) ? rf_on : rf_off; rfpowerstate = (val8 & BIT3) ? rf_on : rf_off;
} }
return rfpowerstate; return rfpowerstate;
@ -1340,13 +1340,13 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
Adapter->pwrctrlpriv.wowlan_wake_reason = rtw_read8(Adapter, REG_WOWLAN_WAKE_REASON); Adapter->pwrctrlpriv.wowlan_wake_reason = rtw_read8(Adapter, REG_WOWLAN_WAKE_REASON);
DBG_8192C("%s wowlan_wake_reason: 0x%02x\n", DBG_88E("%s wowlan_wake_reason: 0x%02x\n",
__func__, Adapter->pwrctrlpriv.wowlan_wake_reason); __func__, Adapter->pwrctrlpriv.wowlan_wake_reason);
if (rtw_read8(Adapter, REG_MCUFWDL)&BIT7){ /*&& if (rtw_read8(Adapter, REG_MCUFWDL)&BIT7){ /*&&
(Adapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect)) {*/ (Adapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect)) {*/
u8 reg_val=0; u8 reg_val=0;
DBG_8192C("+Reset Entry+\n"); DBG_88E("+Reset Entry+\n");
rtw_write8(Adapter, REG_MCUFWDL, 0x00); rtw_write8(Adapter, REG_MCUFWDL, 0x00);
_8051Reset88E(Adapter); _8051Reset88E(Adapter);
//reset BB //reset BB
@ -1364,7 +1364,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BEGIN);
reg_val = rtw_read8(Adapter, REG_SYS_FUNC_EN+1); reg_val = rtw_read8(Adapter, REG_SYS_FUNC_EN+1);
reg_val |= BIT(4) | BIT(7); reg_val |= BIT(4) | BIT(7);
rtw_write8(Adapter, REG_SYS_FUNC_EN+1, reg_val); rtw_write8(Adapter, REG_SYS_FUNC_EN+1, reg_val);
DBG_8192C("-Reset Entry-\n"); DBG_88E("-Reset Entry-\n");
} }
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
@ -1450,7 +1450,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW);
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
if (status != _SUCCESS) { if (status != _SUCCESS) {
DBG_871X("%s: Download Firmware failed!!\n", __func__); DBG_88E("%s: Download Firmware failed!!\n", __func__);
Adapter->bFWReady = _FALSE; Adapter->bFWReady = _FALSE;
pHalData->fw_ractrl = _FALSE; pHalData->fw_ractrl = _FALSE;
return status; return status;
@ -1467,7 +1467,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MAC);
status = PHY_MACConfig8188E(Adapter); status = PHY_MACConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init MAC ......\n "); DBG_88E(" ### Failed to init MAC ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1480,7 +1480,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BB);
status = PHY_BBConfig8188E(Adapter); status = PHY_BBConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init BB ......\n "); DBG_88E(" ### Failed to init BB ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1491,7 +1491,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_RF);
status = PHY_RFConfig8188E(Adapter); status = PHY_RFConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init RF ......\n "); DBG_88E(" ### Failed to init RF ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1500,7 +1500,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
#if defined(CONFIG_IOL_EFUSE_PATCH) #if defined(CONFIG_IOL_EFUSE_PATCH)
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if (status == _FAIL){ if (status == _FAIL){
DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__func__); DBG_88E("%s rtl8188e_iol_efuse_patch failed\n",__func__);
goto exit; goto exit;
} }
#endif #endif
@ -1715,13 +1715,13 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
exit: exit:
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
DBG_871X("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time)); DBG_88E("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
#ifdef DBG_HAL_INIT_PROFILING #ifdef DBG_HAL_INIT_PROFILING
hal_init_stages_timestamp[HAL_INIT_STAGES_END]=rtw_get_current_time(); hal_init_stages_timestamp[HAL_INIT_STAGES_END]=rtw_get_current_time();
for (hal_init_profiling_i=0;hal_init_profiling_i<HAL_INIT_STAGES_NUM-1;hal_init_profiling_i++) { for (hal_init_profiling_i=0;hal_init_profiling_i<HAL_INIT_STAGES_NUM-1;hal_init_profiling_i++) {
DBG_871X("DBG_HAL_INIT_PROFILING: %35s, %u, %5u, %5u\n" DBG_88E("DBG_HAL_INIT_PROFILING: %35s, %u, %5u, %5u\n"
, hal_init_stages_str[hal_init_profiling_i] , hal_init_stages_str[hal_init_profiling_i]
, hal_init_stages_timestamp[hal_init_profiling_i] , hal_init_stages_timestamp[hal_init_profiling_i]
, (hal_init_stages_timestamp[hal_init_profiling_i+1]-hal_init_stages_timestamp[hal_init_profiling_i]) , (hal_init_stages_timestamp[hal_init_profiling_i+1]-hal_init_stages_timestamp[hal_init_profiling_i])
@ -1826,7 +1826,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DBG_8192C("==> %s\n",__func__); DBG_88E("==> %s\n",__func__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);
@ -1834,7 +1834,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
DBG_8192C("bkeepfwalive(%x)\n",Adapter->pwrctrlpriv.bkeepfwalive); DBG_88E("bkeepfwalive(%x)\n",Adapter->pwrctrlpriv.bkeepfwalive);
if (Adapter->pwrctrlpriv.bkeepfwalive) if (Adapter->pwrctrlpriv.bkeepfwalive)
{ {
_ps_close_RF(Adapter); _ps_close_RF(Adapter);
@ -1897,7 +1897,7 @@ _func_enter_;
#ifdef CONFIG_USB_INTERRUPT_IN_PIPE #ifdef CONFIG_USB_INTERRUPT_IN_PIPE
if (pHalData->RtIntInPipe != 0x05) { if (pHalData->RtIntInPipe != 0x05) {
status = _FAIL; status = _FAIL;
DBG_871X("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n", DBG_88E("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n",
__func__,i pHalData->RtIntInPipe); __func__,i pHalData->RtIntInPipe);
goto exit; goto exit;
} }
@ -2053,8 +2053,8 @@ Hal_EfuseParsePIDVID_8188EU(
} }
DBG_871X("VID = 0x%04X, PID = 0x%04X\n", pHalData->EEPROMVID, pHalData->EEPROMPID); DBG_88E("VID = 0x%04X, PID = 0x%04X\n", pHalData->EEPROMVID, pHalData->EEPROMPID);
DBG_871X("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", pHalData->EEPROMCustomerID, pHalData->EEPROMSubCustomerID); DBG_88E("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", pHalData->EEPROMCustomerID, pHalData->EEPROMSubCustomerID);
} }
static void static void
@ -2120,21 +2120,21 @@ static u32 Hal_readPGDataFromConfigFile(
fp = filp_open("/system/etc/wifi/wifi_efuse.map", O_RDWR, 0644); fp = filp_open("/system/etc/wifi/wifi_efuse.map", O_RDWR, 0644);
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
pEEPROM->bloadfile_fail_flag = _TRUE; pEEPROM->bloadfile_fail_flag = _TRUE;
DBG_871X("Error, Efuse configure file doesn't exist.\n"); DBG_88E("Error, Efuse configure file doesn't exist.\n");
return _FAIL; return _FAIL;
} }
fs = get_fs(); fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
DBG_871X("Efuse configure file:\n"); DBG_88E("Efuse configure file:\n");
for (i=0; i<HWSET_MAX_SIZE_88E; i++) { for (i=0; i<HWSET_MAX_SIZE_88E; i++) {
vfs_read(fp, temp, 2, &pos); vfs_read(fp, temp, 2, &pos);
PROMContent[i] = simple_strtoul(temp, NULL, 16 ); PROMContent[i] = simple_strtoul(temp, NULL, 16 );
pos += 1; // Filter the space character pos += 1; // Filter the space character
DBG_871X("%02X\n", PROMContent[i]); DBG_88E("%02X\n", PROMContent[i]);
} }
DBG_871X("\n"); DBG_88E("\n");
set_fs(fs); set_fs(fs);
filp_close(fp, NULL); filp_close(fp, NULL);
@ -2167,12 +2167,12 @@ Hal_ReadMACAddrFromFile_8188EU(
fp = filp_open("/data/wifimac.txt", O_RDWR, 0644); fp = filp_open("/data/wifimac.txt", O_RDWR, 0644);
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
pEEPROM->bloadmac_fail_flag = _TRUE; pEEPROM->bloadmac_fail_flag = _TRUE;
DBG_871X("Error, wifi mac address file doesn't exist.\n"); DBG_88E("Error, wifi mac address file doesn't exist.\n");
} else { } else {
fs = get_fs(); fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
DBG_871X("wifi mac address:\n"); DBG_88E("wifi mac address:\n");
vfs_read(fp, source_addr, 18, &pos); vfs_read(fp, source_addr, 18, &pos);
source_addr[17] = ':'; source_addr[17] = ':';
@ -2190,9 +2190,9 @@ Hal_ReadMACAddrFromFile_8188EU(
end++; end++;
head = end; head = end;
} }
DBG_871X("%02x\n", pEEPROM->mac_addr[i]); DBG_88E("%02x\n", pEEPROM->mac_addr[i]);
} }
DBG_871X("\n"); DBG_88E("\n");
set_fs(fs); set_fs(fs);
pEEPROM->bloadmac_fail_flag = _FALSE; pEEPROM->bloadmac_fail_flag = _FALSE;
filp_close(fp, NULL); filp_close(fp, NULL);
@ -2208,7 +2208,7 @@ Hal_ReadMACAddrFromFile_8188EU(
pEEPROM->mac_addr[5] = (u8)((curtime>>16) & 0xff) ; pEEPROM->mac_addr[5] = (u8)((curtime>>16) & 0xff) ;
} }
DBG_871X("Hal_ReadMACAddrFromFile_8188ES: Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n", DBG_88E("Hal_ReadMACAddrFromFile_8188ES: Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n",
pEEPROM->mac_addr[0], pEEPROM->mac_addr[1], pEEPROM->mac_addr[0], pEEPROM->mac_addr[1],
pEEPROM->mac_addr[2], pEEPROM->mac_addr[3], pEEPROM->mac_addr[2], pEEPROM->mac_addr[3],
pEEPROM->mac_addr[4], pEEPROM->mac_addr[5]); pEEPROM->mac_addr[4], pEEPROM->mac_addr[5]);
@ -2283,7 +2283,7 @@ static void _ReadPROMContent(
pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? _FALSE : _TRUE; pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? _FALSE : _TRUE;
DBG_8192C("Boot from %s, Autoload %s !\n", (pEEPROM->EepromOrEfuse ? "EEPROM" : "EFUSE"), DBG_88E("Boot from %s, Autoload %s !\n", (pEEPROM->EepromOrEfuse ? "EEPROM" : "EFUSE"),
(pEEPROM->bautoload_fail_flag ? "Fail" : "OK") ); (pEEPROM->bautoload_fail_flag ? "Fail" : "OK") );
//pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE; //pHalData->EEType = IS_BOOT_FROM_EEPROM(Adapter) ? EEPROM_93C46 : EEPROM_BOOT_EFUSE;
@ -2316,7 +2316,7 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter)
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u32 start=rtw_get_current_time(); u32 start=rtw_get_current_time();
MSG_8192C("====> %s\n", __func__); MSG_88E("====> %s\n", __func__);
//Efuse_InitSomeVar(Adapter); //Efuse_InitSomeVar(Adapter);
@ -2326,9 +2326,9 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter)
_ReadRFType(Adapter);//rf_chip -> _InitRFType() _ReadRFType(Adapter);//rf_chip -> _InitRFType()
_ReadPROMContent(Adapter); _ReadPROMContent(Adapter);
//MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n", __func__, pHalData->rf_chip, pHalData->rf_type); //MSG_88E("%s()(done), rf_chip=0x%x, rf_type=0x%x\n", __func__, pHalData->rf_chip, pHalData->rf_type);
MSG_8192C("<==== %s in %d ms\n", __func__, rtw_get_passing_time_ms(start)); MSG_88E("<==== %s in %d ms\n", __func__, rtw_get_passing_time_ms(start));
return _SUCCESS; return _SUCCESS;
} }
@ -2348,14 +2348,14 @@ static void rtl8192cu_trigger_gpio_0(_adapter *padapter)
{ {
#ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ #ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ
u32 gpioctrl; u32 gpioctrl;
DBG_8192C("==> trigger_gpio_0...\n"); DBG_88E("==> trigger_gpio_0...\n");
rtw_write16_async(padapter,REG_GPIO_PIN_CTRL,0); rtw_write16_async(padapter,REG_GPIO_PIN_CTRL,0);
rtw_write8_async(padapter,REG_GPIO_PIN_CTRL+2,0xFF); rtw_write8_async(padapter,REG_GPIO_PIN_CTRL+2,0xFF);
gpioctrl = (BIT(GPIO_DEBUG_PORT_NUM)<<24 )|(BIT(GPIO_DEBUG_PORT_NUM)<<16); gpioctrl = (BIT(GPIO_DEBUG_PORT_NUM)<<24 )|(BIT(GPIO_DEBUG_PORT_NUM)<<16);
rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl); rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl);
gpioctrl |= (BIT(GPIO_DEBUG_PORT_NUM)<<8); gpioctrl |= (BIT(GPIO_DEBUG_PORT_NUM)<<8);
rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl); rtw_write32_async(padapter,REG_GPIO_PIN_CTRL,gpioctrl);
DBG_8192C("<=== trigger_gpio_0...\n"); DBG_88E("<=== trigger_gpio_0...\n");
#endif #endif
} }
@ -2432,7 +2432,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
val8 |= (mode<<2); val8 |= (mode<<2);
rtw_write8(Adapter, MSR, val8); rtw_write8(Adapter, MSR, val8);
DBG_871X("%s()-%d mode = %d\n", __func__, __LINE__, mode); DBG_88E("%s()-%d mode = %d\n", __func__, __LINE__, mode);
if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_))
{ {
@ -2524,7 +2524,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
// Reset TSF for STA+AP concurrent mode // Reset TSF for STA+AP concurrent mode
if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) {
if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE)
DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", DBG_88E("ERROR! %s()-%d: Reset port1 TSF fail\n",
__func__, __LINE__); __func__, __LINE__);
} }
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
@ -2541,7 +2541,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
val8 |= mode; val8 |= mode;
rtw_write8(Adapter, MSR, val8); rtw_write8(Adapter, MSR, val8);
DBG_871X("%s()-%d mode = %d\n", __func__, __LINE__, mode); DBG_88E("%s()-%d mode = %d\n", __func__, __LINE__, mode);
if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_))
{ {
@ -2634,7 +2634,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
// Reset TSF for STA+AP concurrent mode // Reset TSF for STA+AP concurrent mode
if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) {
if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE)
DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", DBG_88E("ERROR! %s()-%d: Reset port0 TSF fail\n",
__func__, __LINE__); __func__, __LINE__);
} }
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
@ -2761,7 +2761,7 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val)
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
// Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue! // Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue!
if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE)
DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", DBG_88E("ERROR! %s()-%d: Reset port0 TSF fail\n",
__func__, __LINE__); __func__, __LINE__);
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
@ -2795,7 +2795,7 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val)
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
// Update buddy port's TSF if it is SoftAP for beacon TX issue! // Update buddy port's TSF if it is SoftAP for beacon TX issue!
if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE)
DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", DBG_88E("ERROR! %s()-%d: Reset port1 TSF fail\n",
__func__, __LINE__); __func__, __LINE__);
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
} }
@ -3028,7 +3028,7 @@ _func_enter_;
// For 8190, we select only 24M, 12M, 6M, 11M, 5.5M, 2M, and 1M from the Basic rate. // For 8190, we select only 24M, 12M, 6M, 11M, 5.5M, 2M, and 1M from the Basic rate.
// We do not use other rates. // We do not use other rates.
HalSetBrateCfg( Adapter, val, &BrateCfg ); HalSetBrateCfg( Adapter, val, &BrateCfg );
DBG_8192C("HW_VAR_BASIC_RATE: BrateCfg(%#x)\n", BrateCfg); DBG_88E("HW_VAR_BASIC_RATE: BrateCfg(%#x)\n", BrateCfg);
//2011.03.30 add by Luke Lee //2011.03.30 add by Luke Lee
//CCK 2M ACK should be disabled for some BCM and Atheros AP IOT //CCK 2M ACK should be disabled for some BCM and Atheros AP IOT
@ -3251,7 +3251,7 @@ _func_enter_;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u16 bcn_interval = *((u16 *)val); u16 bcn_interval = *((u16 *)val);
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){ if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){
DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d\n",__func__,bcn_interval,bcn_interval>>1); DBG_88E("%s==> bcn_interval:%d, eraly_int:%d\n",__func__,bcn_interval,bcn_interval>>1);
rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio rtw_write8(Adapter, REG_DRVERLYINT, bcn_interval>>1);// 50ms for sdio
} }
} }
@ -3416,7 +3416,7 @@ _func_enter_;
else else
AcmCtrl &= (~AcmHw_BeqEn); AcmCtrl &= (~AcmHw_BeqEn);
DBG_871X("[HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl ); DBG_88E("[HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl );
rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl ); rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl );
} }
break; break;
@ -3515,7 +3515,7 @@ _func_enter_;
//BIT7 value - Toggle bit change. //BIT7 value - Toggle bit change.
//modify by Thomas. 2012/4/2. //modify by Thomas. 2012/4/2.
ps_state = ps_state & 0xC1; ps_state = ps_state & 0xC1;
//DBG_871X("##### Change RPWM value to = %x for switch clk #####\n",ps_state); //DBG_88E("##### Change RPWM value to = %x for switch clk #####\n",ps_state);
rtw_write8(Adapter, REG_USB_HRPWM, ps_state); rtw_write8(Adapter, REG_USB_HRPWM, ps_state);
} }
#endif #endif
@ -3623,14 +3623,14 @@ _func_enter_;
u8 Optimum_antenna = (*(u8 *)val); u8 Optimum_antenna = (*(u8 *)val);
u8 Ant ; u8 Ant ;
//switch antenna to Optimum_antenna //switch antenna to Optimum_antenna
//DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B"); //DBG_88E("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B");
if (pHalData->CurAntenna != Optimum_antenna) if (pHalData->CurAntenna != Optimum_antenna)
{ {
Ant = (Optimum_antenna==2)?MAIN_ANT:AUX_ANT; Ant = (Optimum_antenna==2)?MAIN_ANT:AUX_ANT;
ODM_UpdateRxIdleAnt_88E(&pHalData->odmpriv, Ant); ODM_UpdateRxIdleAnt_88E(&pHalData->odmpriv, Ant);
pHalData->CurAntenna = Optimum_antenna ; pHalData->CurAntenna = Optimum_antenna ;
//DBG_8192C("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B"); //DBG_88E("==> HW_VAR_ANTENNA_DIVERSITY_SELECT , Ant_(%s)\n",(Optimum_antenna==2)?"A":"B");
} }
} }
break; break;
@ -3658,7 +3658,7 @@ _func_enter_;
break; break;
}while (trycnt--); }while (trycnt--);
if (trycnt ==0) if (trycnt ==0)
DBG_8192C("Stop RX DMA failed......\n"); DBG_88E("Stop RX DMA failed......\n");
//RQPN Load 0 //RQPN Load 0
rtw_write16(Adapter,REG_RQPN_NPQ,0x0); rtw_write16(Adapter,REG_RQPN_NPQ,0x0);
@ -3679,12 +3679,12 @@ _func_enter_;
{ {
if (rtw_read32(Adapter, 0x200) != rtw_read32(Adapter, 0x204)) if (rtw_read32(Adapter, 0x200) != rtw_read32(Adapter, 0x204))
{ {
//DBG_871X("packet in tx packet buffer - 0x204=%x, 0x200=%x (%d)\n", rtw_read32(Adapter, 0x204), rtw_read32(Adapter, 0x200), i); //DBG_88E("packet in tx packet buffer - 0x204=%x, 0x200=%x (%d)\n", rtw_read32(Adapter, 0x204), rtw_read32(Adapter, 0x200), i);
rtw_msleep_os(10); rtw_msleep_os(10);
} }
else else
{ {
DBG_871X("no packet in tx packet buffer (%d)\n", i); DBG_88E("no packet in tx packet buffer (%d)\n", i);
break; break;
} }
} }
@ -3698,7 +3698,7 @@ _func_enter_;
case HW_VAR_APFM_ON_MAC: case HW_VAR_APFM_ON_MAC:
pHalData->bMacPwrCtrlOn = *val; pHalData->bMacPwrCtrlOn = *val;
DBG_871X("%s: bMacPwrCtrlOn=%d\n", __func__, pHalData->bMacPwrCtrlOn); DBG_88E("%s: bMacPwrCtrlOn=%d\n", __func__, pHalData->bMacPwrCtrlOn);
break; break;
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
@ -3716,7 +3716,7 @@ _func_enter_;
poidparam = (struct wowlan_ioctl_param *)val; poidparam = (struct wowlan_ioctl_param *)val;
switch (poidparam->subcode){ switch (poidparam->subcode){
case WOWLAN_ENABLE: case WOWLAN_ENABLE:
DBG_871X_LEVEL(_drv_always_, "WOWLAN_ENABLE\n"); DBG_88E_LEVEL(_drv_always_, "WOWLAN_ENABLE\n");
SetFwRelatedForWoWLAN8188ES(Adapter, _TRUE); SetFwRelatedForWoWLAN8188ES(Adapter, _TRUE);
@ -3725,22 +3725,22 @@ _func_enter_;
// rtw_wowlan_reload_pattern(Adapter); // rtw_wowlan_reload_pattern(Adapter);
//RX DMA stop //RX DMA stop
DBG_871X_LEVEL(_drv_always_, "Pause DMA\n"); DBG_88E_LEVEL(_drv_always_, "Pause DMA\n");
rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN)); rtw_write32(Adapter,REG_RXPKT_NUM,(rtw_read32(Adapter,REG_RXPKT_NUM)|RW_RELEASE_EN));
do{ do{
if ((rtw_read32(Adapter, REG_RXPKT_NUM)&RXDMA_IDLE)) { if ((rtw_read32(Adapter, REG_RXPKT_NUM)&RXDMA_IDLE)) {
DBG_871X_LEVEL(_drv_always_, "RX_DMA_IDLE is true\n"); DBG_88E_LEVEL(_drv_always_, "RX_DMA_IDLE is true\n");
break; break;
} else { } else {
// If RX_DMA is not idle, receive one pkt from DMA // If RX_DMA is not idle, receive one pkt from DMA
DBG_871X_LEVEL(_drv_always_, "RX_DMA_IDLE is not true\n"); DBG_88E_LEVEL(_drv_always_, "RX_DMA_IDLE is not true\n");
} }
}while (trycnt--); }while (trycnt--);
if (trycnt ==0) if (trycnt ==0)
DBG_871X_LEVEL(_drv_always_, "Stop RX DMA failed......\n"); DBG_88E_LEVEL(_drv_always_, "Stop RX DMA failed......\n");
//Set WOWLAN H2C command. //Set WOWLAN H2C command.
DBG_871X_LEVEL(_drv_always_, "Set WOWLan cmd\n"); DBG_88E_LEVEL(_drv_always_, "Set WOWLan cmd\n");
rtl8188es_set_wowlan_cmd(Adapter, 1); rtl8188es_set_wowlan_cmd(Adapter, 1);
mstatus = rtw_read8(Adapter, REG_WOW_CTRL); mstatus = rtw_read8(Adapter, REG_WOW_CTRL);
@ -3748,13 +3748,13 @@ _func_enter_;
while (!(mstatus&BIT1) && trycnt>1) { while (!(mstatus&BIT1) && trycnt>1) {
mstatus = rtw_read8(Adapter, REG_WOW_CTRL); mstatus = rtw_read8(Adapter, REG_WOW_CTRL);
DBG_871X_LEVEL(_drv_always_, "Loop index: %d :0x%02x\n", trycnt, mstatus); DBG_88E_LEVEL(_drv_info_, "Loop index: %d :0x%02x\n", trycnt, mstatus);
trycnt --; trycnt --;
rtw_msleep_os(2); rtw_msleep_os(2);
} }
Adapter->pwrctrlpriv.wowlan_wake_reason = rtw_read8(Adapter, REG_WOWLAN_WAKE_REASON); Adapter->pwrctrlpriv.wowlan_wake_reason = rtw_read8(Adapter, REG_WOWLAN_WAKE_REASON);
DBG_871X_LEVEL(_drv_always_, "wowlan_wake_reason: 0x%02x\n", DBG_88E_LEVEL(_drv_always_, "wowlan_wake_reason: 0x%02x\n",
Adapter->pwrctrlpriv.wowlan_wake_reason); Adapter->pwrctrlpriv.wowlan_wake_reason);
/* Invoid SE0 reset signal during suspending*/ /* Invoid SE0 reset signal during suspending*/
@ -3764,15 +3764,15 @@ _func_enter_;
//rtw_msleep_os(10); //rtw_msleep_os(10);
break; break;
case WOWLAN_DISABLE: case WOWLAN_DISABLE:
DBG_871X_LEVEL(_drv_always_, "WOWLAN_DISABLE\n"); DBG_88E_LEVEL(_drv_always_, "WOWLAN_DISABLE\n");
trycnt = 10; trycnt = 10;
rtl8188es_set_wowlan_cmd(Adapter, 0); rtl8188es_set_wowlan_cmd(Adapter, 0);
mstatus = rtw_read8(Adapter, REG_WOW_CTRL); mstatus = rtw_read8(Adapter, REG_WOW_CTRL);
DBG_871X_LEVEL(_drv_info_, "%s mstatus:0x%02x\n", __func__, mstatus); DBG_88E_LEVEL(_drv_info_, "%s mstatus:0x%02x\n", __func__, mstatus);
while (mstatus&BIT1 && trycnt>1) { while (mstatus&BIT1 && trycnt>1) {
mstatus = rtw_read8(Adapter, REG_WOW_CTRL); mstatus = rtw_read8(Adapter, REG_WOW_CTRL);
DBG_871X_LEVEL(_drv_always_, "Loop index: %d :0x%02x\n", trycnt, mstatus); DBG_88E_LEVEL(_drv_always_, "Loop index: %d :0x%02x\n", trycnt, mstatus);
trycnt --; trycnt --;
rtw_msleep_os(2); rtw_msleep_os(2);
} }
@ -3799,7 +3799,7 @@ _func_enter_;
case HW_VAR_TX_RPT_MAX_MACID: case HW_VAR_TX_RPT_MAX_MACID:
{ {
u8 maxMacid = *val; u8 maxMacid = *val;
DBG_871X("### MacID(%d),Set Max Tx RPT MID(%d)\n",maxMacid,maxMacid+1); DBG_88E("### MacID(%d),Set Max Tx RPT MID(%d)\n",maxMacid,maxMacid+1);
rtw_write8(Adapter, REG_TX_RPT_CTRL+1, maxMacid+1); rtw_write8(Adapter, REG_TX_RPT_CTRL+1, maxMacid+1);
} }
break; break;
@ -3983,8 +3983,8 @@ GetHalDefVar8188EUsb(
u8 entry_id = *((u8*)pValue); u8 entry_id = *((u8*)pValue);
if (check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE) if (check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE)
{ {
DBG_871X("============ RA status check ===================\n"); DBG_88E("============ RA status check ===================\n");
DBG_8192C("Mac_id:%d ,RateID = %d,RAUseRate = 0x%08x,RateSGI = %d, DecisionRate = 0x%02x ,PTStage = %d\n", DBG_88E("Mac_id:%d ,RateID = %d,RAUseRate = 0x%08x,RateSGI = %d, DecisionRate = 0x%02x ,PTStage = %d\n",
entry_id, entry_id,
pHalData->odmpriv.RAInfo[entry_id].RateID, pHalData->odmpriv.RAInfo[entry_id].RateID,
pHalData->odmpriv.RAInfo[entry_id].RAUseRate, pHalData->odmpriv.RAInfo[entry_id].RAUseRate,
@ -4046,18 +4046,18 @@ SetHalDefVar8188EUsb(
if (dm_func == 0){ //disable all dynamic func if (dm_func == 0){ //disable all dynamic func
podmpriv->SupportAbility = DYNAMIC_FUNC_DISABLE; podmpriv->SupportAbility = DYNAMIC_FUNC_DISABLE;
DBG_8192C("==> Disable all dynamic function...\n"); DBG_88E("==> Disable all dynamic function...\n");
} }
else if (dm_func == 1){//disable DIG else if (dm_func == 1){//disable DIG
podmpriv->SupportAbility &= (~DYNAMIC_BB_DIG); podmpriv->SupportAbility &= (~DYNAMIC_BB_DIG);
DBG_8192C("==> Disable DIG...\n"); DBG_88E("==> Disable DIG...\n");
} }
else if (dm_func == 2){//disable High power else if (dm_func == 2){//disable High power
podmpriv->SupportAbility &= (~DYNAMIC_BB_DYNAMIC_TXPWR); podmpriv->SupportAbility &= (~DYNAMIC_BB_DYNAMIC_TXPWR);
} }
else if (dm_func == 3){//disable tx power tracking else if (dm_func == 3){//disable tx power tracking
podmpriv->SupportAbility &= (~DYNAMIC_RF_CALIBRATION); podmpriv->SupportAbility &= (~DYNAMIC_RF_CALIBRATION);
DBG_8192C("==> Disable tx power tracking...\n"); DBG_88E("==> Disable tx power tracking...\n");
} }
//else if (dm_func == 4){//disable BT coexistence //else if (dm_func == 4){//disable BT coexistence
// pdmpriv->DMFlag &= (~DYNAMIC_FUNC_BT); // pdmpriv->DMFlag &= (~DYNAMIC_FUNC_BT);
@ -4073,7 +4073,7 @@ SetHalDefVar8188EUsb(
} }
//pdmpriv->DMFlag |= DYNAMIC_FUNC_BT; //pdmpriv->DMFlag |= DYNAMIC_FUNC_BT;
podmpriv->SupportAbility = DYNAMIC_ALL_FUNC_ENABLE; podmpriv->SupportAbility = DYNAMIC_ALL_FUNC_ENABLE;
DBG_8192C("==> Turn on all dynamic function...\n"); DBG_88E("==> Turn on all dynamic function...\n");
} }
} }
break; break;
@ -4122,7 +4122,7 @@ u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask)
if ( (pbtpriv->BT_Coexist) && (pbtpriv->BT_CoexistType == BT_CSR_BC4) ) if ( (pbtpriv->BT_Coexist) && (pbtpriv->BT_CoexistType == BT_CSR_BC4) )
{ {
BrateCfg = mask & 0x151; BrateCfg = mask & 0x151;
//DBG_8192C("BT temp disable cck 2/5.5/11M, (0x%x = 0x%x)\n", REG_RRSR, BrateCfg & 0x151); //DBG_88E("BT temp disable cck 2/5.5/11M, (0x%x = 0x%x)\n", REG_RRSR, BrateCfg & 0x151);
} }
else else
#endif #endif
@ -4235,7 +4235,7 @@ void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level)
#ifdef CONFIG_ODM_REFRESH_RAMASK #ifdef CONFIG_ODM_REFRESH_RAMASK
{ {
rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level); rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level);
printk("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n", DBG_88E("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
__func__,mac_id,networkType,mask,rssi_level,rate_bitmap); __func__,mac_id,networkType,mask,rssi_level,rate_bitmap);
} }
#endif #endif
@ -4256,7 +4256,7 @@ void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level)
if (shortGIrate==_TRUE) if (shortGIrate==_TRUE)
arg |= BIT(5); arg |= BIT(5);
mask |= ((raid<<28)&0xf0000000); mask |= ((raid<<28)&0xf0000000);
DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); DBG_88E("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg);
psta->ra_mask=mask; psta->ra_mask=mask;
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if (padapter->proximity.proxim_on ==_TRUE){ if (padapter->proximity.proxim_on ==_TRUE){
@ -4416,7 +4416,7 @@ _func_enter_;
padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE)); padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE));
if (padapter->HalData == NULL){ if (padapter->HalData == NULL){
DBG_8192C("cant not alloc memory for HAL DATA\n"); DBG_88E("cant not alloc memory for HAL DATA\n");
} }
//_rtw_memset(padapter->HalData, 0, sizeof(HAL_DATA_TYPE)); //_rtw_memset(padapter->HalData, 0, sizeof(HAL_DATA_TYPE));
padapter->hal_data_sz = sizeof(HAL_DATA_TYPE); padapter->hal_data_sz = sizeof(HAL_DATA_TYPE);

92
hal/usb_ops_linux.c
View file

@ -62,7 +62,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
} }
#endif #endif
//DBG_871X("%s %s:%d\n",__func__, current->comm, current->pid); //DBG_88E("%s %s:%d\n",__func__, current->comm, current->pid);
if ((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)){ if ((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)){
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
@ -71,7 +71,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
} }
if (len>MAX_VENDOR_REQ_CMD_SIZE){ if (len>MAX_VENDOR_REQ_CMD_SIZE){
DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __func__ ); DBG_88E( "[%s] Buffer len error ,vendor request failed\n", __func__ );
status = -EINVAL; status = -EINVAL;
goto exit; goto exit;
} }
@ -99,7 +99,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
#endif #endif
if ( pIo_buf== NULL) { if ( pIo_buf== NULL) {
DBG_8192C( "[%s] pIo_buf == NULL\n", __func__ ); DBG_88E( "[%s] pIo_buf == NULL\n", __func__ );
status = -ENOMEM; status = -ENOMEM;
goto release_mutex; goto release_mutex;
} }
@ -131,7 +131,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
} }
} }
else { // error cases else { // error cases
DBG_8192C("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n" DBG_88E("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n"
, value,(requesttype == 0x01)?"read":"write" , len, status, *(u32*)pdata, vendorreq_times); , value,(requesttype == 0x01)?"read":"write" , len, status, *(u32*)pdata, vendorreq_times);
if (status < 0) { if (status < 0) {
@ -384,7 +384,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
if ( pkt_len != INTERRUPT_MSG_FORMAT_LEN ) if ( pkt_len != INTERRUPT_MSG_FORMAT_LEN )
{ {
DBG_8192C("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len); DBG_88E("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len);
return ; return ;
} }
@ -434,13 +434,13 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
#ifdef DBG_CONFIG_ERROR_DETECT_INT #ifdef DBG_CONFIG_ERROR_DETECT_INT
if ( pHalData->IntArray[1] & IMR_TXERR_88E ) if ( pHalData->IntArray[1] & IMR_TXERR_88E )
DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__func__); DBG_88E("===> %s Tx Error Flag Interrupt Status\n",__func__);
if ( pHalData->IntArray[1] & IMR_RXERR_88E ) if ( pHalData->IntArray[1] & IMR_RXERR_88E )
DBG_871X("===> %s Rx Error Flag INT Status\n",__func__); DBG_88E("===> %s Rx Error Flag INT Status\n",__func__);
if ( pHalData->IntArray[1] & IMR_TXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_TXFOVW_88E )
DBG_871X("===> %s Transmit FIFO Overflow\n",__func__); DBG_88E("===> %s Transmit FIFO Overflow\n",__func__);
if ( pHalData->IntArray[1] & IMR_RXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_RXFOVW_88E )
DBG_871X("===> %s Receive FIFO Overflow\n",__func__); DBG_88E("===> %s Receive FIFO Overflow\n",__func__);
#endif//DBG_CONFIG_ERROR_DETECT_INT #endif//DBG_CONFIG_ERROR_DETECT_INT
@ -461,7 +461,7 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
{ {
DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
return; return;
@ -471,7 +471,7 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
{ {
if (purb->actual_length > INTERRUPT_MSG_FORMAT_LEN) if (purb->actual_length > INTERRUPT_MSG_FORMAT_LEN)
{ {
DBG_8192C("usb_read_interrupt_complete: purb->actual_length > INTERRUPT_MSG_FORMAT_LEN(%d)\n",INTERRUPT_MSG_FORMAT_LEN); DBG_88E("usb_read_interrupt_complete: purb->actual_length > INTERRUPT_MSG_FORMAT_LEN(%d)\n",INTERRUPT_MSG_FORMAT_LEN);
} }
interrupt_handler_8188eu(padapter, purb->actual_length,purb->transfer_buffer ); interrupt_handler_8188eu(padapter, purb->actual_length,purb->transfer_buffer );
@ -479,12 +479,12 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
err = usb_submit_urb(purb, GFP_ATOMIC); err = usb_submit_urb(purb, GFP_ATOMIC);
if ((err) && (err != (-EPERM))) if ((err) && (err != (-EPERM)))
{ {
DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, purb->status); DBG_88E("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, purb->status);
} }
} }
else else
{ {
DBG_8192C("###=> usb_read_interrupt_complete => urb status(%d)\n", purb->status); DBG_88E("###=> usb_read_interrupt_complete => urb status(%d)\n", purb->status);
switch (purb->status) { switch (purb->status) {
case -EINVAL: case -EINVAL:
@ -500,7 +500,7 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
case -EPROTO: case -EPROTO:
break; break;
case -EINPROGRESS: case -EINPROGRESS:
DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); DBG_88E("ERROR: URB IS IN PROGRESS!/n");
break; break;
default: default:
break; break;
@ -534,7 +534,7 @@ _func_enter_;
err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC); err = usb_submit_urb(precvpriv->int_in_urb, GFP_ATOMIC);
if ((err) && (err != (-EPERM))) if ((err) && (err != (-EPERM)))
{ {
DBG_8192C("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, precvpriv->int_in_urb->status); DBG_88E("cannot submit interrupt in-token(err = 0x%08x),urb_status = %d\n",err, precvpriv->int_in_urb->status);
ret = _FAIL; ret = _FAIL;
} }
@ -654,7 +654,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
} }
else { else {
rtw_free_recvframe(precvframe_if2, pfree_recv_queue); rtw_free_recvframe(precvframe_if2, pfree_recv_queue);
DBG_8192C("%s()-%d: alloc_skb() failed!\n", __func__, __LINE__); DBG_88E("%s()-%d: alloc_skb() failed!\n", __func__, __LINE__);
} }
} }
@ -707,7 +707,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
if (precvframe==NULL) if (precvframe==NULL)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n"));
DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__); DBG_88E("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -728,7 +728,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
if ((pattrib->crc_err) || (pattrib->icv_err)) if ((pattrib->crc_err) || (pattrib->icv_err))
{ {
if (pattrib->pkt_len>2000){ if (pattrib->pkt_len>2000){
DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err); DBG_88E("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err);
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __func__,pattrib->pkt_len,pattrib->mcs_rate); printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __func__,pattrib->pkt_len,pattrib->mcs_rate);
#endif #endif
@ -748,7 +748,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n"));
DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__); DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -800,7 +800,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
} }
else else
{ {
DBG_8192C("recvbuf2recvframe:can not allocate memory for skb copy\n"); DBG_88E("recvbuf2recvframe:can not allocate memory for skb copy\n");
//precvframe->u.hdr.pkt = skb_clone(pskb, GFP_ATOMIC); //precvframe->u.hdr.pkt = skb_clone(pskb, GFP_ATOMIC);
//precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pbuf; //precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pbuf;
//precvframe->u.hdr.rx_end = pbuf + (pkt_offset>1612?pkt_offset:1612); //precvframe->u.hdr.rx_end = pbuf + (pkt_offset>1612?pkt_offset:1612);
@ -858,13 +858,13 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
//enqueue recvframe to txrtp queue //enqueue recvframe to txrtp queue
if (pattrib->pkt_rpt_type == TX_REPORT1){ if (pattrib->pkt_rpt_type == TX_REPORT1){
//DBG_8192C("rx CCX\n"); //DBG_88E("rx CCX\n");
//CCX-TXRPT ack for xmit mgmt frames. //CCX-TXRPT ack for xmit mgmt frames.
handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data); handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data);
} }
else if (pattrib->pkt_rpt_type == TX_REPORT2){ else if (pattrib->pkt_rpt_type == TX_REPORT2){
//DBG_8192C("rx TX RPT\n"); //DBG_88E("rx TX RPT\n");
ODM_RA_TxRPT2Handle_8188E( ODM_RA_TxRPT2Handle_8188E(
&pHalData->odmpriv, &pHalData->odmpriv,
precvframe->u.hdr.rx_data, precvframe->u.hdr.rx_data,
@ -876,7 +876,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf)
} }
else if (pattrib->pkt_rpt_type == HIS_REPORT) else if (pattrib->pkt_rpt_type == HIS_REPORT)
{ {
//DBG_8192C("%s , rx USB HISR\n",__func__); //DBG_88E("%s , rx USB HISR\n",__func__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data);
#endif #endif
@ -911,7 +911,7 @@ void rtl8188eu_recv_tasklet(void *priv)
{ {
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{ {
DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved\n"); DBG_88E("recv_tasklet => bDriverStopped or bSurpriseRemoved\n");
break; break;
} }
@ -937,7 +937,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved));
DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
goto exit; goto exit;
} }
@ -966,7 +966,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
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); DBG_88E("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){ if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = _TRUE;
@ -994,7 +994,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); DBG_88E("ERROR: URB IS IN PROGRESS!/n");
break; break;
default: default:
break; break;
@ -1054,7 +1054,7 @@ _func_enter_;
if ((err) && (err != (-EPERM))) if ((err) && (err != (-EPERM)))
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status));
DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status); DBG_88E("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
ret = _FAIL; ret = _FAIL;
} }
@ -1106,7 +1106,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
if (precvframe==NULL) if (precvframe==NULL)
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n"));
DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__); DBG_88E("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1121,7 +1121,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
if ((pattrib->crc_err) || (pattrib->icv_err)) if ((pattrib->crc_err) || (pattrib->icv_err))
{ {
DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err); DBG_88E("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
@ -1137,7 +1137,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len))
{ {
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); 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", __func__, __LINE__); DBG_88E("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __func__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1191,7 +1191,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
{ {
if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0)) if ((pattrib->mfrag == 1)&&(pattrib->frag_num == 0))
{ {
DBG_8192C("recvbuf2recvframe: alloc_skb fail , drop frag frame\n"); DBG_88E("recvbuf2recvframe: alloc_skb fail , drop frag frame\n");
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1205,7 +1205,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
} }
else else
{ {
DBG_8192C("recvbuf2recvframe: skb_clone fail\n"); DBG_88E("recvbuf2recvframe: skb_clone fail\n");
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -1258,12 +1258,12 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
//enqueue recvframe to txrtp queue //enqueue recvframe to txrtp queue
if (pattrib->pkt_rpt_type == TX_REPORT1){ if (pattrib->pkt_rpt_type == TX_REPORT1){
//DBG_8192C("rx CCX\n"); //DBG_88E("rx CCX\n");
//CCX-TXRPT ack for xmit mgmt frames. //CCX-TXRPT ack for xmit mgmt frames.
handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data); handle_txrpt_ccx_88e(padapter, precvframe->u.hdr.rx_data);
} }
else if (pattrib->pkt_rpt_type == TX_REPORT2){ else if (pattrib->pkt_rpt_type == TX_REPORT2){
//DBG_8192C("rx TX RPT\n"); //DBG_88E("rx TX RPT\n");
ODM_RA_TxRPT2Handle_8188E( ODM_RA_TxRPT2Handle_8188E(
&pHalData->odmpriv, &pHalData->odmpriv,
precvframe->u.hdr.rx_data, precvframe->u.hdr.rx_data,
@ -1275,7 +1275,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
} }
else if (pattrib->pkt_rpt_type == HIS_REPORT) else if (pattrib->pkt_rpt_type == HIS_REPORT)
{ {
//DBG_8192C("%s , rx USB HISR\n",__func__); //DBG_88E("%s , rx USB HISR\n",__func__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data);
#endif #endif
@ -1310,7 +1310,7 @@ void rtl8188eu_recv_tasklet(void *priv)
{ {
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{ {
DBG_8192C("recv_tasklet => bDriverStopped or bSurpriseRemoved\n"); DBG_88E("recv_tasklet => bDriverStopped or bSurpriseRemoved\n");
dev_kfree_skb_any(pskb); dev_kfree_skb_any(pskb);
break; break;
} }
@ -1365,11 +1365,11 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
precvbuf->reuse = _TRUE; precvbuf->reuse = _TRUE;
#else #else
if (precvbuf->pskb){ if (precvbuf->pskb){
DBG_8192C("==> free skb(%p)\n",precvbuf->pskb); DBG_88E("==> free skb(%p)\n",precvbuf->pskb);
dev_kfree_skb_any(precvbuf->pskb); dev_kfree_skb_any(precvbuf->pskb);
} }
#endif #endif
DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", DBG_88E("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n",
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel);
goto exit; goto exit;
} }
@ -1381,7 +1381,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
precvbuf->reuse = _TRUE; precvbuf->reuse = _TRUE;
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__); DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);
} }
else else
{ {
@ -1403,7 +1403,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
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); DBG_88E("###=> usb_read_port_complete => urb status(%d)\n", purb->status);
if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){ if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(padapter)) == _TRUE ){
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = _TRUE;
@ -1432,7 +1432,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
break; break;
case -EINPROGRESS: case -EINPROGRESS:
DBG_8192C("ERROR: URB IS IN PROGRESS!/n"); DBG_88E("ERROR: URB IS IN PROGRESS!/n");
break; break;
default: default:
break; break;
@ -1497,7 +1497,7 @@ _func_enter_;
if (precvbuf->pskb == NULL) if (precvbuf->pskb == NULL)
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("init_recvbuf(): alloc_skb fail!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("init_recvbuf(): alloc_skb fail!\n"));
DBG_8192C("#### usb_read_port() alloc_skb fail!#####\n"); DBG_88E("#### usb_read_port() alloc_skb fail!#####\n");
return _FAIL; return _FAIL;
} }
@ -1544,7 +1544,7 @@ _func_enter_;
if ((err) && (err != (-EPERM))) if ((err) && (err != (-EPERM)))
{ {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("cannot submit rx in-token(err=0x%.8x), URB_STATUS =0x%.8x", err, purb->status));
DBG_8192C("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status); DBG_88E("cannot submit rx in-token(err = 0x%08x),urb_status = %d\n",err,purb->status);
ret = _FAIL; ret = _FAIL;
} }
} }
@ -1573,7 +1573,7 @@ void rtl8188eu_xmit_tasklet(void *priv)
{ {
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE) || (padapter->bWritePortCancel == _TRUE)) if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE) || (padapter->bWritePortCancel == _TRUE))
{ {
DBG_8192C("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n"); DBG_88E("xmit_tasklet => bDriverStopped or bSurpriseRemoved or bWritePortCancel\n");
break; break;
} }
@ -1626,5 +1626,5 @@ void rtl8188eu_set_hw_type(_adapter *padapter)
{ {
padapter->chip_type = RTL8188E; padapter->chip_type = RTL8188E;
padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU;
DBG_871X("CHIP TYPE: RTL8188E\n"); DBG_88E("CHIP TYPE: RTL8188E\n");
} }

2
include/autoconf.h
View file

@ -360,7 +360,7 @@
*/ */
#define DBG 1 #define DBG 1
//#define CONFIG_DEBUG /* DBG_871X, etc... */ //#define CONFIG_DEBUG /* DBG_88E, etc... */
//#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */ //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
#define CONFIG_PROC_DEBUG #define CONFIG_PROC_DEBUG

10
include/rtw_br_ext.h
View file

@ -23,11 +23,11 @@
#if 1 // rtw_wifi_driver #if 1 // rtw_wifi_driver
#define CL_IPV6_PASS 1 #define CL_IPV6_PASS 1
#define MACADDRLEN 6 #define MACADDRLEN 6
#define _DEBUG_ERR DBG_8192C #define _DEBUG_ERR DBG_88E
#define _DEBUG_INFO //DBG_8192C #define _DEBUG_INFO //DBG_88E
#define DEBUG_WARN DBG_8192C #define DEBUG_WARN DBG_88E
#define DEBUG_INFO //DBG_8192C #define DEBUG_INFO //DBG_88E
#define DEBUG_ERR DBG_8192C #define DEBUG_ERR DBG_88E
//#define GET_MY_HWADDR ((GET_MIB(priv))->dot11OperationEntry.hwaddr) //#define GET_MY_HWADDR ((GET_MIB(priv))->dot11OperationEntry.hwaddr)
#define GET_MY_HWADDR(padapter) ((padapter)->eeprompriv.mac_addr) #define GET_MY_HWADDR(padapter) ((padapter)->eeprompriv.mac_addr)
#endif // rtw_wifi_driver #endif // rtw_wifi_driver

18
include/rtw_debug.h
View file

@ -157,30 +157,26 @@
#define DRIVER_PREFIX "RTL8188: " #define DRIVER_PREFIX "RTL8188: "
#define DBG_871X_LEVEL(_Level, fmt, arg...) \ extern u32 GlobalDebugLevel;
#define DBG_88E_LEVEL(_Level, fmt, arg...) \
do { \ do { \
if (_Level <= GlobalDebugLevel) \ if (_Level <= GlobalDebugLevel) \
_dbgdump(DRIVER_PREFIX"ERROR " fmt, ##arg); \ _dbgdump(DRIVER_PREFIX"ERROR " fmt, ##arg); \
} while (0) } while (0)
#define DBG_871X(...) \ #define DBG_88E(...) \
do { \ do { \
if (_drv_err_ <= GlobalDebugLevel) \
_dbgdump(DRIVER_PREFIX __VA_ARGS__); \ _dbgdump(DRIVER_PREFIX __VA_ARGS__); \
} while (0) } while (0)
#define MSG_8192C(...) \ #define MSG_88E(...) \
do { \ do { \
if (_drv_err_ <= GlobalDebugLevel) \
_dbgdump(DRIVER_PREFIX __VA_ARGS__); \ _dbgdump(DRIVER_PREFIX __VA_ARGS__); \
} while (0) } while (0)
#define DBG_8192C(...) \
do { \
_dbgdump(DRIVER_PREFIX __VA_ARGS__); \
} while (0)
extern u32 GlobalDebugLevel;
#define RT_TRACE(_Comp, _Level, Fmt) \ #define RT_TRACE(_Comp, _Level, Fmt) \
do { \ do { \
if (_Level <= GlobalDebugLevel) { \ if (_Level <= GlobalDebugLevel) { \

4
include/rtw_mlme_ext.h
View file

@ -739,13 +739,13 @@ void addba_timer_hdl(struct sta_info *psta);
#define set_survey_timer(mlmeext, ms) \ #define set_survey_timer(mlmeext, ms) \
do { \ do { \
/*DBG_871X("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ /*DBG_88E("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->survey_timer, (ms)); \ _set_timer(&(mlmeext)->survey_timer, (ms)); \
} while (0) } while (0)
#define set_link_timer(mlmeext, ms) \ #define set_link_timer(mlmeext, ms) \
do { \ do { \
/*DBG_871X("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ /*DBG_88E("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->link_timer, (ms)); \ _set_timer(&(mlmeext)->link_timer, (ms)); \
} while (0) } while (0)

2
include/rtw_pwrctrl.h
View file

@ -305,7 +305,7 @@ struct pwrctrl_priv
#define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \ #define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \
do { \ do { \
/*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctrlpriv), (ms));*/ \ /*DBG_88E("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctrlpriv), (ms));*/ \
_set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \ _set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \
} while (0) } while (0)

4
include/usb_ops.h
View file

@ -113,10 +113,10 @@ static inline int rtw_inc_and_chk_continual_urb_error(struct dvobj_priv *dvobj)
int ret = _FALSE; int ret = _FALSE;
int value; int value;
if ( (value=ATOMIC_INC_RETURN(&dvobj->continual_urb_error)) > MAX_CONTINUAL_URB_ERR) { if ( (value=ATOMIC_INC_RETURN(&dvobj->continual_urb_error)) > MAX_CONTINUAL_URB_ERR) {
DBG_871X("[dvobj:%p][ERROR] continual_urb_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_URB_ERR); DBG_88E("[dvobj:%p][ERROR] continual_urb_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_URB_ERR);
ret = _TRUE; ret = _TRUE;
} else { } else {
//DBG_871X("[dvobj:%p] continual_urb_error:%d\n", dvobj, value); //DBG_88E("[dvobj:%p] continual_urb_error:%d\n", dvobj, value);
} }
return ret; return ret;
} }

498
os_dep/ioctl_cfg80211.c
View file

File diff suppressed because it is too large Load diff

1160
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

16
os_dep/mlme_linux.c
View file

@ -370,7 +370,7 @@ void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
_rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
DBG_871X("+rtw_indicate_sta_assoc_event\n"); DBG_88E("+rtw_indicate_sta_assoc_event\n");
#ifndef CONFIG_IOCTL_CFG80211 #ifndef CONFIG_IOCTL_CFG80211
wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL);
@ -397,7 +397,7 @@ void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta)
_rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
DBG_871X("+rtw_indicate_sta_disassoc_event\n"); DBG_88E("+rtw_indicate_sta_disassoc_event\n");
#ifndef CONFIG_IOCTL_CFG80211 #ifndef CONFIG_IOCTL_CFG80211
wireless_send_event(padapter->pnetdev, IWEVEXPIRED, &wrqu, NULL); wireless_send_event(padapter->pnetdev, IWEVEXPIRED, &wrqu, NULL);
@ -413,7 +413,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
_adapter *padapter = (_adapter *)phostapdpriv->padapter; _adapter *padapter = (_adapter *)phostapdpriv->padapter;
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb); return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb);
} }
@ -422,7 +422,7 @@ static int mgnt_netdev_open(struct net_device *pnetdev)
{ {
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_871X("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); DBG_88E("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
init_usb_anchor(&phostapdpriv->anchored); init_usb_anchor(&phostapdpriv->anchored);
@ -443,7 +443,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev)
{ {
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
usb_kill_anchored_urbs(&phostapdpriv->anchored); usb_kill_anchored_urbs(&phostapdpriv->anchored);
@ -492,7 +492,7 @@ int hostapd_mode_init(_adapter *padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
DBG_871X("register rtl871x_mgnt_netdev_ops to netdev_ops\n"); DBG_88E("register rtl871x_mgnt_netdev_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtl871x_mgnt_netdev_ops; pnetdev->netdev_ops = &rtl871x_mgnt_netdev_ops;
@ -524,7 +524,7 @@ int hostapd_mode_init(_adapter *padapter)
if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0) if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
{ {
DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n"); DBG_88E("hostapd_mode_init(): dev_alloc_name, fail!\n");
} }
@ -547,7 +547,7 @@ int hostapd_mode_init(_adapter *padapter)
/* Tell the network stack we exist */ /* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) if (register_netdev(pnetdev) != 0)
{ {
DBG_871X("hostapd_mode_init(): register_netdev fail!\n"); DBG_88E("hostapd_mode_init(): register_netdev fail!\n");
if (pnetdev) if (pnetdev)
{ {

132
os_dep/os_intfs.c
View file

@ -351,13 +351,13 @@ void rtw_proc_init_one(struct net_device *dev)
rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net); rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net);
#endif #endif
if (rtw_proc == NULL) { if (rtw_proc == NULL) {
DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n"); DBG_88E(KERN_ERR "Unable to create rtw_proc directory\n");
return; return;
} }
entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev); entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
} }
@ -386,7 +386,7 @@ void rtw_proc_init_one(struct net_device *dev)
} }
} }
DBG_871X("Unable to create dir_dev directory\n"); DBG_88E("Unable to create dir_dev directory\n");
return; return;
} }
} }
@ -400,7 +400,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO, entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_write_reg, dev); dir_dev, proc_get_write_reg, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_write_reg; entry->write_proc = proc_set_write_reg;
@ -408,7 +408,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO, entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_read_reg, dev); dir_dev, proc_get_read_reg, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_read_reg; entry->write_proc = proc_set_read_reg;
@ -417,7 +417,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO, entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
dir_dev, proc_get_fwstate, dev); dir_dev, proc_get_fwstate, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
@ -425,7 +425,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO, entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_sec_info, dev); dir_dev, proc_get_sec_info, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
@ -433,7 +433,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO, entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_mlmext_state, dev); dir_dev, proc_get_mlmext_state, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
@ -441,98 +441,98 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO, entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_qos_option, dev); dir_dev, proc_get_qos_option, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO, entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_ht_option, dev); dir_dev, proc_get_ht_option, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_info, dev); dir_dev, proc_get_rf_info, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO, entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_ap_info, dev); dir_dev, proc_get_ap_info, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO, entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_adapter_state, dev); dir_dev, proc_get_adapter_state, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO, entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_trx_info, dev); dir_dev, proc_get_trx_info, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO, entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump1, dev); dir_dev, proc_get_mac_reg_dump1, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO, entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump2, dev); dir_dev, proc_get_mac_reg_dump2, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO, entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump3, dev); dir_dev, proc_get_mac_reg_dump3, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO, entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump1, dev); dir_dev, proc_get_bb_reg_dump1, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO, entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump2, dev); dir_dev, proc_get_bb_reg_dump2, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO, entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump3, dev); dir_dev, proc_get_bb_reg_dump3, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump1, dev); dir_dev, proc_get_rf_reg_dump1, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump2, dev); dir_dev, proc_get_rf_reg_dump2, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
@ -541,14 +541,14 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump3, dev); dir_dev, proc_get_rf_reg_dump3, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump4, dev); dir_dev, proc_get_rf_reg_dump4, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
} }
@ -558,7 +558,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO, entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_all_sta_info, dev); dir_dev, proc_get_all_sta_info, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
#endif #endif
@ -567,7 +567,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO, entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO,
dir_dev, proc_get_malloc_cnt, dev); dir_dev, proc_get_malloc_cnt, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
#endif #endif
@ -576,7 +576,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO, entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO,
dir_dev, proc_get_best_channel, dev); dir_dev, proc_get_best_channel, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
#endif #endif
@ -584,7 +584,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_signal, dev); dir_dev, proc_get_rx_signal, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_rx_signal; entry->write_proc = proc_set_rx_signal;
@ -592,7 +592,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO, entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_ht_enable, dev); dir_dev, proc_get_ht_enable, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_ht_enable; entry->write_proc = proc_set_ht_enable;
@ -600,7 +600,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO, entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_cbw40_enable, dev); dir_dev, proc_get_cbw40_enable, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_cbw40_enable; entry->write_proc = proc_set_cbw40_enable;
@ -608,7 +608,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO, entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_ampdu_enable, dev); dir_dev, proc_get_ampdu_enable, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_ampdu_enable; entry->write_proc = proc_set_ampdu_enable;
@ -616,7 +616,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_stbc, dev); dir_dev, proc_get_rx_stbc, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_rx_stbc; entry->write_proc = proc_set_rx_stbc;
@ -629,7 +629,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO, entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO,
dir_dev, proc_get_rssi_disp, dev); dir_dev, proc_get_rssi_disp, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_rssi_disp; entry->write_proc = proc_set_rssi_disp;
@ -637,7 +637,7 @@ void rtw_proc_init_one(struct net_device *dev)
entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO, entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO,
dir_dev, proc_get_btcoex_dbg, dev); dir_dev, proc_get_btcoex_dbg, dev);
if (!entry) { if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n"); DBG_88E("Unable to create_proc_read_entry!\n");
return; return;
} }
entry->write_proc = proc_set_btcoex_dbg; entry->write_proc = proc_set_btcoex_dbg;
@ -872,7 +872,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
if (padapter->bup == _FALSE) if (padapter->bup == _FALSE)
{ {
//DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], //DBG_88E("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3],
//addr->sa_data[4], addr->sa_data[5]); //addr->sa_data[4], addr->sa_data[5]);
_rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); _rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
//_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); //_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN);
@ -1014,7 +1014,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
TargetNetdev = dev_get_by_name(devnet, "wlan0"); TargetNetdev = dev_get_by_name(devnet, "wlan0");
#endif #endif
if (TargetNetdev) { if (TargetNetdev) {
DBG_871X("Force onboard module driver disappear !!!\n"); DBG_88E("Force onboard module driver disappear !!!\n");
TargetAdapter = rtw_netdev_priv(TargetNetdev); TargetAdapter = rtw_netdev_priv(TargetNetdev);
TargetAdapter->DriverState = DRIVER_DISAPPEAR; TargetAdapter->DriverState = DRIVER_DISAPPEAR;
@ -1069,7 +1069,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
//pnetdev->init = NULL; //pnetdev->init = NULL;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
DBG_871X("register rtw_netdev_ops to netdev_ops\n"); DBG_88E("register rtw_netdev_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtw_netdev_ops; pnetdev->netdev_ops = &rtw_netdev_ops;
#else #else
pnetdev->open = netdev_open; pnetdev->open = netdev_open;
@ -1367,7 +1367,7 @@ _func_enter_;
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if (rtw_init_tdls_info(padapter) == _FAIL) if (rtw_init_tdls_info(padapter) == _FAIL)
{ {
DBG_871X("Can't rtw_init_tdls_info\n"); DBG_88E("Can't rtw_init_tdls_info\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -1375,14 +1375,14 @@ _func_enter_;
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_xmit_priv\n"); DBG_88E("Can't _rtw_init_xmit_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL) if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_recv_priv\n"); DBG_88E("Can't _rtw_init_recv_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -1394,7 +1394,7 @@ _func_enter_;
if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL) if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_sta_priv\n"); DBG_88E("Can't _rtw_init_sta_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -1409,7 +1409,7 @@ _func_enter_;
#ifdef CONFIG_MP_INCLUDED #ifdef CONFIG_MP_INCLUDED
if (init_mp_priv(padapter) == _FAIL) { if (init_mp_priv(padapter) == _FAIL) {
DBG_871X("%s: initialize MP private data Fail!\n", __func__); DBG_88E("%s: initialize MP private data Fail!\n", __func__);
} }
#endif #endif
@ -1425,7 +1425,7 @@ _func_enter_;
#ifdef CONFIG_INTEL_WIDI #ifdef CONFIG_INTEL_WIDI
if (rtw_init_intel_widi(padapter) == _FAIL) if (rtw_init_intel_widi(padapter) == _FAIL)
{ {
DBG_871X("Can't rtw_init_intel_widi\n"); DBG_88E("Can't rtw_init_intel_widi\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -1599,7 +1599,7 @@ int _netdev_if2_open(struct net_device *pnetdev)
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
_adapter *primary_padapter = padapter->pbuddy_adapter; _adapter *primary_padapter = padapter->pbuddy_adapter;
DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup); DBG_88E("+871x_drv - if2_open, bup=%d\n", padapter->bup);
if (primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE) if (primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE)
{ {
@ -1660,7 +1660,7 @@ int _netdev_if2_open(struct net_device *pnetdev)
else else
rtw_netif_wake_queue(pnetdev); rtw_netif_wake_queue(pnetdev);
DBG_871X("-871x_drv - if2_open, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - if2_open, bup=%d\n", padapter->bup);
return 0; return 0;
netdev_if2_open_error: netdev_if2_open_error:
@ -1741,7 +1741,7 @@ _adapter *rtw_drv_if2_init(_adapter *primary_padapter, char *name,
goto error_rtw_drv_if2_init; goto error_rtw_drv_if2_init;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
DBG_871X("register rtw_netdev_if2_ops to netdev_ops\n"); DBG_88E("register rtw_netdev_if2_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtw_netdev_if2_ops; pnetdev->netdev_ops = &rtw_netdev_if2_ops;
#else #else
pnetdev->open = netdev_if2_open; pnetdev->open = netdev_if2_open;
@ -1852,7 +1852,7 @@ _adapter *rtw_drv_if2_init(_adapter *primary_padapter, char *name,
_rtw_memcpy(pnetdev->dev_addr, mac, ETH_ALEN); _rtw_memcpy(pnetdev->dev_addr, mac, ETH_ALEN);
DBG_871X("MAC Address (if2) = "MAC_FMT"\n", MAC_ARG(mac)); DBG_88E("MAC Address (if2) = "MAC_FMT"\n", MAC_ARG(mac));
primary_padapter->pbuddy_adapter = padapter; primary_padapter->pbuddy_adapter = padapter;
@ -2021,7 +2021,7 @@ int _netdev_open(struct net_device *pnetdev)
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup); DBG_88E("+871x_drv - drv_open, bup=%d\n", padapter->bup);
if (pwrctrlpriv->ps_flag == _TRUE){ if (pwrctrlpriv->ps_flag == _TRUE){
padapter->net_closed = _FALSE; padapter->net_closed = _FALSE;
@ -2041,7 +2041,7 @@ int _netdev_open(struct net_device *pnetdev)
goto netdev_open_error; goto netdev_open_error;
} }
DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr)); DBG_88E("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
#ifdef CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_RF_GAIN_OFFSET
rtw_bb_rf_gain_offset(padapter); rtw_bb_rf_gain_offset(padapter);
@ -2050,13 +2050,13 @@ int _netdev_open(struct net_device *pnetdev)
status=rtw_start_drv_threads(padapter); status=rtw_start_drv_threads(padapter);
if (status ==_FAIL) if (status ==_FAIL)
{ {
DBG_871X("Initialize driver software resource Failed!\n"); DBG_88E("Initialize driver software resource Failed!\n");
goto netdev_open_error; goto netdev_open_error;
} }
if (init_hw_mlme_ext(padapter) == _FAIL) if (init_hw_mlme_ext(padapter) == _FAIL)
{ {
DBG_871X("can't init mlme_ext_priv\n"); DBG_88E("can't init mlme_ext_priv\n");
goto netdev_open_error; goto netdev_open_error;
} }
@ -2109,7 +2109,7 @@ netdev_open_normal_process:
#endif #endif
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n"));
DBG_871X("-871x_drv - drv_open, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_open, bup=%d\n", padapter->bup);
return 0; return 0;
@ -2121,7 +2121,7 @@ netdev_open_error:
rtw_netif_stop_queue(pnetdev); rtw_netif_stop_queue(pnetdev);
RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n")); RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n"));
DBG_871X("-871x_drv - drv_open fail, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_open fail, bup=%d\n", padapter->bup);
return (-1); return (-1);
@ -2144,7 +2144,7 @@ int ips_netdrv_open(_adapter *padapter)
{ {
int status = _SUCCESS; int status = _SUCCESS;
padapter->net_closed = _FALSE; padapter->net_closed = _FALSE;
DBG_871X("===> %s.........\n",__func__); DBG_88E("===> %s.........\n",__func__);
padapter->bDriverStopped = _FALSE; padapter->bDriverStopped = _FALSE;
@ -2171,7 +2171,7 @@ int ips_netdrv_open(_adapter *padapter)
netdev_open_error: netdev_open_error:
//padapter->bup = _FALSE; //padapter->bup = _FALSE;
DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup); DBG_88E("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup);
return _FAIL; return _FAIL;
} }
@ -2181,14 +2181,14 @@ int rtw_ips_pwr_up(_adapter *padapter)
{ {
int result; int result;
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
DBG_871X("===> rtw_ips_pwr_up..............\n"); DBG_88E("===> rtw_ips_pwr_up..............\n");
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
result = ips_netdrv_open(padapter); result = ips_netdrv_open(padapter);
rtw_led_control(padapter, LED_CTL_NO_LINK); rtw_led_control(padapter, LED_CTL_NO_LINK);
DBG_871X("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time));
return result; return result;
} }
@ -2196,7 +2196,7 @@ int rtw_ips_pwr_up(_adapter *padapter)
void rtw_ips_pwr_down(_adapter *padapter) void rtw_ips_pwr_down(_adapter *padapter)
{ {
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
DBG_871X("===> rtw_ips_pwr_down...................\n"); DBG_88E("===> rtw_ips_pwr_down...................\n");
padapter->bCardDisableWOHSM = _TRUE; padapter->bCardDisableWOHSM = _TRUE;
padapter->net_closed = _TRUE; padapter->net_closed = _TRUE;
@ -2205,14 +2205,14 @@ void rtw_ips_pwr_down(_adapter *padapter)
rtw_ips_dev_unload(padapter); rtw_ips_dev_unload(padapter);
padapter->bCardDisableWOHSM = _FALSE; padapter->bCardDisableWOHSM = _FALSE;
DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
} }
#endif #endif
void rtw_ips_dev_unload(_adapter *padapter) void rtw_ips_dev_unload(_adapter *padapter)
{ {
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
DBG_871X("====> %s...\n",__func__); DBG_88E("====> %s...\n",__func__);
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0); rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0);
@ -2236,16 +2236,16 @@ void rtw_bb_rf_gain_offset(_adapter *padapter)
u8 tmp = 0x3e; u8 tmp = 0x3e;
u32 res; u32 res;
DBG_871X("+%s value: 0x%02x+\n", __func__, value); DBG_88E("+%s value: 0x%02x+\n", __func__, value);
if (!(value & 0x01)) { if (!(value & 0x01)) {
DBG_871X("Offset RF Gain.\n"); DBG_88E("Offset RF Gain.\n");
res = rtw_hal_read_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, 0xffffffff); res = rtw_hal_read_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, 0xffffffff);
value &= tmp; value &= tmp;
res = value << 14; res = value << 14;
rtw_hal_write_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, RF_GAIN_OFFSET_MASK, res); rtw_hal_write_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, RF_GAIN_OFFSET_MASK, res);
} else { } else {
DBG_871X("Using the default RF gain.\n"); DBG_88E("Using the default RF gain.\n");
} }
} }
#endif //CONFIG_RF_GAIN_OFFSET #endif //CONFIG_RF_GAIN_OFFSET
@ -2281,7 +2281,7 @@ static int netdev_close(struct net_device *pnetdev)
/* if (!padapter->hw_init_completed) /* if (!padapter->hw_init_completed)
{ {
DBG_871X("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); DBG_88E("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
padapter->bDriverStopped = _TRUE; padapter->bDriverStopped = _TRUE;
@ -2289,7 +2289,7 @@ static int netdev_close(struct net_device *pnetdev)
} }
else*/ else*/
if (padapter->pwrctrlpriv.rf_pwrstate == rf_on){ if (padapter->pwrctrlpriv.rf_pwrstate == rf_on){
DBG_871X("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); DBG_88E("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
//s1. //s1.
if (pnetdev) if (pnetdev)
@ -2340,7 +2340,7 @@ static int netdev_close(struct net_device *pnetdev)
#endif #endif
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n"));
DBG_871X("-871x_drv - drv_close, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_close, bup=%d\n", padapter->bup);
return 0; return 0;

44
os_dep/osdep_service.c
View file

@ -290,7 +290,7 @@ void rtw_dump_mem_stat (void)
rx_peak=ATOMIC_READ(&rtw_dbg_mem_stat.rx_peak); rx_peak=ATOMIC_READ(&rtw_dbg_mem_stat.rx_peak);
rx_alloc_err=ATOMIC_READ(&rtw_dbg_mem_stat.rx_alloc_err); rx_alloc_err=ATOMIC_READ(&rtw_dbg_mem_stat.rx_alloc_err);
DBG_871X( "vir_alloc:%d, vir_peak:%d, vir_alloc_err:%d\n" DBG_88E( "vir_alloc:%d, vir_peak:%d, vir_alloc_err:%d\n"
"phy_alloc:%d, phy_peak:%d, phy_alloc_err:%d\n" "phy_alloc:%d, phy_peak:%d, phy_alloc_err:%d\n"
"tx_alloc:%d, tx_peak:%d, tx_alloc_err:%d\n" "tx_alloc:%d, tx_peak:%d, tx_alloc_err:%d\n"
"rx_alloc:%d, rx_peak:%d, rx_alloc_err:%d\n" "rx_alloc:%d, rx_peak:%d, rx_alloc_err:%d\n"
@ -390,7 +390,7 @@ void rtw_update_mem_stat(u8 flag, u32 sz)
inline u8* dbg_rtw_vmalloc(u32 sz, const char *func, int line) inline u8* dbg_rtw_vmalloc(u32 sz, const char *func, int line)
{ {
u8 *p; u8 *p;
//DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz)); //DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p=_rtw_vmalloc((sz)); p=_rtw_vmalloc((sz));
@ -405,7 +405,7 @@ inline u8* dbg_rtw_vmalloc(u32 sz, const char *func, int line)
inline u8* dbg_rtw_zvmalloc(u32 sz, const char *func, int line) inline u8* dbg_rtw_zvmalloc(u32 sz, const char *func, int line)
{ {
u8 *p; u8 *p;
//DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz)); //DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p=_rtw_zvmalloc((sz)); p=_rtw_zvmalloc((sz));
@ -419,7 +419,7 @@ inline u8* dbg_rtw_zvmalloc(u32 sz, const char *func, int line)
inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const char *func, int line) inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const char *func, int line)
{ {
//DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz)); //DBG_88E("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz));
_rtw_vmfree((pbuf), (sz)); _rtw_vmfree((pbuf), (sz));
@ -435,7 +435,7 @@ inline u8* dbg_rtw_malloc(u32 sz, const char *func, int line)
u8 *p; u8 *p;
if ((sz)>4096) if ((sz)>4096)
DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz)); DBG_88E("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz));
p=_rtw_malloc((sz)); p=_rtw_malloc((sz));
@ -452,7 +452,7 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const char *func, int line)
u8 *p; u8 *p;
if ((sz)>4096) if ((sz)>4096)
DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz)); DBG_88E("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz));
p = _rtw_zmalloc((sz)); p = _rtw_zmalloc((sz));
@ -468,7 +468,7 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const char *func, int line)
inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const char *func, int line) inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const char *func, int line)
{ {
if ((sz)>4096) if ((sz)>4096)
DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz)); DBG_88E("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz));
_rtw_mfree((pbuf), (sz)); _rtw_mfree((pbuf), (sz));
@ -486,7 +486,7 @@ void* rtw_malloc2d(int h, int w, int size)
void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size ); void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size );
if (a == NULL) if (a == NULL)
{ {
DBG_871X("%s: alloc memory fail!\n", __func__); DBG_88E("%s: alloc memory fail!\n", __func__);
return NULL; return NULL;
} }
@ -1166,7 +1166,7 @@ void rtw_usleep_os(int us)
#ifdef DBG_DELAY_OS #ifdef DBG_DELAY_OS
void _rtw_mdelay_os(int ms, const char *func, const int line) void _rtw_mdelay_os(int ms, const char *func, const int line)
{ {
DBG_871X("%s:%d %s(%d)\n", func, line, __func__, ms); DBG_88E("%s:%d %s(%d)\n", func, line, __func__, ms);
#if defined(PLATFORM_LINUX) #if defined(PLATFORM_LINUX)
@ -1182,7 +1182,7 @@ void _rtw_mdelay_os(int ms, const char *func, const int line)
} }
void _rtw_udelay_os(int us, const char *func, const int line) void _rtw_udelay_os(int us, const char *func, const int line)
{ {
DBG_871X("%s:%d %s(%d)\n", func, line, __func__, us); DBG_88E("%s:%d %s(%d)\n", func, line, __func__, us);
#if defined(PLATFORM_LINUX) #if defined(PLATFORM_LINUX)
@ -1289,7 +1289,7 @@ inline void rtw_lock_suspend()
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
//DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); //DBG_88E("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count);
#endif #endif
} }
@ -1302,7 +1302,7 @@ inline void rtw_unlock_suspend()
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
//DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); //DBG_88E("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count);
#endif #endif
} }
@ -1551,20 +1551,20 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
if (path && buf) { if (path && buf) {
if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp); DBG_88E("%s openFile path:%s fp=%p\n",__func__, path ,fp);
oldfs = get_fs(); set_fs(get_ds()); oldfs = get_fs(); set_fs(get_ds());
ret=readFile(fp, buf, sz); ret=readFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s readFile, ret:%d\n",__func__, ret); DBG_88E("%s readFile, ret:%d\n",__func__, ret);
} else { } else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret); DBG_88E("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret);
} }
} else { } else {
DBG_871X("%s NULL pointer\n",__func__); DBG_88E("%s NULL pointer\n",__func__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
@ -1585,20 +1585,20 @@ static int storeToFile(char *path, u8* buf, u32 sz)
if (path && buf) { if (path && buf) {
if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp); DBG_88E("%s openFile path:%s fp=%p\n",__func__, path ,fp);
oldfs = get_fs(); set_fs(get_ds()); oldfs = get_fs(); set_fs(get_ds());
ret=writeFile(fp, buf, sz); ret=writeFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s writeFile, ret:%d\n",__func__, ret); DBG_88E("%s writeFile, ret:%d\n",__func__, ret);
} else { } else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret); DBG_88E("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret);
} }
} else { } else {
DBG_871X("%s NULL pointer\n",__func__); DBG_88E("%s NULL pointer\n",__func__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
@ -1983,7 +1983,7 @@ bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf)
return _FAIL; return _FAIL;
if (0) if (0)
DBG_871X("%s on %u\n", __func__, cbuf->write); DBG_88E("%s on %u\n", __func__, cbuf->write);
cbuf->bufs[cbuf->write] = buf; cbuf->bufs[cbuf->write] = buf;
cbuf->write = (cbuf->write+1)%cbuf->size; cbuf->write = (cbuf->write+1)%cbuf->size;
@ -2004,7 +2004,7 @@ void *rtw_cbuf_pop(struct rtw_cbuf *cbuf)
return NULL; return NULL;
if (0) if (0)
DBG_871X("%s on %u\n", __func__, cbuf->read); DBG_88E("%s on %u\n", __func__, cbuf->read);
buf = cbuf->bufs[cbuf->read]; buf = cbuf->bufs[cbuf->read];
cbuf->read = (cbuf->read+1)%cbuf->size; cbuf->read = (cbuf->read+1)%cbuf->size;

12
os_dep/recv_linux.c
View file

@ -226,7 +226,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
//skb->protocol = __constant_htons(0x0019); /*ETH_P_80211_RAW*/ //skb->protocol = __constant_htons(0x0019); /*ETH_P_80211_RAW*/
skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/ skb->protocol = __constant_htons(0x0003); /*ETH_P_80211_RAW*/
//DBG_871X("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len); //DBG_88E("(1)data=0x%x, head=0x%x, tail=0x%x, mac_header=0x%x, len=%d\n", skb->data, skb->head, skb->tail, skb->mac_header, skb->len);
//skb->mac.raw = skb->data; //skb->mac.raw = skb->data;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
@ -302,7 +302,7 @@ _func_enter_;
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
//DBG_871X("bmcast=%d\n", bmcast); //DBG_88E("bmcast=%d\n", bmcast);
if (_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==_FALSE) { if (_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==_FALSE) {
if (bmcast) { if (bmcast) {
@ -316,7 +316,7 @@ _func_enter_;
{ {
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
//DBG_871X("directly forwarding to the rtw_xmit_entry\n"); //DBG_88E("directly forwarding to the rtw_xmit_entry\n");
//skb->ip_summed = CHECKSUM_NONE; //skb->ip_summed = CHECKSUM_NONE;
skb->dev = pnetdev; skb->dev = pnetdev;
@ -336,7 +336,7 @@ _func_enter_;
} }
else// to APself else// to APself
{ {
//DBG_871X("to APSelf\n"); //DBG_88E("to APSelf\n");
} }
} }
@ -372,10 +372,10 @@ _func_enter_;
#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX #ifdef CONFIG_TCP_CSUM_OFFLOAD_RX
if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) { if ( (pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1) ) {
skb->ip_summed = CHECKSUM_UNNECESSARY; skb->ip_summed = CHECKSUM_UNNECESSARY;
//DBG_871X("CHECKSUM_UNNECESSARY\n"); //DBG_88E("CHECKSUM_UNNECESSARY\n");
} else { } else {
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
//DBG_871X("CHECKSUM_NONE(%d, %d)\n", pattrib->tcpchk_valid, pattrib->tcp_chkrpt); //DBG_88E("CHECKSUM_NONE(%d, %d)\n", pattrib->tcpchk_valid, pattrib->tcp_chkrpt);
} }
#else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */ #else /* !CONFIG_TCP_CSUM_OFFLOAD_RX */

56
os_dep/rtw_android.c
View file

@ -156,7 +156,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
DHD_INFO(("%s: command=%s, len=%d\n", __func__, command, total_len)); DHD_INFO(("%s: command=%s, len=%d\n", __func__, command, total_len));
if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) { if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) {
DBG_871X("%s argument=%d less min size\n", __func__, total_len); DBG_88E("%s argument=%d less min size\n", __func__, total_len);
goto exit_proc; goto exit_proc;
} }
@ -183,11 +183,11 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local, if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local,
MAX_PFN_LIST_COUNT, &tlv_size_left)) <= 0) { MAX_PFN_LIST_COUNT, &tlv_size_left)) <= 0) {
DBG_871X("SSID is not presented or corrupted ret=%d\n", nssid); DBG_88E("SSID is not presented or corrupted ret=%d\n", nssid);
goto exit_proc; goto exit_proc;
} else { } else {
if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) { if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) {
DBG_871X("%s scan duration corrupted field size %d\n", DBG_88E("%s scan duration corrupted field size %d\n",
__func__, tlv_size_left); __func__, tlv_size_left);
goto exit_proc; goto exit_proc;
} }
@ -197,7 +197,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
if (str_ptr[0] != 0) { if (str_ptr[0] != 0) {
if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) { if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) {
DBG_871X("%s pno repeat : corrupted field\n", DBG_88E("%s pno repeat : corrupted field\n",
__func__); __func__);
goto exit_proc; goto exit_proc;
} }
@ -205,7 +205,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16); pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16);
DHD_INFO(("%s :got pno_repeat=%d\n", __func__, pno_repeat)); DHD_INFO(("%s :got pno_repeat=%d\n", __func__, pno_repeat));
if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) { if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) {
DBG_871X("%s FREQ_EXPO_MAX corrupted field size\n", DBG_88E("%s FREQ_EXPO_MAX corrupted field size\n",
__func__); __func__);
goto exit_proc; goto exit_proc;
} }
@ -216,7 +216,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
} }
} }
} else { } else {
DBG_871X("%s get wrong TLV command\n", __func__); DBG_88E("%s get wrong TLV command\n", __func__);
goto exit_proc; goto exit_proc;
} }
@ -346,17 +346,17 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
//DBG_871X("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len); //DBG_88E("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len);
command = kmalloc(priv_cmd.total_len, GFP_KERNEL); command = kmalloc(priv_cmd.total_len, GFP_KERNEL);
if (!command) if (!command)
{ {
DBG_871X("%s: failed to allocate memory\n", __func__); DBG_88E("%s: failed to allocate memory\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
goto exit; goto exit;
} }
if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){ if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){
DBG_871X("%s: failed to access memory\n", __func__); DBG_88E("%s: failed to access memory\n", __func__);
ret = -EFAULT; ret = -EFAULT;
goto exit; goto exit;
} }
@ -365,7 +365,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
DBG_871X("%s: Android private cmd \"%s\" on %s\n" DBG_88E("%s: Android private cmd \"%s\" on %s\n"
, __func__, command, ifr->ifr_name); , __func__, command, ifr->ifr_name);
cmd_num = rtw_android_cmdstr_to_num(command); cmd_num = rtw_android_cmdstr_to_num(command);
@ -379,7 +379,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
} }
if (!g_wifi_on) { if (!g_wifi_on) {
DBG_871X("%s: Ignore private cmd \"%s\" - iface %s is down\n" DBG_88E("%s: Ignore private cmd \"%s\" - iface %s is down\n"
,__func__, command, ifr->ifr_name); ,__func__, command, ifr->ifr_name);
ret = 0; ret = 0;
goto exit; goto exit;
@ -548,7 +548,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
} }
#endif #endif
default: default:
DBG_871X("Unknown PRIVATE command %s - ignored\n", command); DBG_88E("Unknown PRIVATE command %s - ignored\n", command);
snprintf(command, 3, "OK"); snprintf(command, 3, "OK");
bytes_written = strlen("OK"); bytes_written = strlen("OK");
} }
@ -558,14 +558,14 @@ response:
if ((bytes_written == 0) && (priv_cmd.total_len > 0)) if ((bytes_written == 0) && (priv_cmd.total_len > 0))
command[0] = '\0'; command[0] = '\0';
if (bytes_written >= priv_cmd.total_len) { if (bytes_written >= priv_cmd.total_len) {
DBG_871X("%s: bytes_written = %d\n", __func__, bytes_written); DBG_88E("%s: bytes_written = %d\n", __func__, bytes_written);
bytes_written = priv_cmd.total_len; bytes_written = priv_cmd.total_len;
} else { } else {
bytes_written++; bytes_written++;
} }
priv_cmd.used_len = bytes_written; priv_cmd.used_len = bytes_written;
if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) { if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) {
DBG_871X("%s: failed to copy data to user buffer\n", __func__); DBG_88E("%s: failed to copy data to user buffer\n", __func__);
ret = -EFAULT; ret = -EFAULT;
} }
} }
@ -603,7 +603,7 @@ int rtw_android_wifictrl_func_add(void)
ret = wifi_add_dev(); ret = wifi_add_dev();
if (ret) { if (ret) {
DBG_871X("%s: platform_driver_register failed\n", __func__); DBG_88E("%s: platform_driver_register failed\n", __func__);
return ret; return ret;
} }
g_wifidev_registered = 1; g_wifidev_registered = 1;
@ -611,7 +611,7 @@ int rtw_android_wifictrl_func_add(void)
/* Waiting callback after platform_driver_register is done or exit with error */ /* Waiting callback after platform_driver_register is done or exit with error */
if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) { if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) {
ret = -EINVAL; ret = -EINVAL;
DBG_871X("%s: platform_driver_register timeout\n", __func__); DBG_88E("%s: platform_driver_register timeout\n", __func__);
} }
return ret; return ret;
@ -632,14 +632,14 @@ void *wl_android_prealloc(int section, unsigned long size)
if (wifi_control_data && wifi_control_data->mem_prealloc) { if (wifi_control_data && wifi_control_data->mem_prealloc) {
alloc_ptr = wifi_control_data->mem_prealloc(section, size); alloc_ptr = wifi_control_data->mem_prealloc(section, size);
if (alloc_ptr) { if (alloc_ptr) {
DBG_871X("success alloc section %d\n", section); DBG_88E("success alloc section %d\n", section);
if (size != 0L) if (size != 0L)
memset(alloc_ptr, 0, size); memset(alloc_ptr, 0, size);
return alloc_ptr; return alloc_ptr;
} }
} }
DBG_871X("can't alloc section %d\n", section); DBG_88E("can't alloc section %d\n", section);
return NULL; return NULL;
} }
@ -658,7 +658,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr)
int wifi_set_power(int on, unsigned long msec) int wifi_set_power(int on, unsigned long msec)
{ {
DBG_871X("%s = %d\n", __func__, on); DBG_88E("%s = %d\n", __func__, on);
if (wifi_control_data && wifi_control_data->set_power) { if (wifi_control_data && wifi_control_data->set_power) {
wifi_control_data->set_power(on); wifi_control_data->set_power(on);
} }
@ -670,7 +670,7 @@ int wifi_set_power(int on, unsigned long msec)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
int wifi_get_mac_addr(unsigned char *buf) int wifi_get_mac_addr(unsigned char *buf)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
if (!buf) if (!buf)
return -EINVAL; return -EINVAL;
if (wifi_control_data && wifi_control_data->get_mac_addr) { if (wifi_control_data && wifi_control_data->get_mac_addr) {
@ -683,7 +683,7 @@ int wifi_get_mac_addr(unsigned char *buf)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE)
void *wifi_get_country_code(char *ccode) void *wifi_get_country_code(char *ccode)
{ {
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
if (!ccode) if (!ccode)
return NULL; return NULL;
if (wifi_control_data && wifi_control_data->get_country_code) { if (wifi_control_data && wifi_control_data->get_country_code) {
@ -695,7 +695,7 @@ void *wifi_get_country_code(char *ccode)
static int wifi_set_carddetect(int on) static int wifi_set_carddetect(int on)
{ {
DBG_871X("%s = %d\n", __func__, on); DBG_88E("%s = %d\n", __func__, on);
if (wifi_control_data && wifi_control_data->set_carddetect) { if (wifi_control_data && wifi_control_data->set_carddetect) {
wifi_control_data->set_carddetect(on); wifi_control_data->set_carddetect(on);
} }
@ -707,7 +707,7 @@ static int wifi_probe(struct platform_device *pdev)
struct wifi_platform_data *wifi_ctrl = struct wifi_platform_data *wifi_ctrl =
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
DBG_871X("## %s\n", __func__); DBG_88E("## %s\n", __func__);
wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq"); wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq");
if (wifi_irqres == NULL) if (wifi_irqres == NULL)
wifi_irqres = platform_get_resource_byname(pdev, wifi_irqres = platform_get_resource_byname(pdev,
@ -726,7 +726,7 @@ static int wifi_remove(struct platform_device *pdev)
struct wifi_platform_data *wifi_ctrl = struct wifi_platform_data *wifi_ctrl =
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
DBG_871X("## %s\n", __func__); DBG_88E("## %s\n", __func__);
wifi_control_data = wifi_ctrl; wifi_control_data = wifi_ctrl;
wifi_set_power(0, 0); /* Power Off */ wifi_set_power(0, 0); /* Power Off */
@ -738,7 +738,7 @@ static int wifi_remove(struct platform_device *pdev)
static int wifi_suspend(struct platform_device *pdev, pm_message_t state) static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
{ {
DBG_871X("##> %s\n", __func__); DBG_88E("##> %s\n", __func__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
bcmsdh_oob_intr_set(0); bcmsdh_oob_intr_set(0);
#endif #endif
@ -747,7 +747,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
static int wifi_resume(struct platform_device *pdev) static int wifi_resume(struct platform_device *pdev)
{ {
DBG_871X("##> %s\n", __func__); DBG_88E("##> %s\n", __func__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
if (dhd_os_check_if_up(bcmsdh_get_drvdata())) if (dhd_os_check_if_up(bcmsdh_get_drvdata()))
bcmsdh_oob_intr_set(1); bcmsdh_oob_intr_set(1);
@ -778,7 +778,7 @@ static struct platform_driver wifi_device_legacy = {
static int wifi_add_dev(void) static int wifi_add_dev(void)
{ {
DBG_871X("## Calling platform_driver_register\n"); DBG_88E("## Calling platform_driver_register\n");
platform_driver_register(&wifi_device); platform_driver_register(&wifi_device);
platform_driver_register(&wifi_device_legacy); platform_driver_register(&wifi_device_legacy);
return 0; return 0;
@ -786,7 +786,7 @@ static int wifi_add_dev(void)
static void wifi_del_dev(void) static void wifi_del_dev(void)
{ {
DBG_871X("## Unregister platform_driver_register\n"); DBG_88E("## Unregister platform_driver_register\n");
platform_driver_unregister(&wifi_device); platform_driver_unregister(&wifi_device);
platform_driver_unregister(&wifi_device_legacy); platform_driver_unregister(&wifi_device_legacy);
} }

260
os_dep/usb_intf.c
View file

@ -452,7 +452,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
if (dvobj->usb_alloc_vendor_req_buf == NULL) { if (dvobj->usb_alloc_vendor_req_buf == NULL) {
DBG_871X("alloc usb_vendor_req_buf failed... /n"); DBG_88E("alloc usb_vendor_req_buf failed... /n");
rst = _FAIL; rst = _FAIL;
goto exit; goto exit;
} }
@ -528,27 +528,27 @@ _func_enter_;
{ {
pendp_desc = &phost_endp->desc; pendp_desc = &phost_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i); DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",pendp_desc->bLength); DBG_88E("bLength=%x\n",pendp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",pendp_desc->bDescriptorType); DBG_88E("bDescriptorType=%x\n",pendp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress); DBG_88E("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress);
DBG_871X("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize)); DBG_88E("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",pendp_desc->bInterval); DBG_88E("bInterval=%x\n",pendp_desc->bInterval);
if (RT_usb_endpoint_is_bulk_in(pendp_desc)) { if (RT_usb_endpoint_is_bulk_in(pendp_desc)) {
DBG_871X("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(pendp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(pendp_desc));
pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumInPipes++; pdvobjpriv->RtNumInPipes++;
} }
else if (RT_usb_endpoint_is_int_in(pendp_desc)) else if (RT_usb_endpoint_is_int_in(pendp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(pendp_desc),pendp_desc->bInterval); DBG_88E("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(pendp_desc),pendp_desc->bInterval);
pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumInPipes++; pdvobjpriv->RtNumInPipes++;
} }
else if (RT_usb_endpoint_is_bulk_out(pendp_desc)) else if (RT_usb_endpoint_is_bulk_out(pendp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(pendp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(pendp_desc));
pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumOutPipes++; pdvobjpriv->RtNumOutPipes++;
} }
@ -556,14 +556,14 @@ _func_enter_;
} }
} }
DBG_871X("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); DBG_88E("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
if (pusbd->speed == USB_SPEED_HIGH) { if (pusbd->speed == USB_SPEED_HIGH) {
pdvobjpriv->ishighspeed = _TRUE; pdvobjpriv->ishighspeed = _TRUE;
DBG_871X("USB_SPEED_HIGH\n"); DBG_88E("USB_SPEED_HIGH\n");
} else { } else {
pdvobjpriv->ishighspeed = _FALSE; pdvobjpriv->ishighspeed = _FALSE;
DBG_871X("NON USB_SPEED_HIGH\n"); DBG_88E("NON USB_SPEED_HIGH\n");
} }
if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) { if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) {
@ -604,7 +604,7 @@ _func_enter_;
if (interface_to_usbdev(usb_intf)->state != USB_STATE_NOTATTACHED) { if (interface_to_usbdev(usb_intf)->state != USB_STATE_NOTATTACHED) {
//If we didn't unplug usb dongle and remove/insert modlue, driver fails on sitesurvey for the first time when device is up . //If we didn't unplug usb dongle and remove/insert modlue, driver fails on sitesurvey for the first time when device is up .
//Reset usb port for sitesurvey fail issue. 2009.8.13, by Thomas //Reset usb port for sitesurvey fail issue. 2009.8.13, by Thomas
DBG_871X("usb attached..., try to reset usb device\n"); DBG_88E("usb attached..., try to reset usb device\n");
usb_reset_device(interface_to_usbdev(usb_intf)); usb_reset_device(interface_to_usbdev(usb_intf));
} }
} }
@ -612,7 +612,7 @@ _func_enter_;
rtw_mfree((u8*)dvobj, sizeof(*dvobj)); rtw_mfree((u8*)dvobj, sizeof(*dvobj));
} }
//DBG_871X("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount)); //DBG_88E("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount));
usb_put_dev(interface_to_usbdev(usb_intf)); usb_put_dev(interface_to_usbdev(usb_intf));
_func_exit_; _func_exit_;
@ -668,7 +668,7 @@ static void rtw_dev_unload(_adapter *padapter)
if (padapter->bup == _TRUE) if (padapter->bup == _TRUE)
{ {
DBG_871X("===> rtw_dev_unload\n"); DBG_88E("===> rtw_dev_unload\n");
padapter->bDriverStopped = _TRUE; padapter->bDriverStopped = _TRUE;
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
@ -690,10 +690,10 @@ static void rtw_dev_unload(_adapter *padapter)
//s5. //s5.
if (padapter->bSurpriseRemoved == _FALSE) if (padapter->bSurpriseRemoved == _FALSE)
{ {
//DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); //DBG_88E("r871x_dev_unload()->rtl871x_hal_deinit()\n");
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if ((padapter->pwrctrlpriv.bSupportRemoteWakeup==_TRUE)&&(padapter->pwrctrlpriv.wowlan_mode==_TRUE)){ if ((padapter->pwrctrlpriv.bSupportRemoteWakeup==_TRUE)&&(padapter->pwrctrlpriv.wowlan_mode==_TRUE)){
DBG_871X("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__func__); DBG_88E("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__func__);
} }
else else
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
@ -713,7 +713,7 @@ static void rtw_dev_unload(_adapter *padapter)
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == _FALSE\n" )); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == _FALSE\n" ));
} }
DBG_871X("<=== rtw_dev_unload\n"); DBG_88E("<=== rtw_dev_unload\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n"));
@ -748,7 +748,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
{ {
extern char* ifname; extern char* ifname;
strncpy(ifname, "wlan10", 6); strncpy(ifname, "wlan10", 6);
//DBG_871X("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid); //DBG_88E("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid);
} }
#endif /* RTK_DMP_PLATFORM */ #endif /* RTK_DMP_PLATFORM */
@ -766,7 +766,7 @@ int rtw_hw_suspend(_adapter *padapter )
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{ {
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
goto error_exit; goto error_exit;
} }
@ -775,7 +775,7 @@ int rtw_hw_suspend(_adapter *padapter )
{ {
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
DBG_871X("==> rtw_hw_suspend\n"); DBG_88E("==> rtw_hw_suspend\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = _TRUE;
//padapter->net_closed = _TRUE; //padapter->net_closed = _TRUE;
@ -829,7 +829,7 @@ int rtw_hw_suspend(_adapter *padapter )
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, failed\n",__func__); DBG_88E("%s, failed\n",__func__);
return (-1); return (-1);
} }
@ -844,7 +844,7 @@ int rtw_hw_resume(_adapter *padapter)
if (padapter)//system resume if (padapter)//system resume
{ {
DBG_871X("==> rtw_hw_resume\n"); DBG_88E("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = _TRUE;
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
@ -880,7 +880,7 @@ int rtw_hw_resume(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, Open net dev failed\n",__func__); DBG_88E("%s, Open net dev failed\n",__func__);
return (-1); return (-1);
} }
#endif #endif
@ -902,7 +902,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
_func_enter_; _func_enter_;
DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n",__func__, current->comm, current->pid);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (check_fwstate(pmlmepriv, _FW_LINKED)) if (check_fwstate(pmlmepriv, _FW_LINKED))
@ -913,7 +913,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{ {
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
goto exit; goto exit;
} }
@ -962,8 +962,8 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
#ifdef CONFIG_LAYER2_ROAMING_RESUME #ifdef CONFIG_LAYER2_ROAMING_RESUME
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) ) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) )
{ {
//DBG_871X("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid); //DBG_88E("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid);
DBG_871X("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__func__, __LINE__, DBG_88E("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__func__, __LINE__,
pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress), MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength, pmlmepriv->cur_network.network.Ssid.SsidLength,
@ -996,7 +996,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
rtw_indicate_disconnect(padapter); rtw_indicate_disconnect(padapter);
exit: exit:
DBG_871X("<=== %s return %d.............. in %dms\n", __func__ DBG_88E("<=== %s return %d.............. in %dms\n", __func__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
_func_exit_; _func_exit_;
@ -1048,7 +1048,7 @@ int rtw_resume_process(_adapter *padapter)
#endif //#ifdef CONFIG_BT_COEXIST #endif //#ifdef CONFIG_BT_COEXIST
_func_enter_; _func_enter_;
DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n",__func__, current->comm, current->pid);
if (padapter) { if (padapter) {
pnetdev= padapter->pnetdev; pnetdev= padapter->pnetdev;
@ -1061,18 +1061,18 @@ int rtw_resume_process(_adapter *padapter)
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume); DBG_88E("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume);
pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)); pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt);
pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt; pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt;
#endif #endif
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( _TRUE == pwrpriv->bAutoResume ){ if ( _TRUE == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = _FALSE; pwrpriv->bInternalAutoSuspend = _FALSE;
pwrpriv->bAutoResume=_FALSE; pwrpriv->bAutoResume=_FALSE;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
} }
#endif //#ifdef CONFIG_AUTOSUSPEND #endif //#ifdef CONFIG_AUTOSUSPEND
@ -1080,7 +1080,7 @@ int rtw_resume_process(_adapter *padapter)
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
pwrpriv->bkeepfwalive = _FALSE; pwrpriv->bkeepfwalive = _FALSE;
DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); DBG_88E("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive);
if (pm_netdev_open(pnetdev,_TRUE) != 0) if (pm_netdev_open(pnetdev,_TRUE) != 0)
goto exit; goto exit;
@ -1102,11 +1102,11 @@ int rtw_resume_process(_adapter *padapter)
#endif #endif
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( _TRUE == pwrpriv->bAutoResume ){ if ( _TRUE == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = _FALSE; pwrpriv->bInternalAutoSuspend = _FALSE;
pwrpriv->bAutoResume=_FALSE; pwrpriv->bAutoResume=_FALSE;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
} }
#else //#ifdef CONFIG_BT_COEXIST #else //#ifdef CONFIG_BT_COEXIST
@ -1114,7 +1114,7 @@ int rtw_resume_process(_adapter *padapter)
#endif //#ifdef CONFIG_BT_COEXIST #endif //#ifdef CONFIG_BT_COEXIST
pwrpriv->brfoffbyhw = _FALSE; pwrpriv->brfoffbyhw = _FALSE;
{ {
DBG_871X("enc_algorithm(%x),wepkeymask(%x)\n", DBG_88E("enc_algorithm(%x),wepkeymask(%x)\n",
padapter->securitypriv.dot11PrivacyAlgrthm,pwrpriv->wepkeymask); padapter->securitypriv.dot11PrivacyAlgrthm,pwrpriv->wepkeymask);
if ( (_WEP40_ == padapter->securitypriv.dot11PrivacyAlgrthm) || if ( (_WEP40_ == padapter->securitypriv.dot11PrivacyAlgrthm) ||
(_WEP104_ == padapter->securitypriv.dot11PrivacyAlgrthm)) (_WEP104_ == padapter->securitypriv.dot11PrivacyAlgrthm))
@ -1136,7 +1136,7 @@ int rtw_resume_process(_adapter *padapter)
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
if ( padapter->pid[1]!=0) { if ( padapter->pid[1]!=0) {
DBG_871X("pid[1]:%d\n",padapter->pid[1]); DBG_88E("pid[1]:%d\n",padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2); rtw_signal_process(padapter->pid[1], SIGUSR2);
} }
@ -1151,7 +1151,7 @@ exit:
#endif //CONFIG_RESUME_IN_WORKQUEUE #endif //CONFIG_RESUME_IN_WORKQUEUE
pwrpriv->bInSuspend = _FALSE; pwrpriv->bInSuspend = _FALSE;
DBG_871X("<=== %s return %d.............. in %dms\n", __func__ DBG_88E("<=== %s return %d.............. in %dms\n", __func__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
_func_exit_; _func_exit_;
@ -1165,7 +1165,7 @@ void autosuspend_enter(_adapter* padapter)
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("==>autosuspend_enter...........\n"); DBG_88E("==>autosuspend_enter...........\n");
pwrpriv->bInternalAutoSuspend = _TRUE; pwrpriv->bInternalAutoSuspend = _TRUE;
pwrpriv->bips_processing = _TRUE; pwrpriv->bips_processing = _TRUE;
@ -1204,14 +1204,14 @@ void autosuspend_enter(_adapter* padapter)
pwrpriv->autopm_cnt --; pwrpriv->autopm_cnt --;
} }
else else
DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_put_interface\n", pwrpriv->autopm_cnt); DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_put_interface\n", pwrpriv->autopm_cnt);
#endif //#ifndef CONFIG_BT_COEXIST #endif //#ifndef CONFIG_BT_COEXIST
} }
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
} }
@ -1224,7 +1224,7 @@ int autoresume_enter(_adapter* padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("====> autoresume_enter\n"); DBG_88E("====> autoresume_enter\n");
if (rf_off == pwrpriv->rf_pwrstate ) if (rf_off == pwrpriv->rf_pwrstate )
{ {
@ -1233,7 +1233,7 @@ int autoresume_enter(_adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm: %d\n", result); DBG_88E( "can't get autopm: %d\n", result);
result = _FAIL; result = _FAIL;
goto error_exit; goto error_exit;
} }
@ -1244,9 +1244,9 @@ int autoresume_enter(_adapter* padapter)
#endif #endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
#else //#ifndef CONFIG_BT_COEXIST #else //#ifndef CONFIG_BT_COEXIST
pwrpriv->bAutoResume=_TRUE; pwrpriv->bAutoResume=_TRUE;
@ -1254,7 +1254,7 @@ int autoresume_enter(_adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm: %d\n", result); DBG_88E( "can't get autopm: %d\n", result);
result = _FAIL; result = _FAIL;
goto error_exit; goto error_exit;
} }
@ -1264,17 +1264,17 @@ int autoresume_enter(_adapter* padapter)
usb_autoresume_device(dvobj->pusbdev, 1); usb_autoresume_device(dvobj->pusbdev, 1);
#endif #endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
pwrpriv->autopm_cnt++; pwrpriv->autopm_cnt++;
} }
else else
DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt); DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt);
#endif //#ifndef CONFIG_BT_COEXIST #endif //#ifndef CONFIG_BT_COEXIST
} }
DBG_871X("<==== autoresume_enter\n"); DBG_88E("<==== autoresume_enter\n");
error_exit: error_exit:
return result; return result;
@ -1388,8 +1388,8 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
dvobj->pusbdev->do_remote_wakeup=1; dvobj->pusbdev->do_remote_wakeup=1;
pusb_intf->needs_remote_wakeup = 1; pusb_intf->needs_remote_wakeup = 1;
device_init_wakeup(&pusb_intf->dev, 1); device_init_wakeup(&pusb_intf->dev, 1);
DBG_871X("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n"); DBG_88E("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
DBG_871X("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev)); DBG_88E("\n padapter->pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev));
} }
#endif #endif
#endif #endif
@ -1414,9 +1414,9 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
//usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf );//init pm_usage_cnt ,let it start from 1 //usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf );//init pm_usage_cnt ,let it start from 1
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt))); DBG_88E("%s...pm_usage_cnt(%d).....\n",__func__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
#else #else
DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,dvobj->pusbintf ->pm_usage_cnt); DBG_88E("%s...pm_usage_cnt(%d).....\n",__func__,dvobj->pusbintf ->pm_usage_cnt);
#endif #endif
} }
} }
@ -1425,7 +1425,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(pusb_intf) < 0) if (usb_autopm_get_interface(pusb_intf) < 0)
{ {
DBG_871X( "can't get autopm:\n"); DBG_88E( "can't get autopm:\n");
} }
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
@ -1437,14 +1437,14 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
rtw_macaddr_cfg(padapter->eeprompriv.mac_addr); rtw_macaddr_cfg(padapter->eeprompriv.mac_addr);
rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr);
_rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
DBG_871X("MAC Address from pnetdev->dev_addr= " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); DBG_88E("MAC Address from pnetdev->dev_addr= " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
hostapd_mode_init(padapter); hostapd_mode_init(padapter);
#endif #endif
#ifdef CONFIG_PLATFORM_RTD2880B #ifdef CONFIG_PLATFORM_RTD2880B
DBG_871X("wlan link up\n"); DBG_88E("wlan link up\n");
rtd2885_wlan_netlink_sendMsg("linkup", "8712"); rtd2885_wlan_netlink_sendMsg("linkup", "8712");
#endif #endif
@ -1458,7 +1458,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
rtw_proc_init_one(pnetdev); rtw_proc_init_one(pnetdev);
#endif #endif
DBG_871X("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n" DBG_88E("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n"
, padapter->bDriverStopped , padapter->bDriverStopped
, padapter->bSurpriseRemoved , padapter->bSurpriseRemoved
, padapter->bup , padapter->bup
@ -1523,7 +1523,7 @@ static void rtw_usb_if1_deinit(_adapter *if1)
rtw_dev_unload(if1); rtw_dev_unload(if1);
DBG_871X("+r871xu_dev_remove, hw_init_completed=%d\n", if1->hw_init_completed); DBG_88E("+r871xu_dev_remove, hw_init_completed=%d\n", if1->hw_init_completed);
rtw_handle_dualmac(if1, 0); rtw_handle_dualmac(if1, 0);
@ -1551,7 +1551,7 @@ static void rtw_usb_if1_deinit(_adapter *if1)
rtw_free_netdev(pnetdev); rtw_free_netdev(pnetdev);
#ifdef CONFIG_PLATFORM_RTD2880B #ifdef CONFIG_PLATFORM_RTD2880B
DBG_871X("wlan link down\n"); DBG_88E("wlan link down\n");
rtd2885_wlan_netlink_sendMsg("linkdown", "8712"); rtd2885_wlan_netlink_sendMsg("linkdown", "8712");
#endif #endif
@ -1574,58 +1574,58 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
struct usb_endpoint_descriptor *endp_desc; struct usb_endpoint_descriptor *endp_desc;
#if 1 /* The usb device this usb interface belongs to */ #if 1 /* The usb device this usb interface belongs to */
DBG_871X("usb_interface:%p, usb_device:%p(num:%d, path:%s), usb_device_descriptor:%p\n", usb_intf, udev, udev->devnum, udev->devpath, dev_desc); DBG_88E("usb_interface:%p, usb_device:%p(num:%d, path:%s), usb_device_descriptor:%p\n", usb_intf, udev, udev->devnum, udev->devpath, dev_desc);
DBG_871X("bLength:%u\n", dev_desc->bLength); DBG_88E("bLength:%u\n", dev_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType);
DBG_871X("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB)); DBG_88E("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB));
DBG_871X("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass); DBG_88E("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass);
DBG_871X("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass); DBG_88E("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass);
DBG_871X("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol); DBG_88E("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol);
DBG_871X("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0); DBG_88E("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0);
DBG_871X("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor)); DBG_88E("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor));
DBG_871X("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct)); DBG_88E("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct));
DBG_871X("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice)); DBG_88E("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice));
DBG_871X("iManufacturer:0x02%x\n", dev_desc->iManufacturer); DBG_88E("iManufacturer:0x02%x\n", dev_desc->iManufacturer);
DBG_871X("iProduct:0x%02x\n", dev_desc->iProduct); DBG_88E("iProduct:0x%02x\n", dev_desc->iProduct);
DBG_871X("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber); DBG_88E("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber);
DBG_871X("bNumConfigurations:%u\n", dev_desc->bNumConfigurations); DBG_88E("bNumConfigurations:%u\n", dev_desc->bNumConfigurations);
#endif #endif
#if 1 /* The acting usb_config_descriptor */ #if 1 /* The acting usb_config_descriptor */
DBG_871X("\nact_conf_desc:%p\n", act_conf_desc); DBG_88E("\nact_conf_desc:%p\n", act_conf_desc);
DBG_871X("bLength:%u\n", act_conf_desc->bLength); DBG_88E("bLength:%u\n", act_conf_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType);
DBG_871X("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength)); DBG_88E("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength));
DBG_871X("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces); DBG_88E("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces);
DBG_871X("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue); DBG_88E("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue);
DBG_871X("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration); DBG_88E("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration);
DBG_871X("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes); DBG_88E("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes);
DBG_871X("bMaxPower=%u\n", act_conf_desc->bMaxPower); DBG_88E("bMaxPower=%u\n", act_conf_desc->bMaxPower);
#endif #endif
DBG_871X("****** num of altsetting = (%d) ******/\n", usb_intf->num_altsetting); DBG_88E("****** num of altsetting = (%d) ******/\n", usb_intf->num_altsetting);
/* Get he host side alternate setting (the current alternate setting) for this interface*/ /* Get he host side alternate setting (the current alternate setting) for this interface*/
host_iface = usb_intf->cur_altsetting; host_iface = usb_intf->cur_altsetting;
iface_desc = &host_iface->desc; iface_desc = &host_iface->desc;
#if 1 /* The current alternate setting*/ #if 1 /* The current alternate setting*/
DBG_871X("\nusb_interface_descriptor:%p:\n", iface_desc); DBG_88E("\nusb_interface_descriptor:%p:\n", iface_desc);
DBG_871X("bLength:%u\n", iface_desc->bLength); DBG_88E("bLength:%u\n", iface_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType);
DBG_871X("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber); DBG_88E("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber);
DBG_871X("bAlternateSetting=%x\n", iface_desc->bAlternateSetting); DBG_88E("bAlternateSetting=%x\n", iface_desc->bAlternateSetting);
DBG_871X("bNumEndpoints=%x\n", iface_desc->bNumEndpoints); DBG_88E("bNumEndpoints=%x\n", iface_desc->bNumEndpoints);
DBG_871X("bInterfaceClass=%x\n", iface_desc->bInterfaceClass); DBG_88E("bInterfaceClass=%x\n", iface_desc->bInterfaceClass);
DBG_871X("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass); DBG_88E("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass);
DBG_871X("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol); DBG_88E("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol);
DBG_871X("iInterface=%x\n", iface_desc->iInterface); DBG_88E("iInterface=%x\n", iface_desc->iInterface);
#endif #endif
#if 1 #if 1
//DBG_871X("\ndump usb_endpoint_descriptor:\n"); //DBG_88E("\ndump usb_endpoint_descriptor:\n");
for (i = 0; i < iface_desc->bNumEndpoints; i++) for (i = 0; i < iface_desc->bNumEndpoints; i++)
{ {
@ -1634,43 +1634,43 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
{ {
endp_desc = &host_endp->desc; endp_desc = &host_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i); DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",endp_desc->bLength); DBG_88E("bLength=%x\n",endp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",endp_desc->bDescriptorType); DBG_88E("bDescriptorType=%x\n",endp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",endp_desc->bEndpointAddress); DBG_88E("bEndpointAddress=%x\n",endp_desc->bEndpointAddress);
DBG_871X("bmAttributes=%x\n",endp_desc->bmAttributes); DBG_88E("bmAttributes=%x\n",endp_desc->bmAttributes);
DBG_871X("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize); DBG_88E("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize);
DBG_871X("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize)); DBG_88E("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",endp_desc->bInterval); DBG_88E("bInterval=%x\n",endp_desc->bInterval);
//DBG_871X("bRefresh=%x\n",pendp_desc->bRefresh); //DBG_88E("bRefresh=%x\n",pendp_desc->bRefresh);
//DBG_871X("bSynchAddress=%x\n",pendp_desc->bSynchAddress); //DBG_88E("bSynchAddress=%x\n",pendp_desc->bSynchAddress);
if (RT_usb_endpoint_is_bulk_in(endp_desc)) if (RT_usb_endpoint_is_bulk_in(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(endp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(endp_desc));
//pdvobjpriv->RtNumInPipes++; //pdvobjpriv->RtNumInPipes++;
} }
else if (RT_usb_endpoint_is_int_in(endp_desc)) else if (RT_usb_endpoint_is_int_in(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(endp_desc),endp_desc->bInterval); DBG_88E("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(endp_desc),endp_desc->bInterval);
//pdvobjpriv->RtNumInPipes++; //pdvobjpriv->RtNumInPipes++;
} }
else if (RT_usb_endpoint_is_bulk_out(endp_desc)) else if (RT_usb_endpoint_is_bulk_out(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(endp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(endp_desc));
//pdvobjpriv->RtNumOutPipes++; //pdvobjpriv->RtNumOutPipes++;
} }
//pdvobjpriv->ep_num[i] = RT_usb_endpoint_num(pendp_desc); //pdvobjpriv->ep_num[i] = RT_usb_endpoint_num(pendp_desc);
} }
} }
//DBG_871X("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); //DBG_88E("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
#endif #endif
if (udev->speed == USB_SPEED_HIGH) if (udev->speed == USB_SPEED_HIGH)
DBG_871X("USB_SPEED_HIGH\n"); DBG_88E("USB_SPEED_HIGH\n");
else else
DBG_871X("NON USB_SPEED_HIGH\n"); DBG_88E("NON USB_SPEED_HIGH\n");
} }
@ -1683,7 +1683,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
struct dvobj_priv *dvobj; struct dvobj_priv *dvobj;
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_init\n")); RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_init\n"));
//DBG_871X("+rtw_drv_init\n"); //DBG_88E("+rtw_drv_init\n");
//step 0. //step 0.
process_spec_devid(pdid); process_spec_devid(pdid);
@ -1699,7 +1699,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#endif #endif
if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) { if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) {
DBG_871X("rtw_init_primary_adapter Failed!\n"); DBG_88E("rtw_init_primary_adapter Failed!\n");
goto free_dvobj; goto free_dvobj;
} }
@ -1715,7 +1715,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#ifdef CONFIG_GLOBAL_UI_PID #ifdef CONFIG_GLOBAL_UI_PID
if (ui_pid[1]!=0) { if (ui_pid[1]!=0) {
DBG_871X("ui_pid[1]:%d\n",ui_pid[1]); DBG_88E("ui_pid[1]:%d\n",ui_pid[1]);
rtw_signal_process(ui_pid[1], SIGUSR2); rtw_signal_process(ui_pid[1], SIGUSR2);
} }
#endif #endif
@ -1748,17 +1748,17 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
_func_enter_; _func_enter_;
DBG_871X("+rtw_dev_remove\n"); DBG_88E("+rtw_dev_remove\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n"));
if (usb_drv->drv_registered == _TRUE) if (usb_drv->drv_registered == _TRUE)
{ {
//DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == _TRUE\n"); //DBG_88E("r871xu_dev_remove():padapter->bSurpriseRemoved == _TRUE\n");
padapter->bSurpriseRemoved = _TRUE; padapter->bSurpriseRemoved = _TRUE;
} }
/*else /*else
{ {
//DBG_871X("r871xu_dev_remove():module removed\n"); //DBG_88E("r871xu_dev_remove():module removed\n");
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = _FALSE;
}*/ }*/
@ -1784,7 +1784,7 @@ _func_enter_;
usb_dvobj_deinit(pusb_intf); usb_dvobj_deinit(pusb_intf);
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n"));
DBG_871X("-r871xu_dev_remove, done\n"); DBG_88E("-r871xu_dev_remove, done\n");
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
@ -1818,11 +1818,11 @@ static int __init rtw_drv_entry(void)
/* ----------get usb_wifi_usbc_num------------- */ /* ----------get usb_wifi_usbc_num------------- */
ret = script_parser_fetch("usb_wifi_para", "usb_wifi_usbc_num", (int *)&usb_wifi_host, 64); ret = script_parser_fetch("usb_wifi_para", "usb_wifi_usbc_num", (int *)&usb_wifi_host, 64);
if (ret != 0){ if (ret != 0){
DBG_8192C("ERR: script_parser_fetch usb_wifi_usbc_num failed\n"); DBG_88E("ERR: script_parser_fetch usb_wifi_usbc_num failed\n");
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
DBG_8192C("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host); DBG_88E("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host);
sw_usb_enable_hcd(usb_wifi_host); sw_usb_enable_hcd(usb_wifi_host);
#endif //CONFIG_RTL8723A #endif //CONFIG_RTL8723A
#endif //CONFIG_PLATFORM_ARM_SUNxI #endif //CONFIG_PLATFORM_ARM_SUNxI
@ -1830,8 +1830,8 @@ static int __init rtw_drv_entry(void)
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
DBG_871X("build time: %s %s\n", __DATE__, __TIME__); DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
//console_suspend_enabled=0; //console_suspend_enabled=0;
@ -1854,7 +1854,7 @@ static int __init rtw_drv_entry(void)
static void __exit rtw_drv_halt(void) static void __exit rtw_drv_halt(void)
{ {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n"));
DBG_871X("+rtw_drv_halt\n"); DBG_88E("+rtw_drv_halt\n");
rtw_suspend_lock_uninit(); rtw_suspend_lock_uninit();
@ -1869,12 +1869,12 @@ static void __exit rtw_drv_halt(void)
#endif #endif
#ifdef CONFIG_PLATFORM_ARM_SUNxI #ifdef CONFIG_PLATFORM_ARM_SUNxI
#ifndef CONFIG_RTL8723A #ifndef CONFIG_RTL8723A
DBG_8192C("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host); DBG_88E("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host);
sw_usb_disable_hcd(usb_wifi_host); sw_usb_disable_hcd(usb_wifi_host);
#endif //ifndef CONFIG_RTL8723A #endif //ifndef CONFIG_RTL8723A
#endif //CONFIG_PLATFORM_ARM_SUNxI #endif //CONFIG_PLATFORM_ARM_SUNxI
DBG_871X("-rtw_drv_halt\n"); DBG_88E("-rtw_drv_halt\n");
} }

32
os_dep/usb_ops_linux.c
View file

@ -188,7 +188,7 @@ static void usb_bulkout_zero_complete(struct urb *purb, struct pt_regs *regs)
{ {
struct zero_bulkout_context *pcontext = (struct zero_bulkout_context *)purb->context; struct zero_bulkout_context *pcontext = (struct zero_bulkout_context *)purb->context;
//DBG_8192C("+usb_bulkout_zero_complete\n"); //DBG_88E("+usb_bulkout_zero_complete\n");
if (pcontext) if (pcontext)
{ {
@ -220,7 +220,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
//DBG_871X("%s\n", __func__); //DBG_88E("%s\n", __func__);
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx))
@ -284,7 +284,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
_adapter *padapter = pintfhdl->padapter; _adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
padapter->bReadPortCancel = _TRUE; padapter->bReadPortCancel = _TRUE;
@ -292,7 +292,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
precvbuf->reuse = _TRUE; precvbuf->reuse = _TRUE;
if (precvbuf->purb) { if (precvbuf->purb) {
//DBG_8192C("usb_read_port_cancel : usb_kill_urb\n"); //DBG_88E("usb_read_port_cancel : usb_kill_urb\n");
usb_kill_urb(precvbuf->purb); usb_kill_urb(precvbuf->purb);
} }
precvbuf++; precvbuf++;
@ -350,23 +350,23 @@ _func_enter_;
case 1: case 1:
case 2: case 2:
pxmitpriv->bkq_cnt--; pxmitpriv->bkq_cnt--;
//DBG_8192C("pxmitpriv->bkq_cnt=%d\n", pxmitpriv->bkq_cnt); //DBG_88E("pxmitpriv->bkq_cnt=%d\n", pxmitpriv->bkq_cnt);
break; break;
case 4: case 4:
case 5: case 5:
pxmitpriv->viq_cnt--; pxmitpriv->viq_cnt--;
//DBG_8192C("pxmitpriv->viq_cnt=%d\n", pxmitpriv->viq_cnt); //DBG_88E("pxmitpriv->viq_cnt=%d\n", pxmitpriv->viq_cnt);
break; break;
case 6: case 6:
case 7: case 7:
pxmitpriv->voq_cnt--; pxmitpriv->voq_cnt--;
//DBG_8192C("pxmitpriv->voq_cnt=%d\n", pxmitpriv->voq_cnt); //DBG_88E("pxmitpriv->voq_cnt=%d\n", pxmitpriv->voq_cnt);
break; break;
case 0: case 0:
case 3: case 3:
default: default:
pxmitpriv->beq_cnt--; pxmitpriv->beq_cnt--;
//DBG_8192C("pxmitpriv->beq_cnt=%d\n", pxmitpriv->beq_cnt); //DBG_88E("pxmitpriv->beq_cnt=%d\n", pxmitpriv->beq_cnt);
break; break;
} }
@ -385,7 +385,7 @@ _func_enter_;
if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel) 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)); 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_88E("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n",
__func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag);
goto check_completion; goto check_completion;
@ -396,7 +396,7 @@ _func_enter_;
} else { } 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); DBG_88E("###=> urb_write_port_complete status(%d)\n",purb->status);
if ((purb->status==-EPIPE)||(purb->status==-EPROTO)) if ((purb->status==-EPIPE)||(purb->status==-EPROTO))
{ {
//usb_clear_halt(pusbdev, purb->pipe); //usb_clear_halt(pusbdev, purb->pipe);
@ -407,11 +407,11 @@ _func_enter_;
goto check_completion; goto check_completion;
} else if (purb->status == -ENOENT) { } else if (purb->status == -ENOENT) {
DBG_871X("%s: -ENOENT\n", __func__); DBG_88E("%s: -ENOENT\n", __func__);
goto check_completion; goto check_completion;
} else if (purb->status == -ECONNRESET) { } else if (purb->status == -ECONNRESET) {
DBG_871X("%s: -ECONNRESET\n", __func__); DBG_88E("%s: -ECONNRESET\n", __func__);
goto check_completion; goto check_completion;
} else if (purb->status == -ESHUTDOWN) { } else if (purb->status == -ESHUTDOWN) {
@ -424,7 +424,7 @@ _func_enter_;
else else
{ {
padapter->bSurpriseRemoved=_TRUE; padapter->bSurpriseRemoved=_TRUE;
DBG_8192C("bSurpriseRemoved=TRUE\n"); DBG_88E("bSurpriseRemoved=TRUE\n");
//rtl8192cu_trigger_gpio_0(padapter); //rtl8192cu_trigger_gpio_0(padapter);
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bSurpriseRemoved=TRUE\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bSurpriseRemoved=TRUE\n"));
@ -475,7 +475,7 @@ _func_enter_;
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) { if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) {
#ifdef DBG_TX #ifdef DBG_TX
DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__func__, __LINE__ DBG_88E(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__func__, __LINE__
,padapter->bDriverStopped, padapter->bSurpriseRemoved, padapter->pwrctrlpriv.pnp_bstop_trx ); ,padapter->bDriverStopped, padapter->bSurpriseRemoved, padapter->pwrctrlpriv.pnp_bstop_trx );
#endif #endif
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n"));
@ -551,7 +551,7 @@ _func_enter_;
#endif #endif
} else { } else {
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
DBG_871X("usb_write_port, status=%d\n", status); DBG_88E("usb_write_port, status=%d\n", status);
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port(): usb_submit_urb, status=%x\n", status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port(): usb_submit_urb, status=%x\n", status));
switch (status) { switch (status) {
@ -591,7 +591,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
_adapter *padapter = pintfhdl->padapter; _adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
padapter->bWritePortCancel = _TRUE; padapter->bWritePortCancel = _TRUE;

24
os_dep/xmit_linux.c
View file

@ -96,11 +96,11 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
const struct iphdr *ip = ip_hdr(skb); const struct iphdr *ip = ip_hdr(skb);
if (ip->protocol == IPPROTO_TCP) { if (ip->protocol == IPPROTO_TCP) {
// TCP checksum offload by HW // TCP checksum offload by HW
DBG_871X("CHECKSUM_PARTIAL TCP\n"); DBG_88E("CHECKSUM_PARTIAL TCP\n");
pattrib->hw_tcp_csum = 1; pattrib->hw_tcp_csum = 1;
//skb_checksum_help(skb); //skb_checksum_help(skb);
} else if (ip->protocol == IPPROTO_UDP) { } else if (ip->protocol == IPPROTO_UDP) {
//DBG_871X("CHECKSUM_PARTIAL UDP\n"); //DBG_88E("CHECKSUM_PARTIAL UDP\n");
#if 1 #if 1
skb_checksum_help(skb); skb_checksum_help(skb);
#else #else
@ -109,12 +109,12 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
udp->check = 0; udp->check = 0;
#endif #endif
} else { } else {
DBG_871X("%s-%d TCP CSUM offload Error!!\n", __func__, __LINE__); DBG_88E("%s-%d TCP CSUM offload Error!!\n", __func__, __LINE__);
WARN_ON(1); /* we need a WARN() */ WARN_ON(1); /* we need a WARN() */
} }
} }
else { // IP fragmentation case else { // IP fragmentation case
DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __func__, __LINE__); DBG_88E("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __func__, __LINE__);
skb_checksum_help(skb); skb_checksum_help(skb);
} }
} }
@ -152,7 +152,7 @@ int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL); pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
if (pxmitbuf->pxmit_urb[i] == NULL) if (pxmitbuf->pxmit_urb[i] == NULL)
{ {
DBG_871X("pxmitbuf->pxmit_urb[i]==NULL"); DBG_88E("pxmitbuf->pxmit_urb[i]==NULL");
return _FAIL; return _FAIL;
} }
@ -292,7 +292,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
if (padapter->registrypriv.wifi_spec) { if (padapter->registrypriv.wifi_spec) {
/* No free space for Tx, tx_worker is too slow */ /* No free space for Tx, tx_worker is too slow */
if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) { if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) {
//DBG_871X("%s(): stop netif_subqueue[%d]\n", __func__, queue); //DBG_88E("%s(): stop netif_subqueue[%d]\n", __func__, queue);
netif_stop_subqueue(padapter->pnetdev, queue); netif_stop_subqueue(padapter->pnetdev, queue);
} }
} else { } else {
@ -342,13 +342,13 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
memcpy(newskb->data, psta->hwaddr, 6); memcpy(newskb->data, psta->hwaddr, 6);
res = rtw_xmit(padapter, &newskb); res = rtw_xmit(padapter, &newskb);
if (res < 0) { if (res < 0) {
DBG_871X("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__); DBG_88E("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
dev_kfree_skb_any(newskb); dev_kfree_skb_any(newskb);
} else } else
pxmitpriv->tx_pkts++; pxmitpriv->tx_pkts++;
} else { } else {
DBG_871X("%s-%d: skb_copy() failed!\n", __func__, __LINE__); DBG_88E("%s-%d: skb_copy() failed!\n", __func__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@ -384,7 +384,7 @@ _func_enter_;
if (rtw_if_up(padapter) == _FALSE) { if (rtw_if_up(padapter) == _FALSE) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n"));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__); DBG_88E("DBG_TX_DROP_FRAME %s if_up fail\n", __func__);
#endif #endif
goto drop_packet; goto drop_packet;
} }
@ -405,8 +405,8 @@ _func_enter_;
goto exit; goto exit;
} }
} else { } else {
//DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); //DBG_88E("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt);
//DBG_871X("!m2u ); //DBG_88E("!m2u );
} }
} }
#endif // CONFIG_TX_MCAST2UNI #endif // CONFIG_TX_MCAST2UNI
@ -414,7 +414,7 @@ _func_enter_;
res = rtw_xmit(padapter, &pkt); res = rtw_xmit(padapter, &pkt);
if (res < 0) { if (res < 0) {
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __func__); DBG_88E("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __func__);
#endif #endif
goto drop_packet; goto drop_packet;
} }