skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Replace degub macro DBG_871X with DBG_88E

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 16:38:30 -05:00
parent 1e6accffc4
commit 3a3339b715
46 changed files with 1548 additions and 1548 deletions
Download patch file Download diff file Expand all files Collapse all files

212
os_dep/ioctl_cfg80211.c
View file

@ -343,7 +343,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
bssinf_len = pnetwork->network.IELength+sizeof (struct rtw_ieee80211_hdr_3addr);
if (bssinf_len > MAX_BSSINFO_LEN) {
DBG_871X("%s IE Length too long > %d byte\n",__FUNCTION__,MAX_BSSINFO_LEN);
DBG_88E("%s IE Length too long > %d byte\n",__FUNCTION__,MAX_BSSINFO_LEN);
goto exit;
}
@ -373,7 +373,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
else if (pssid->SsidLength == ssids[0].ssid_len &&
_rtw_memcmp(pssid->Ssid, ssids[0].ssid, ssids[0].ssid_len))
{
DBG_871X("%s, got sr and ssid match!\n", __func__);
DBG_88E("%s, got sr and ssid match!\n", __func__);
}
else
{
@ -535,7 +535,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
u32 freq;
u16 channel = cur_network->network.Configuration.DSConfig;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_ADHOC)
{
return;
@ -551,11 +551,11 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex));
if (cur_network) {
if (!rtw_cfg80211_inform_bss(padapter,cur_network))
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
else
DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter));
} else {
DBG_871X("cur_network is not exist!!!\n");
DBG_88E("cur_network is not exist!!!\n");
return ;
}
} else {
@ -568,18 +568,18 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true
) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
} else {
/* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
/* DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
}
} else {
DBG_871X("scanned & pnetwork compare fail\n");
DBG_88E("scanned & pnetwork compare fail\n");
rtw_warn_on(1);
}
}
if (!rtw_cfg80211_check_bss(padapter))
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
}
/* notify cfg80211 that device joined an IBSS */
if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -604,7 +604,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
#endif
struct cfg80211_bss *bss = NULL;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_STATION
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
&& pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
@ -633,7 +633,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
/* DBG_871X(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */
/* DBG_88E(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */
if (scanned == NULL) {
rtw_warn_on(1);
@ -644,12 +644,12 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
&& _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true
) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
} else {
/* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
/* DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
}
} else {
DBG_871X("scanned: %s("MAC_FMT"), cur: %s("MAC_FMT")\n",
DBG_88E("scanned: %s("MAC_FMT"), cur: %s("MAC_FMT")\n",
scanned->network.Ssid.Ssid, MAC_ARG(scanned->network.MacAddress),
pnetwork->Ssid.Ssid, MAC_ARG(pnetwork->MacAddress)
);
@ -659,7 +659,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
check_bss:
if (!rtw_cfg80211_check_bss(padapter))
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
if (rtw_to_roaming(padapter) > 0) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
@ -676,7 +676,7 @@ check_bss:
notify_channel = ieee80211_get_channel(wiphy, freq);
#endif
DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
cfg80211_roamed(padapter->pnetdev
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
, notify_channel
@ -705,7 +705,7 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_STATION
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
@ -1287,7 +1287,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
}
/* DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); */
DBG_871X(" ~~~~set sta key:unicastkey\n");
DBG_88E(" ~~~~set sta key:unicastkey\n");
rtw_setstakey_cmd(padapter, (unsigned char *)psta, true, true);
}
@ -1300,7 +1300,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8);
padapter->securitypriv.binstallGrpkey = true;
/* DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); */
DBG_871X(" ~~~~set sta key:groupkey\n");
DBG_88E(" ~~~~set sta key:groupkey\n");
padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true);
@ -1309,16 +1309,16 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
else if (strcmp(param->u.crypt.alg, "BIP") == 0)
{
int no;
/* DBG_871X("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); */
/* DBG_88E("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); */
/* save the IGTK key, length 16 bytes */
memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
/*DBG_871X("IGTK key below:\n");
/*DBG_88E("IGTK key below:\n");
for (no=0;no<16;no++)
printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]);
DBG_871X("\n");*/
DBG_88E("\n");*/
padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx;
padapter->securitypriv.binstallBIPkey = true;
DBG_871X(" ~~~~set sta key:IGKT\n");
DBG_88E(" ~~~~set sta key:IGKT\n");
}
#endif /* CONFIG_IEEE80211W */
@ -1381,13 +1381,13 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr);
DBG_871X("cipher=0x%x\n", params->cipher);
DBG_871X("key_len=0x%x\n", params->key_len);
DBG_871X("seq_len=0x%x\n", params->seq_len);
DBG_871X("key_index=%d\n", key_index);
DBG_88E(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr);
DBG_88E("cipher=0x%x\n", params->cipher);
DBG_88E("key_len=0x%x\n", params->key_len);
DBG_88E("seq_len=0x%x\n", params->seq_len);
DBG_88E("key_index=%d\n", key_index);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
DBG_871X("pairwise=%d\n", pairwise);
DBG_88E("pairwise=%d\n", pairwise);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
param_len = sizeof(struct ieee_param) + params->key_len;
@ -1490,7 +1490,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
void (*callback)(void *cookie,
struct key_params*))
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -1504,7 +1504,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index);
DBG_88E(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index);
if (key_index == psecuritypriv->dot11PrivacyKeyIndex)
{
@ -1526,10 +1526,10 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
struct security_priv *psecuritypriv = &padapter->securitypriv;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE)
DBG_871X(FUNC_NDEV_FMT" key_index=%d, unicast=%d, multicast=%d\n",
DBG_88E(FUNC_NDEV_FMT" key_index=%d, unicast=%d, multicast=%d\n",
FUNC_NDEV_ARG(ndev), key_index , unicast, multicast);
#else
DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev),
DBG_88E(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev),
key_index);
#endif
@ -1572,7 +1572,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
sinfo->filled = 0;
if (!mac) {
DBG_871X(FUNC_NDEV_FMT" mac==%p\n", FUNC_NDEV_ARG(ndev), mac);
DBG_88E(FUNC_NDEV_FMT" mac==%p\n", FUNC_NDEV_ARG(ndev), mac);
ret = -ENOENT;
goto exit;
}
@ -1585,7 +1585,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
}
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac));
DBG_88E(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac));
#endif
/* for infra./P2PClient mode */
@ -1596,7 +1596,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == false) {
DBG_871X("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress));
DBG_88E("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress));
ret = -ENOENT;
goto exit;
}
@ -1650,7 +1650,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
int ret = 0;
u8 change = false;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (adapter_to_dvobj(padapter)->processing_dev_remove == true)
{
@ -1659,7 +1659,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
}
DBG_871X(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev));
if (netdev_open(ndev) != 0) {
ret= -EPERM;
goto exit;
@ -1671,7 +1671,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
}
old_type = rtw_wdev->iftype;
DBG_871X(FUNC_NDEV_FMT" old_iftype=%d, new_iftype=%d\n",
DBG_88E(FUNC_NDEV_FMT" old_iftype=%d, new_iftype=%d\n",
FUNC_NDEV_ARG(ndev), old_type, type);
if (old_type != type)
@ -1750,7 +1750,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
/* struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request; */
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s with scan req\n", __FUNCTION__);
DBG_88E("%s with scan req\n", __FUNCTION__);
#endif
/* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */
@ -1768,7 +1768,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
} else {
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s without scan req\n", __FUNCTION__);
DBG_88E("%s without scan req\n", __FUNCTION__);
#endif
}
spin_unlock_bh(&pwdev_priv->scan_req_lock);
@ -1900,7 +1900,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b
&& attr_contentlen == 5)
{
if (wdinfo->listen_channel != listen_ch_attr[4]) {
DBG_871X(FUNC_ADPT_FMT" listen channel - country:%c%c%c, class:%u, ch:%u\n",
DBG_88E(FUNC_ADPT_FMT" listen channel - country:%c%c%c, class:%u, ch:%u\n",
FUNC_ADPT_ARG(padapter), listen_ch_attr[0], listen_ch_attr[1], listen_ch_attr[2],
listen_ch_attr[3], listen_ch_attr[4]);
wdinfo->listen_channel = listen_ch_attr[4];
@ -1971,7 +1971,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
int social_channel = 0, j = 0;
bool need_indicate_scan_done = false;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
spin_lock_bh(&pwdev_priv->scan_req_lock);
pwdev_priv->scan_request = request;
@ -1980,7 +1980,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__);
DBG_88E("%s under WIFI_AP_STATE\n", __FUNCTION__);
#endif
if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
@ -2047,7 +2047,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
}
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));
need_indicate_scan_done = true;
goto check_need_indicate_scan_done;
}
@ -2081,7 +2081,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
memset(ch, 0, sizeof(struct rtw_ieee80211_channel)*RTW_CHANNEL_SCAN_AMOUNT);
for (i=0;i<request->n_channels && i<RTW_CHANNEL_SCAN_AMOUNT;i++) {
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT CHAN_FMT"\n", FUNC_ADPT_ARG(padapter), CHAN_ARG(request->channels[i]));
DBG_88E(FUNC_ADPT_FMT CHAN_FMT"\n", FUNC_ADPT_ARG(padapter), CHAN_ARG(request->channels[i]));
#endif
ch[i].hw_value = request->channels[i]->hw_value;
ch[i].flags = request->channels[i]->flags;
@ -2514,7 +2514,7 @@ exit:
static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -2539,15 +2539,15 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
padapter->mlmepriv.not_indic_disco = true;
DBG_871X("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_871X("privacy=%d, key=%p, key_len=%d, key_idx=%d\n",
DBG_88E("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E("privacy=%d, key=%p, key_len=%d, key_idx=%d\n",
sme->privacy, sme->key, sme->key_len, sme->key_idx);
if (wdev_to_priv(padapter->rtw_wdev)->block == true)
{
ret = -EBUSY;
DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__);
DBG_88E("%s wdev_priv.block is set\n", __FUNCTION__);
goto exit;
}
@ -2627,7 +2627,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
{
u32 wep_key_idx, wep_key_len,wep_total_len;
struct ndis_802_11_wep *pwep = NULL;
DBG_871X("%s(): Shared/Auto WEP\n",__FUNCTION__);
DBG_88E("%s(): Shared/Auto WEP\n",__FUNCTION__);
wep_key_idx = sme->key_idx;
wep_key_len = sme->key_len;
@ -2643,7 +2643,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
pwep =(struct ndis_802_11_wep *) rtw_malloc(wep_total_len);
if (pwep == NULL) {
DBG_871X(" wpa_set_encryption: pwep allocate fail !!!\n");
DBG_88E(" wpa_set_encryption: pwep allocate fail !!!\n");
ret = -ENOMEM;
goto exit;
}
@ -2718,7 +2718,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
{
struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
padapter->mlmepriv.not_indic_disco = true;
@ -2730,7 +2730,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
LeaveAllPowerSaveMode(padapter);
rtw_disassoc_cmd(padapter, 500, false);
DBG_871X("%s...call rtw_indicate_disconnect\n", __FUNCTION__);
DBG_88E("%s...call rtw_indicate_disconnect\n", __FUNCTION__);
rtw_indicate_disconnect(padapter);
@ -2782,7 +2782,7 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev);
DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev),
DBG_88E(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev),
enabled, timeout);
rtw_wdev_priv->power_mgmt = enabled;
@ -2801,7 +2801,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
struct security_priv *psecuritypriv = &padapter->securitypriv;
u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 };
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
if ( _rtw_memcmp((void *)pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == true )
return -EINVAL;
@ -2813,7 +2813,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
{
if ( _rtw_memcmp( psecuritypriv->PMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==true )
{ /* BSSID is matched, the same AP => rewrite with new PMKID. */
DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev));
DBG_88E(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev));
memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN);
psecuritypriv->PMKIDList[index].bUsed = true;
@ -2826,7 +2826,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
if (!blInserted)
{
/* Find a new entry */
DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n",
DBG_88E(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n",
FUNC_NDEV_ARG(netdev), psecuritypriv->PMKIDIndex );
memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN);
@ -2851,7 +2851,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
for (index=0 ; index<NUM_PMKID_CACHE; index++)
{
@ -2867,7 +2867,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
if (false == bMatched)
{
DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n"
DBG_88E(FUNC_NDEV_FMT" do not have matched BSSID\n"
, FUNC_NDEV_ARG(netdev));
return -EINVAL;
}
@ -2881,7 +2881,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE );
psecuritypriv->PMKIDIndex = 0;
@ -2898,7 +2898,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame,
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct net_device *ndev = padapter->pnetdev;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
{
struct station_info sinfo;
@ -2928,7 +2928,7 @@ void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct net_device *ndev = padapter->pnetdev;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
cfg80211_del_sta(ndev, da, GFP_ATOMIC);
}
@ -2966,7 +2966,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
struct ieee80211_radiotap_header *rtap_hdr;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (!skb)
return -1;
@ -3054,9 +3054,9 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
goto dump;
#endif
if (category == RTW_WLAN_CATEGORY_PUBLIC)
DBG_871X("RTW_Tx:%s\n", action_public_str(action));
DBG_88E("RTW_Tx:%s\n", action_public_str(action));
else
DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action);
DBG_88E("RTW_Tx:category(%u), action(%u)\n", category, action);
dump:
/* starting alloc mgmt frame to dump it */
@ -3151,13 +3151,13 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
if (!name ) {
DBG_871X(FUNC_ADPT_FMT" without specific name\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" without specific name\n", FUNC_ADPT_ARG(padapter));
ret = -EINVAL;
goto out;
}
if (pwdev_priv->pmon_ndev) {
DBG_871X(FUNC_ADPT_FMT" monitor interface exist: "NDEV_FMT"\n",
DBG_88E(FUNC_ADPT_FMT" monitor interface exist: "NDEV_FMT"\n",
FUNC_ADPT_ARG(padapter), NDEV_ARG(pwdev_priv->pmon_ndev));
ret = -EBUSY;
goto out;
@ -3165,7 +3165,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator));
if (!mon_ndev) {
DBG_871X(FUNC_ADPT_FMT" allocate ndev fail\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" allocate ndev fail\n", FUNC_ADPT_ARG(padapter));
ret = -ENOMEM;
goto out;
}
@ -3191,7 +3191,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
/* wdev */
mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
if (!mon_wdev) {
DBG_871X(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter));
ret = -ENOMEM;
goto out;
}
@ -3246,7 +3246,7 @@ static int
struct net_device* ndev = NULL;
struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n",
DBG_88E(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n",
FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type);
switch (type) {
@ -3275,11 +3275,11 @@ static int
break;
default:
ret = -ENODEV;
DBG_871X("Unsupported interface type\n");
DBG_88E("Unsupported interface type\n");
break;
}
DBG_871X(FUNC_ADPT_FMT" ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), ndev, ret);
DBG_88E(FUNC_ADPT_FMT" ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), ndev, ret);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
return ndev ? ndev->ieee80211_ptr : ERR_PTR(ret);
@ -3312,7 +3312,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy,
if (ndev == pwdev_priv->pmon_ndev) {
pwdev_priv->pmon_ndev = NULL;
pwdev_priv->ifname_mon[0] = '\0';
DBG_871X(FUNC_NDEV_FMT" remove monitor interface\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT" remove monitor interface\n", FUNC_NDEV_ARG(ndev));
}
exit:
@ -3427,7 +3427,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev,
int ret=0;
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
return ret;
@ -3439,7 +3439,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
pmlmeext->bstart_bss = true;
@ -3450,7 +3450,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
static int cfg80211_rtw_del_beacon(struct wiphy *wiphy, struct net_device *ndev)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3461,7 +3461,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
int ret = 0;
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev),
DBG_88E(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev),
settings->hidden_ssid, settings->auth_type);
ret = rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.head_len,
@ -3488,7 +3488,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
int ret = 0;
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
@ -3497,7 +3497,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3511,7 +3511,7 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev
#endif
struct station_parameters *params)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3539,7 +3539,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
const u8 *mac = params->mac;
#endif
DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{
@ -3610,7 +3610,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
associated_clients_update(padapter, updated);
DBG_871X("-"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E("-"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return ret;
@ -3624,7 +3624,7 @@ static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *n
#endif
struct station_parameters *params)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3632,7 +3632,7 @@ static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *n
static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndev,
int idx, u8 *mac, struct station_info *sinfo)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
/* TODO: dump scanned queue */
@ -3644,7 +3644,7 @@ static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev,
{
u8 i;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
/*
DBG_8192C("use_cts_prot=%d\n", params->use_cts_prot);
DBG_8192C("use_short_preamble=%d\n", params->use_short_preamble);
@ -3669,7 +3669,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
#endif
return 0;
@ -3678,7 +3678,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_auth_request *req)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3686,7 +3686,7 @@ static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev,
static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_assoc_request *req)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0;
}
@ -3709,7 +3709,7 @@ void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint
goto indicate;
#endif
rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action);
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
indicate:
if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -3749,7 +3749,7 @@ void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame
}
#endif
rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action);
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
indicate:
if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -3778,9 +3778,9 @@ void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len,
DBG_8192C("RTW_Rx:cur_ch=%d\n", channel);
if (msg)
DBG_871X("RTW_Rx:%s\n", msg);
DBG_88E("RTW_Rx:%s\n", msg);
else
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action);
DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
if (channel <= RTW_CH_MAX_2G_CHANNEL)
freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
@ -3831,7 +3831,7 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr);
__be16 be_tmp;
DBG_871X( "[%s] In\n", __FUNCTION__ );
DBG_88E( "[%s] In\n", __FUNCTION__ );
/* prepare for building provision_request frame */
memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN);
@ -4029,7 +4029,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy,
u8 remain_ch = (u8) ieee80211_frequency_to_channel(channel->center_freq);
u8 ready_on_channel = false;
DBG_871X(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration);
DBG_88E(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration);
if (pcfg80211_wdinfo->is_ro_ch == true)
{
@ -4082,7 +4082,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy,
if (remain_ch != rtw_get_oper_ch(padapter) )
ready_on_channel = true;
} else {
DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch);
DBG_88E("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch);
}
@ -4123,7 +4123,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy,
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pcfg80211_wdinfo->is_ro_ch == true) {
DBG_8192C("%s, cancel ro ch timer\n", __func__);
@ -4298,7 +4298,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
*cookie = (unsigned long) buf;
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT" len=%zu, ch=%d"
DBG_88E(FUNC_ADPT_FMT" len=%zu, ch=%d"
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
", ch_type=%d"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
@ -4336,9 +4336,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
}
#endif
if (category == RTW_WLAN_CATEGORY_PUBLIC)
DBG_871X("RTW_Tx:%s\n", action_public_str(action));
DBG_88E("RTW_Tx:%s\n", action_public_str(action));
else
DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action);
DBG_88E("RTW_Tx:category(%u), action(%u)\n", category, action);
dump:
do {
@ -4347,7 +4347,7 @@ dump:
} while (dump_cnt < dump_limit && tx_ret != _SUCCESS);
if (tx_ret != _SUCCESS || dump_cnt > 1) {
DBG_871X(FUNC_ADPT_FMT" %s (%d/%d) in %d ms\n", FUNC_ADPT_ARG(padapter),
DBG_88E(FUNC_ADPT_FMT" %s (%d/%d) in %d ms\n", FUNC_ADPT_ARG(padapter),
tx_ret==_SUCCESS?"OK":"FAIL", dump_cnt, dump_limit, rtw_get_passing_time_ms(start));
}
@ -4359,7 +4359,7 @@ dump:
if (pwdev_priv->invit_info.flags & BIT(0)
&& pwdev_priv->invit_info.status == 0)
{
DBG_871X(FUNC_ADPT_FMT" agree with invitation of persistent group\n",
DBG_88E(FUNC_ADPT_FMT" agree with invitation of persistent group\n",
FUNC_ADPT_ARG(padapter));
rtw_set_scan_deny(padapter, 5000);
rtw_pwr_wakeup_ex(padapter, 5000);
@ -4383,7 +4383,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
struct adapter *adapter = wiphy_to_adapter(wiphy);
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
DBG_88E(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
frame_type, reg);
#endif
@ -4407,7 +4407,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_871X(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len);
DBG_88E(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len);
if (len>0)
{
@ -4540,7 +4540,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
if (sr != 0)
{
DBG_871X("%s, got sr\n", __func__);
DBG_88E("%s, got sr\n", __func__);
}
else
{

790
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

@ -296,7 +296,7 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pst
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");
}
void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta)
@ -318,7 +318,7 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *
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");
}
#ifdef CONFIG_HOSTAPD_MLME
@ -328,7 +328,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)phostapdpriv->padapter;
/* DBG_871X("%s\n", __FUNCTION__); */
/* DBG_88E("%s\n", __FUNCTION__); */
return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb);
}
@ -337,7 +337,7 @@ static int mgnt_netdev_open(struct net_device *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);
@ -355,7 +355,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev)
{
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
usb_kill_anchored_urbs(&phostapdpriv->anchored);
@ -404,7 +404,7 @@ int hostapd_mode_init(struct adapter *padapter)
#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;
@ -420,7 +420,7 @@ int hostapd_mode_init(struct adapter *padapter)
pnetdev->watchdog_timeo = HZ; /* 1 second timeout */
if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n");
DBG_88E("hostapd_mode_init(): dev_alloc_name, fail!\n");
mac[0]=0x00;
mac[1]=0xe0;
@ -437,7 +437,7 @@ int hostapd_mode_init(struct adapter *padapter)
/* Tell the network stack we exist */
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)
rtw_free_netdev(pnetdev);
}

78
os_dep/os_intfs.c
View file

@ -360,7 +360,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
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]); */
memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
/* memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); */
@ -513,7 +513,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
TargetNetdev = dev_get_by_name(devnet, "wlan0");
#endif
if (TargetNetdev) {
DBG_871X("Force onboard module driver disappear !!!\n");
DBG_88E("Force onboard module driver disappear !!!\n");
TargetAdapter = rtw_netdev_priv(TargetNetdev);
TargetAdapter->DriverState = DRIVER_DISAPPEAR;
@ -568,7 +568,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
/* pnetdev->init = NULL; */
#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;
#else
pnetdev->open = netdev_open;
@ -805,14 +805,14 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
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;
goto exit;
}
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;
goto exit;
}
@ -826,7 +826,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
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;
goto exit;
}
@ -1000,7 +1000,7 @@ void netdev_br_init(struct net_device *netdev)
memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN);
dev_put(br_netdev);
} else
DBG_871X("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
DBG_88E("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
}
adapter->ethBrExtInfo.addPPPoETag = 1;
@ -1024,12 +1024,12 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
/* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) {
DBG_871X(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev));
DBG_88E(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev));
ret = _FAIL;
goto error_register_netdev;
}
DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
DBG_88E("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
return ret;
@ -1084,7 +1084,7 @@ int _netdev_open(struct net_device *pnetdev)
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
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) {
padapter->net_closed = false;
@ -1104,12 +1104,12 @@ int _netdev_open(struct net_device *pnetdev)
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));
status=rtw_start_drv_threads(padapter);
if (status ==_FAIL)
{
DBG_871X("Initialize driver software resource Failed!\n");
DBG_88E("Initialize driver software resource Failed!\n");
goto netdev_open_error;
}
@ -1151,7 +1151,7 @@ int _netdev_open(struct net_device *pnetdev)
netdev_open_normal_process:
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;
@ -1163,7 +1163,7 @@ netdev_open_error:
rtw_netif_stop_queue(pnetdev);
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);
@ -1185,7 +1185,7 @@ static int ips_netdrv_open(struct adapter *padapter)
{
int status = _SUCCESS;
padapter->net_closed = false;
DBG_871X("===> %s.........\n",__FUNCTION__);
DBG_88E("===> %s.........\n",__FUNCTION__);
padapter->bDriverStopped = false;
@ -1208,7 +1208,7 @@ static int ips_netdrv_open(struct adapter *padapter)
netdev_open_error:
/* 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;
}
@ -1218,14 +1218,14 @@ int rtw_ips_pwr_up(struct adapter *padapter)
{
int result;
u32 start_time = jiffies;
DBG_871X("===> rtw_ips_pwr_up..............\n");
DBG_88E("===> rtw_ips_pwr_up..............\n");
rtw_reset_drv_sw(padapter);
result = ips_netdrv_open(padapter);
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;
}
@ -1233,7 +1233,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
void rtw_ips_pwr_down(struct adapter *padapter)
{
u32 start_time = jiffies;
DBG_871X("===> rtw_ips_pwr_down...................\n");
DBG_88E("===> rtw_ips_pwr_down...................\n");
padapter->bCardDisableWOHSM = true;
padapter->net_closed = true;
@ -1242,14 +1242,14 @@ void rtw_ips_pwr_down(struct adapter *padapter)
rtw_ips_dev_unload(padapter);
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));
}
void rtw_ips_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
DBG_871X("====> %s...\n",__FUNCTION__);
DBG_88E("====> %s...\n",__FUNCTION__);
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
@ -1294,7 +1294,7 @@ static int netdev_close(struct net_device *pnetdev)
padapter->net_closed = true;
if (adapter_to_pwrctl(padapter)->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. */
if (pnetdev)
@ -1337,14 +1337,14 @@ static int netdev_close(struct net_device *pnetdev)
padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; /* set this at the end */
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;
}
void rtw_ndev_destructor(struct net_device *ndev)
{
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (ndev->ieee80211_ptr)
rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev));
@ -1576,7 +1576,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
if ( !(*ip_addr) || !gw_index )
{
/* DBG_871X("No default GW\n"); */
/* DBG_88E("No default GW\n"); */
return -1;
}
@ -1584,13 +1584,13 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
if (gw_dev == NULL)
{
/* DBG_871X("get Oif Device Fail\n"); */
/* DBG_88E("get Oif Device Fail\n"); */
return -1;
}
if (!arp_query(mac, *ip_addr, gw_dev))
{
/* DBG_871X( "arp query failed\n"); */
/* DBG_88E( "arp query failed\n"); */
dev_put(gw_dev);
return -1;
@ -1616,12 +1616,12 @@ int rtw_gw_addr_query(struct adapter *padapter)
pmlmepriv->gw_ip[2] = (gw_addr&0xff0000)>>16;
pmlmepriv->gw_ip[3] = (gw_addr&0xff000000)>>24;
memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6);
DBG_871X("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr));
DBG_871X("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip));
DBG_88E("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr));
DBG_88E("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip));
}
else
{
/* DBG_871X("Get Gateway IP/MAC fail!\n"); */
/* DBG_88E("Get Gateway IP/MAC fail!\n"); */
}
return res;
@ -1634,7 +1634,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
struct net_device *pnetdev = padapter->pnetdev;
struct wifidirect_info* pwdinfo = &padapter->wdinfo;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
DBG_88E("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
rtw_cancel_all_timer(padapter);
if (pnetdev) {
@ -1644,7 +1644,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
{
DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__,
DBG_88E("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__,
pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength,
@ -1679,7 +1679,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done(padapter, 1);
DBG_871X("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
DBG_88E("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
return 0;
}
@ -1714,9 +1714,9 @@ int rtw_resume_common(struct adapter *padapter)
rtw_reset_drv_sw(padapter);
pwrpriv->bkeepfwalive = false;
DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive);
DBG_88E("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive);
if (pm_netdev_open(pnetdev,true) != 0) {
DBG_871X("%s ==> pm_netdev_open failed\n",__FUNCTION__);
DBG_88E("%s ==> pm_netdev_open failed\n",__FUNCTION__);
ret = -1;
return ret;
}
@ -1725,15 +1725,15 @@ int rtw_resume_common(struct adapter *padapter)
netif_carrier_on(pnetdev);
if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
rtw_roaming(padapter, NULL);
} else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
rtw_ap_restore_network(padapter);
} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
} else {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
}
return ret;
}

64
os_dep/osdep_service.c
View file

@ -225,7 +225,7 @@ void rtw_mstat_dump(void)
char buf[768] = {0};
_rtw_mstat_dump(buf, 768);
DBG_871X("\n%s", buf);
DBG_88E("\n%s", buf);
}
void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 sz)
@ -291,7 +291,7 @@ void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 s
inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line)
{
u8 *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_vmalloc((sz));
@ -307,7 +307,7 @@ inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line)
{
u8 *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_zvmalloc((sz));
@ -322,7 +322,7 @@ inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func,
inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
_rtw_vmfree((pbuf), (sz));
@ -338,10 +338,10 @@ inline u8* dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, co
u8 *p;
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_malloc((sz));
@ -359,10 +359,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
u8 *p;
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p = _rtw_zmalloc((sz));
@ -378,10 +378,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
_rtw_mfree((pbuf), (sz));
@ -403,7 +403,7 @@ inline struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f
truesize = skb->truesize;
if (!skb || truesize < size /*|| size > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize);
DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize);
rtw_mstat_update(
flags
@ -419,7 +419,7 @@ inline void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, cons
unsigned int truesize = skb->truesize;
/* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
_rtw_skb_free(skb);
@ -441,7 +441,7 @@ inline struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum ms
cp_truesize = skb_cp->truesize;
if (!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize);
DBG_88E("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize);
rtw_mstat_update(
flags
@ -463,7 +463,7 @@ inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f
cl_truesize = skb_cl->truesize;
if (!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize);
DBG_88E("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize);
rtw_mstat_update(
flags
@ -480,7 +480,7 @@ inline int dbg_rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb, cons
unsigned int truesize = skb->truesize;
/* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
ret = _rtw_netif_rx(ndev, skb);
@ -504,7 +504,7 @@ inline void dbg_rtw_skb_queue_purge(struct sk_buff_head *list, enum mstat_f flag
inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, int line)
{
void *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
p = _rtw_usb_buffer_alloc(dev, size, dma);
@ -519,7 +519,7 @@ inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_a
inline void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma, const enum mstat_f flags, const char *func, int line)
{
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
/* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
_rtw_usb_buffer_free(dev, size, addr, dma);
@ -538,7 +538,7 @@ void* rtw_malloc2d(int h, int w, int size)
void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size );
if (a == NULL)
{
DBG_871X("%s: alloc memory fail!\n", __FUNCTION__);
DBG_88E("%s: alloc memory fail!\n", __FUNCTION__);
return NULL;
}
@ -717,13 +717,13 @@ void rtw_usleep_os(int us)
#ifdef DBG_DELAY_OS
void _rtw_mdelay_os(int ms, const char *func, const int line)
{
DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms);
DBG_88E("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms);
mdelay((unsigned long)ms);
}
void _rtw_udelay_os(int us, const char *func, const int line)
{
DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
DBG_88E("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
udelay((unsigned long)us);
}
#else
@ -789,7 +789,7 @@ inline void rtw_lock_suspend(void)
#endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
/* DBG_88E("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
#endif
}
@ -802,7 +802,7 @@ inline void rtw_unlock_suspend(void)
#endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
/* DBG_88E("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
#endif
}
@ -993,20 +993,20 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
if (path && buf) {
if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
DBG_88E("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
ret=readFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);
DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret);
DBG_88E("%s readFile, ret:%d\n",__FUNCTION__, ret);
} else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
DBG_88E("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
}
} else {
DBG_871X("%s NULL pointer\n",__FUNCTION__);
DBG_88E("%s NULL pointer\n",__FUNCTION__);
ret = -EINVAL;
}
return ret;
@ -1027,20 +1027,20 @@ static int storeToFile(char *path, u8* buf, u32 sz)
if (path && buf) {
if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
DBG_88E("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
ret=writeFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);
DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);
DBG_88E("%s writeFile, ret:%d\n",__FUNCTION__, ret);
} else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
DBG_88E("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
}
} else {
DBG_871X("%s NULL pointer\n",__FUNCTION__);
DBG_88E("%s NULL pointer\n",__FUNCTION__);
ret = -EINVAL;
}
return ret;
@ -1318,7 +1318,7 @@ bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf)
return _FAIL;
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->write = (cbuf->write+1)%cbuf->size;
@ -1339,7 +1339,7 @@ void *rtw_cbuf_pop(struct rtw_cbuf *cbuf)
return NULL;
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];
cbuf->read = (cbuf->read+1)%cbuf->size;

8
os_dep/recv_linux.c
View file

@ -240,11 +240,11 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
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)
{
/* DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); */
/* DBG_88E("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); */
if (bmcast)
{
@ -258,7 +258,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
{
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->dev = pnetdev;
@ -283,7 +283,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
}
else/* to APself */
{
/* DBG_871X("to APSelf\n"); */
/* DBG_88E("to APSelf\n"); */
}
}

56
os_dep/rtw_android.c
View file

@ -152,7 +152,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len));
if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) {
DBG_871X("%s argument=%d less min size\n", __FUNCTION__, total_len);
DBG_88E("%s argument=%d less min size\n", __FUNCTION__, total_len);
goto exit_proc;
}
@ -179,11 +179,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,
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;
} else {
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",
__FUNCTION__, tlv_size_left);
goto exit_proc;
}
@ -193,7 +193,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] != PNO_TLV_FREQ_REPEAT)) {
DBG_871X("%s pno repeat : corrupted field\n",
DBG_88E("%s pno repeat : corrupted field\n",
__FUNCTION__);
goto exit_proc;
}
@ -201,7 +201,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);
DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat));
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",
__FUNCTION__);
goto exit_proc;
}
@ -212,7 +212,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
}
}
} else {
DBG_871X("%s get wrong TLV command\n", __FUNCTION__);
DBG_88E("%s get wrong TLV command\n", __FUNCTION__);
goto exit_proc;
}
@ -347,17 +347,17 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
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 = rtw_zmalloc(priv_cmd.total_len);
if (!command)
{
DBG_871X("%s: failed to allocate memory\n", __FUNCTION__);
DBG_88E("%s: failed to allocate memory\n", __FUNCTION__);
ret = -ENOMEM;
goto exit;
}
if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf, priv_cmd.total_len)) {
DBG_871X("%s: failed to access memory\n", __FUNCTION__);
DBG_88E("%s: failed to access memory\n", __FUNCTION__);
ret = -EFAULT;
goto exit;
}
@ -366,7 +366,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit;
}
DBG_871X("%s: Android private cmd \"%s\" on %s\n"
DBG_88E("%s: Android private cmd \"%s\" on %s\n"
, __FUNCTION__, command, ifr->ifr_name);
cmd_num = rtw_android_cmdstr_to_num(command);
@ -380,7 +380,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
}
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"
,__FUNCTION__, command, ifr->ifr_name);
ret = 0;
goto exit;
@ -511,7 +511,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
}
#endif
default:
DBG_871X("Unknown PRIVATE command %s - ignored\n", command);
DBG_88E("Unknown PRIVATE command %s - ignored\n", command);
snprintf(command, 3, "OK");
bytes_written = strlen("OK");
}
@ -521,14 +521,14 @@ response:
if ((bytes_written == 0) && (priv_cmd.total_len > 0))
command[0] = '\0';
if (bytes_written >= priv_cmd.total_len) {
DBG_871X("%s: bytes_written = %d\n", __FUNCTION__, bytes_written);
DBG_88E("%s: bytes_written = %d\n", __FUNCTION__, bytes_written);
bytes_written = priv_cmd.total_len;
} else {
bytes_written++;
}
priv_cmd.used_len = bytes_written;
if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) {
DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__);
DBG_88E("%s: failed to copy data to user buffer\n", __FUNCTION__);
ret = -EFAULT;
}
}
@ -566,7 +566,7 @@ int rtw_android_wifictrl_func_add(void)
ret = wifi_add_dev();
if (ret) {
DBG_871X("%s: platform_driver_register failed\n", __FUNCTION__);
DBG_88E("%s: platform_driver_register failed\n", __FUNCTION__);
return ret;
}
g_wifidev_registered = 1;
@ -574,7 +574,7 @@ int rtw_android_wifictrl_func_add(void)
/* Waiting callback after platform_driver_register is done or exit with error */
if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) {
ret = -EINVAL;
DBG_871X("%s: platform_driver_register timeout\n", __FUNCTION__);
DBG_88E("%s: platform_driver_register timeout\n", __FUNCTION__);
}
return ret;
@ -595,14 +595,14 @@ void *wl_android_prealloc(int section, unsigned long size)
if (wifi_control_data && wifi_control_data->mem_prealloc) {
alloc_ptr = wifi_control_data->mem_prealloc(section, size);
if (alloc_ptr) {
DBG_871X("success alloc section %d\n", section);
DBG_88E("success alloc section %d\n", section);
if (size != 0L)
memset(alloc_ptr, 0, size);
return alloc_ptr;
}
}
DBG_871X("can't alloc section %d\n", section);
DBG_88E("can't alloc section %d\n", section);
return NULL;
}
@ -621,7 +621,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr)
int wifi_set_power(int on, unsigned long msec)
{
DBG_871X("%s = %d\n", __FUNCTION__, on);
DBG_88E("%s = %d\n", __FUNCTION__, on);
if (wifi_control_data && wifi_control_data->set_power) {
wifi_control_data->set_power(on);
}
@ -633,7 +633,7 @@ int wifi_set_power(int on, unsigned long msec)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
int wifi_get_mac_addr(unsigned char *buf)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if (!buf)
return -EINVAL;
if (wifi_control_data && wifi_control_data->get_mac_addr) {
@ -646,7 +646,7 @@ int wifi_get_mac_addr(unsigned char *buf)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE)
void *wifi_get_country_code(char *ccode)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if (!ccode)
return NULL;
if (wifi_control_data && wifi_control_data->get_country_code) {
@ -658,7 +658,7 @@ void *wifi_get_country_code(char *ccode)
static int wifi_set_carddetect(int on)
{
DBG_871X("%s = %d\n", __FUNCTION__, on);
DBG_88E("%s = %d\n", __FUNCTION__, on);
if (wifi_control_data && wifi_control_data->set_carddetect) {
wifi_control_data->set_carddetect(on);
}
@ -671,7 +671,7 @@ static int wifi_probe(struct platform_device *pdev)
(struct wifi_platform_data *)(pdev->dev.platform_data);
int wifi_wake_gpio = 0;
DBG_871X("## %s\n", __FUNCTION__);
DBG_88E("## %s\n", __FUNCTION__);
wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq");
if (wifi_irqres == NULL)
@ -694,7 +694,7 @@ static int wifi_remove(struct platform_device *pdev)
struct wifi_platform_data *wifi_ctrl =
(struct wifi_platform_data *)(pdev->dev.platform_data);
DBG_871X("## %s\n", __FUNCTION__);
DBG_88E("## %s\n", __FUNCTION__);
wifi_control_data = wifi_ctrl;
wifi_set_power(0, 0); /* Power Off */
@ -706,7 +706,7 @@ static int wifi_remove(struct platform_device *pdev)
static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
{
DBG_871X("##> %s\n", __FUNCTION__);
DBG_88E("##> %s\n", __FUNCTION__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
bcmsdh_oob_intr_set(0);
#endif
@ -715,7 +715,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
static int wifi_resume(struct platform_device *pdev)
{
DBG_871X("##> %s\n", __FUNCTION__);
DBG_88E("##> %s\n", __FUNCTION__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
if (dhd_os_check_if_up(bcmsdh_get_drvdata()))
bcmsdh_oob_intr_set(1);
@ -746,7 +746,7 @@ static struct platform_driver wifi_device_legacy = {
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_legacy);
return 0;
@ -754,7 +754,7 @@ static int wifi_add_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_legacy);
}

226
os_dep/usb_intf.c
View file

@ -49,7 +49,7 @@ static void rtw_dev_shutdown(struct device *dev)
struct adapter *adapter = dvobj->if1;
int i;
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
for (i = 0; i<dvobj->iface_nums; i++) {
adapter = dvobj->padapters[i];
@ -220,7 +220,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
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;
goto exit;
}
@ -296,25 +296,25 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
if (phost_endp) {
pendp_desc = &phost_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",pendp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",pendp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress);
DBG_871X("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",pendp_desc->bInterval);
DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_88E("bLength=%x\n",pendp_desc->bLength);
DBG_88E("bDescriptorType=%x\n",pendp_desc->bDescriptorType);
DBG_88E("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress);
DBG_88E("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize));
DBG_88E("bInterval=%x\n",pendp_desc->bInterval);
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->RtNumInPipes++;
} 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->RtNumInPipes++;
}
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->RtNumOutPipes++;
}
@ -322,14 +322,14 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
}
}
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) {
pdvobjpriv->ishighspeed = true;
DBG_871X("USB_SPEED_HIGH\n");
DBG_88E("USB_SPEED_HIGH\n");
} else {
pdvobjpriv->ishighspeed = false;
DBG_871X("NON USB_SPEED_HIGH\n");
DBG_88E("NON USB_SPEED_HIGH\n");
}
if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) {
@ -374,7 +374,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
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 . */
/* 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));
}
}
@ -386,7 +386,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
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));
;
@ -442,7 +442,7 @@ void rtw_dev_unload(struct adapter *padapter)
if (padapter->bup == true)
{
DBG_871X("===> rtw_dev_unload\n");
DBG_88E("===> rtw_dev_unload\n");
padapter->bDriverStopped = true;
if (padapter->xmitpriv.ack_tx)
@ -471,7 +471,7 @@ void rtw_dev_unload(struct adapter *padapter)
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"));
@ -507,14 +507,14 @@ int rtw_hw_suspend(struct adapter *padapter )
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);
goto error_exit;
}
LeaveAllPowerSaveMode(padapter);
DBG_871X("==> rtw_hw_suspend\n");
DBG_88E("==> rtw_hw_suspend\n");
_enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true;
/* s1. */
@ -558,7 +558,7 @@ int rtw_hw_suspend(struct adapter *padapter )
return 0;
error_exit:
DBG_871X("%s, failed\n",__FUNCTION__);
DBG_88E("%s, failed\n",__FUNCTION__);
return (-1);
}
@ -574,7 +574,7 @@ int rtw_hw_resume(struct adapter *padapter)
pwrpriv = adapter_to_pwrctl(padapter);
pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
pnetdev = padapter->pnetdev;
DBG_871X("==> rtw_hw_resume\n");
DBG_88E("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter);
@ -605,7 +605,7 @@ int rtw_hw_resume(struct adapter *padapter)
return 0;
error_exit:
DBG_871X("%s, Open net dev failed\n",__FUNCTION__);
DBG_88E("%s, Open net dev failed\n",__FUNCTION__);
return (-1);
}
@ -624,7 +624,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
;
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
DBG_88E("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if (!padapter->bup) {
@ -636,7 +636,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
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);
goto exit;
}
@ -665,7 +665,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
_exit_pwrlock(&pwrpriv->lock);
exit:
DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__
DBG_88E("<=== %s return %d.............. in %dms\n", __FUNCTION__
, ret, rtw_get_passing_time_ms(start_time));
return ret;
@ -704,7 +704,7 @@ int rtw_resume_process(struct adapter *padapter)
#endif /* ifdef CONFIG_BT_COEXIST */
;
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
DBG_88E("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if (padapter) {
pnetdev= padapter->pnetdev;
@ -717,18 +717,18 @@ int rtw_resume_process(struct adapter *padapter)
#ifdef CONFIG_BT_COEXIST
#ifdef CONFIG_AUTOSUSPEND
#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));
#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;
#endif
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( true == pwrpriv->bAutoResume ) {
pwrpriv->bInternalAutoSuspend = 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 */
@ -736,7 +736,7 @@ int rtw_resume_process(struct adapter *padapter)
if (rtw_resume_common(padapter)!= 0) {
DBG_871X("%s rtw_resume_common failed\n",__FUNCTION__);
DBG_88E("%s rtw_resume_common failed\n",__FUNCTION__);
_exit_pwrlock(&pwrpriv->lock);
goto exit;
}
@ -753,11 +753,11 @@ int rtw_resume_process(struct adapter *padapter)
}
#endif
#ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( true == pwrpriv->bAutoResume ) {
pwrpriv->bInternalAutoSuspend = 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 */
@ -769,14 +769,14 @@ int rtw_resume_process(struct adapter *padapter)
_exit_pwrlock(&pwrpriv->lock);
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);
}
ret = 0;
exit:
pwrpriv->bInSuspend = false;
DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__
DBG_88E("<=== %s return %d.............. in %dms\n", __FUNCTION__
, ret, rtw_get_passing_time_ms(start_time));
return ret;
@ -788,7 +788,7 @@ void autosuspend_enter(struct adapter* padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("==>autosuspend_enter...........\n");
DBG_88E("==>autosuspend_enter...........\n");
pwrpriv->bInternalAutoSuspend = true;
pwrpriv->bips_processing = true;
@ -827,14 +827,14 @@ void autosuspend_enter(struct adapter* padapter)
pwrpriv->autopm_cnt --;
}
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 */
}
#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
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
}
@ -847,7 +847,7 @@ int autoresume_enter(struct adapter* padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("====> autoresume_enter\n");
DBG_88E("====> autoresume_enter\n");
if (rf_off == pwrpriv->rf_pwrstate )
{
@ -856,7 +856,7 @@ int autoresume_enter(struct adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
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;
goto error_exit;
}
@ -867,9 +867,9 @@ int autoresume_enter(struct adapter* padapter)
#endif
#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
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
#else /* ifndef CONFIG_BT_COEXIST */
pwrpriv->bAutoResume=true;
@ -877,7 +877,7 @@ int autoresume_enter(struct adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
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;
goto error_exit;
}
@ -887,17 +887,17 @@ int autoresume_enter(struct adapter* padapter)
usb_autoresume_device(dvobj->pusbdev, 1);
#endif
#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
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
pwrpriv->autopm_cnt++;
}
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 */
}
DBG_871X("<==== autoresume_enter\n");
DBG_88E("<==== autoresume_enter\n");
error_exit:
return result;
@ -981,8 +981,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
dvobj->pusbdev->do_remote_wakeup=1;
pusb_intf->needs_remote_wakeup = 1;
device_init_wakeup(&pusb_intf->dev, 1);
DBG_871X("\n pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
DBG_871X("\n pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev));
DBG_88E("\n pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
DBG_88E("\n pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev));
}
#endif
#endif
@ -1005,9 +1005,9 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
#else
DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt);
DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt);
#endif
}
}
@ -1016,7 +1016,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(pusb_intf) < 0)
{
DBG_871X( "can't get autopm:\n");
DBG_88E( "can't get autopm:\n");
}
#endif
#ifdef CONFIG_BT_COEXIST
@ -1028,7 +1028,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#ifdef CONFIG_P2P
rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr);
#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->bSurpriseRemoved
, padapter->bup
@ -1080,7 +1080,7 @@ static void rtw_usb_if1_deinit(struct adapter *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);
@ -1124,47 +1124,47 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
struct usb_host_endpoint *host_endp;
struct usb_endpoint_descriptor *endp_desc;
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_871X("bLength:%u\n", dev_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType);
DBG_871X("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB));
DBG_871X("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass);
DBG_871X("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass);
DBG_871X("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol);
DBG_871X("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0);
DBG_871X("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor));
DBG_871X("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct));
DBG_871X("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice));
DBG_871X("iManufacturer:0x02%x\n", dev_desc->iManufacturer);
DBG_871X("iProduct:0x%02x\n", dev_desc->iProduct);
DBG_871X("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber);
DBG_871X("bNumConfigurations:%u\n", dev_desc->bNumConfigurations);
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_88E("bLength:%u\n", dev_desc->bLength);
DBG_88E("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType);
DBG_88E("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB));
DBG_88E("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass);
DBG_88E("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass);
DBG_88E("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol);
DBG_88E("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0);
DBG_88E("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor));
DBG_88E("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct));
DBG_88E("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice));
DBG_88E("iManufacturer:0x02%x\n", dev_desc->iManufacturer);
DBG_88E("iProduct:0x%02x\n", dev_desc->iProduct);
DBG_88E("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber);
DBG_88E("bNumConfigurations:%u\n", dev_desc->bNumConfigurations);
DBG_871X("\nact_conf_desc:%p\n", act_conf_desc);
DBG_871X("bLength:%u\n", act_conf_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType);
DBG_871X("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength));
DBG_871X("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces);
DBG_871X("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue);
DBG_871X("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration);
DBG_871X("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes);
DBG_871X("bMaxPower=%u\n", act_conf_desc->bMaxPower);
DBG_88E("\nact_conf_desc:%p\n", act_conf_desc);
DBG_88E("bLength:%u\n", act_conf_desc->bLength);
DBG_88E("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType);
DBG_88E("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength));
DBG_88E("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces);
DBG_88E("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue);
DBG_88E("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration);
DBG_88E("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes);
DBG_88E("bMaxPower=%u\n", act_conf_desc->bMaxPower);
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*/
host_iface = usb_intf->cur_altsetting;
iface_desc = &host_iface->desc;
DBG_871X("\nusb_interface_descriptor:%p:\n", iface_desc);
DBG_871X("bLength:%u\n", iface_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType);
DBG_871X("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber);
DBG_871X("bAlternateSetting=%x\n", iface_desc->bAlternateSetting);
DBG_871X("bNumEndpoints=%x\n", iface_desc->bNumEndpoints);
DBG_871X("bInterfaceClass=%x\n", iface_desc->bInterfaceClass);
DBG_871X("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass);
DBG_871X("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol);
DBG_871X("iInterface=%x\n", iface_desc->iInterface);
DBG_88E("\nusb_interface_descriptor:%p:\n", iface_desc);
DBG_88E("bLength:%u\n", iface_desc->bLength);
DBG_88E("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType);
DBG_88E("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber);
DBG_88E("bAlternateSetting=%x\n", iface_desc->bAlternateSetting);
DBG_88E("bNumEndpoints=%x\n", iface_desc->bNumEndpoints);
DBG_88E("bInterfaceClass=%x\n", iface_desc->bInterfaceClass);
DBG_88E("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass);
DBG_88E("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol);
DBG_88E("iInterface=%x\n", iface_desc->iInterface);
for (i = 0; i < iface_desc->bNumEndpoints; i++)
{
@ -1173,34 +1173,34 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
{
endp_desc = &host_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",endp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",endp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",endp_desc->bEndpointAddress);
DBG_871X("bmAttributes=%x\n",endp_desc->bmAttributes);
DBG_871X("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize);
DBG_871X("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",endp_desc->bInterval);
DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_88E("bLength=%x\n",endp_desc->bLength);
DBG_88E("bDescriptorType=%x\n",endp_desc->bDescriptorType);
DBG_88E("bEndpointAddress=%x\n",endp_desc->bEndpointAddress);
DBG_88E("bmAttributes=%x\n",endp_desc->bmAttributes);
DBG_88E("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize);
DBG_88E("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize));
DBG_88E("bInterval=%x\n",endp_desc->bInterval);
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));
}
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);
}
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));
}
}
}
if (udev->speed == USB_SPEED_HIGH)
DBG_871X("USB_SPEED_HIGH\n");
DBG_88E("USB_SPEED_HIGH\n");
else
DBG_871X("NON USB_SPEED_HIGH\n");
DBG_88E("NON USB_SPEED_HIGH\n");
}
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
@ -1226,7 +1226,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#endif
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;
}
@ -1235,7 +1235,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#endif
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);
}
@ -1276,14 +1276,14 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
;
DBG_871X("+rtw_dev_remove\n");
DBG_88E("+rtw_dev_remove\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n"));
dvobj->processing_dev_remove = true;
rtw_unregister_netdevs(dvobj);
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;
}
#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
@ -1300,7 +1300,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
usb_dvobj_deinit(pusb_intf);
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
@ -1320,8 +1320,8 @@ static int __init rtw_drv_entry(void)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION);
DBG_871X("build time: %s %s\n", __DATE__, __TIME__);
DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
rtw_suspend_lock_init();
@ -1332,13 +1332,13 @@ static int __init rtw_drv_entry(void)
static void __exit rtw_drv_halt(void)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n"));
DBG_871X("+rtw_drv_halt\n");
DBG_88E("+rtw_drv_halt\n");
usb_drv->drv_registered = false;
usb_deregister(&usb_drv->usbdrv);
rtw_suspend_lock_uninit();
DBG_871X("-rtw_drv_halt\n");
DBG_88E("-rtw_drv_halt\n");
rtw_mstat_dump();
}

16
os_dep/usb_ops_linux.c
View file

@ -220,7 +220,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev;
/* DBG_871X("%s\n", __func__); */
/* DBG_88E("%s\n", __func__); */
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx))
@ -284,7 +284,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
struct adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
padapter->bReadPortCancel = true;
@ -354,7 +354,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
} else {
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))
{
/* usb_clear_halt(pusbdev, purb->pipe); */
@ -365,11 +365,11 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
goto check_completion;
} else if (purb->status == -ENOENT) {
DBG_871X("%s: -ENOENT\n", __func__);
DBG_88E("%s: -ENOENT\n", __func__);
goto check_completion;
} else if (purb->status == -ECONNRESET) {
DBG_871X("%s: -ECONNRESET\n", __func__);
DBG_88E("%s: -ECONNRESET\n", __func__);
goto check_completion;
} else if (purb->status == -ESHUTDOWN) {
@ -430,7 +430,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx)) {
#ifdef DBG_TX
DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__
DBG_88E(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__
,padapter->bDriverStopped, padapter->bSurpriseRemoved, dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx );
#endif
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||pwrctl->pnp_bstop_trx)!!!\n"));
@ -535,7 +535,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
pHalData->srestpriv.last_tx_time = jiffies;
} else {
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));
switch (status) {
@ -575,7 +575,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
struct adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
padapter->bWritePortCancel = true;

12
os_dep/xmit_linux.c
View file

@ -90,7 +90,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
for (i=0; i<8; i++) {
pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
if (pxmitbuf->pxmit_urb[i] == NULL) {
DBG_871X("pxmitbuf->pxmit_urb[i]== NULL");
DBG_88E("pxmitbuf->pxmit_urb[i]== NULL");
return _FAIL;
}
@ -183,7 +183,7 @@ static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pk
if (padapter->registrypriv.wifi_spec) {
/* No free space for Tx, tx_worker is too slow */
if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) {
/* DBG_871X("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); */
/* DBG_88E("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); */
netif_stop_subqueue(padapter->pnetdev, queue);
}
} else {
@ -251,13 +251,13 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
memcpy(newskb->data, psta->hwaddr, 6);
res = rtw_xmit(padapter, &newskb);
if (res < 0) {
DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__);
DBG_88E("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__);
pxmitpriv->tx_drop++;
rtw_skb_free(newskb);
} else
pxmitpriv->tx_pkts++;
} else {
DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__);
DBG_88E("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__);
pxmitpriv->tx_drop++;
/* rtw_skb_free(skb); */
return false; /* Caller shall tx this multicast frame via normal way. */
@ -285,7 +285,7 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
if (rtw_if_up(padapter) == false) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n"));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__);
DBG_88E("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__);
#endif
goto drop_packet;
}
@ -310,7 +310,7 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
res = rtw_xmit(padapter, &pkt);
if (res < 0) {
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__);
DBG_88E("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__);
#endif
goto drop_packet;
}