mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2025-01-24 10:15:18 +00:00
Remove leftovers of Intel WIDI and take a general cleanup
This commit is contained in:
kimocoder
parent
63cf0b4584
commit
c7f8f6e363
10
Makefile
10
Makefile
@ -1,15 +1,15 @@
|
||||
EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
|
||||
EXTRA_CFLAGS += -O3
|
||||
EXTRA_CFLAGS += -Wno-unused-variable
|
||||
#EXTRA_CFLAGS += -Wno-unused-value
|
||||
EXTRA_CFLAGS += -Wno-unused-value
|
||||
EXTRA_CFLAGS += -Wno-unused-label
|
||||
#EXTRA_CFLAGS += -Wno-unused-parameter
|
||||
EXTRA_CFLAGS += -Wno-unused-function
|
||||
EXTRA_CFLAGS += -Wno-implicit-fallthrough
|
||||
EXTRA_CFLAGS += -Wno-unused-parameter
|
||||
#EXTRA_CFLAGS += -Wno-unused-function
|
||||
#EXTRA_CFLAGS += -Wno-implicit-fallthrough
|
||||
EXTRA_CFLAGS += -Wno-cast-function-type
|
||||
EXTRA_CFLAGS += -Wno-missing-declarations
|
||||
EXTRA_CFLAGS += -Wno-missing-prototypes
|
||||
#EXTRA_CFLAGS += -Wno-error=cast-function-type
|
||||
EXTRA_CFLAGS += -Wno-error=cast-function-type
|
||||
#EXTRA_CFLAGS += -Wno-parentheses-equality
|
||||
#EXTRA_CFLAGS += -Wno-error=incompatible-pointer-types
|
||||
EXTRA_CFLAGS += -Wno-stringop-overread
|
||||
|
||||
@ -152,19 +152,6 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
|
||||
goto exit;
|
||||
}
|
||||
pevtpriv->evt_buf = pevtpriv->evt_allocated_buf + 4 - ((unsigned int)(pevtpriv->evt_allocated_buf) & 3);
|
||||
|
||||
|
||||
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
|
||||
pevtpriv->allocated_c2h_mem = rtw_zmalloc(C2H_MEM_SZ + 4);
|
||||
|
||||
if (pevtpriv->allocated_c2h_mem == NULL) {
|
||||
res = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
pevtpriv->c2h_mem = pevtpriv->allocated_c2h_mem + 4\
|
||||
- ((u32)(pevtpriv->allocated_c2h_mem) & 3);
|
||||
#endif /* end of CONFIG_SDIO_HCI */
|
||||
_rtw_init_queue(&(pevtpriv->evt_queue));
|
||||
|
||||
exit:
|
||||
@ -5422,11 +5409,6 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
|
||||
case CHECK_HIQ_WK_CID:
|
||||
rtw_chk_hi_queue_hdl(padapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
case INTEl_WIDI_WK_CID:
|
||||
intel_widi_wk_hdl(padapter, pdrvextra_cmd->type, pdrvextra_cmd->pbuf);
|
||||
break;
|
||||
#endif
|
||||
/* add for CONFIG_IEEE80211W, none 11w can use it */
|
||||
case RESET_SECURITYPRIV:
|
||||
|
||||
@ -1390,13 +1390,6 @@ void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf)
|
||||
|| _SUCCESS != rtw_sitesurvey_cmd(adapter, &parm)
|
||||
) {
|
||||
rtw_set_to_roam(adapter, 0);
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {
|
||||
_rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);
|
||||
intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0);
|
||||
RTW_INFO("change to widi listen\n");
|
||||
}
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
rtw_free_assoc_resources(adapter, _TRUE);
|
||||
rtw_indicate_disconnect(adapter, 0, _FALSE);
|
||||
} else
|
||||
@ -1756,13 +1749,6 @@ void rtw_indicate_connect(_adapter *padapter)
|
||||
}
|
||||
|
||||
rtw_set_to_roam(padapter, 0);
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {
|
||||
_rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);
|
||||
intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0);
|
||||
RTW_INFO("change to widi listen\n");
|
||||
}
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
if (!MLME_IS_AP(padapter) && !MLME_IS_MESH(padapter))
|
||||
rtw_mi_set_scan_deny(padapter, 3000);
|
||||
|
||||
@ -2918,10 +2904,6 @@ void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
|
||||
roam = _TRUE;
|
||||
roam_target = pmlmepriv->roam_network;
|
||||
}
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
else if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_CONNECTED)
|
||||
roam = _TRUE;
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
if (roam == _TRUE) {
|
||||
if (rtw_to_roam(adapter) > 0)
|
||||
@ -2938,10 +2920,6 @@ void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
|
||||
rtw_free_mlme_priv_ie_data(pmlmepriv);
|
||||
|
||||
rtw_indicate_disconnect(adapter, *(u16 *)pstadel->rsvd, pstadel->locally_generated);
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (!rtw_to_roam(adapter))
|
||||
process_intel_widi_disconnect(adapter, 1);
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
_rtw_roaming(adapter, roam_target);
|
||||
}
|
||||
@ -3063,13 +3041,6 @@ void rtw_join_timeout_handler(void *ctx)
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {
|
||||
_rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);
|
||||
intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0);
|
||||
RTW_INFO("change to widi listen\n");
|
||||
}
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
RTW_INFO("%s We've try roaming but fail\n", __FUNCTION__);
|
||||
#ifdef CONFIG_RTW_80211R
|
||||
rtw_ft_clr_flags(adapter, RTW_FT_PEER_EN|RTW_FT_PEER_OTD_EN);
|
||||
@ -3097,13 +3068,10 @@ void rtw_join_timeout_handler(void *ctx)
|
||||
|
||||
_exit_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
|
||||
#ifdef CONFIG_DRVEXT_MODULE_WSC
|
||||
drvext_assoc_fail_indicate(&adapter->drvextpriv);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
@ -3343,7 +3311,6 @@ void rtw_iface_dynamic_check_timer_handlder(_adapter *adapter)
|
||||
|
||||
|
||||
#ifdef CONFIG_BR_EXT
|
||||
|
||||
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
|
||||
rcu_read_lock();
|
||||
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
|
||||
@ -3823,7 +3790,6 @@ The caller must hold the following spinlock
|
||||
|
||||
pmlmepriv->lock
|
||||
|
||||
|
||||
*/
|
||||
|
||||
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
|
||||
@ -3963,7 +3929,6 @@ sint rtw_set_auth(_adapter *adapter, struct security_priv *psecuritypriv)
|
||||
pcmd->rsp = NULL;
|
||||
pcmd->rspsz = 0;
|
||||
|
||||
|
||||
_rtw_init_listhead(&pcmd->list);
|
||||
|
||||
|
||||
@ -3971,7 +3936,6 @@ sint rtw_set_auth(_adapter *adapter, struct security_priv *psecuritypriv)
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
return res;
|
||||
|
||||
}
|
||||
@ -4233,7 +4197,6 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.)
|
||||
* Added by Annie, 2006-05-07.
|
||||
@ -4394,7 +4357,6 @@ void rtw_init_registrypriv_dev_network(_adapter *adapter)
|
||||
WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network;
|
||||
u8 *myhwaddr = adapter_mac_addr(adapter);
|
||||
|
||||
|
||||
_rtw_memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
|
||||
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID));
|
||||
@ -4406,8 +4368,6 @@ void rtw_init_registrypriv_dev_network(_adapter *adapter)
|
||||
pdev_network->Configuration.FHConfig.HopSet = 0;
|
||||
pdev_network->Configuration.FHConfig.DwellTime = 0;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void rtw_update_registrypriv_dev_network(_adapter *adapter)
|
||||
@ -4487,14 +4447,11 @@ void rtw_update_registrypriv_dev_network(_adapter *adapter)
|
||||
/* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */
|
||||
/* pdev_network->IELength = cpu_to_le32(sz); */
|
||||
|
||||
|
||||
}
|
||||
|
||||
void rtw_get_encrypt_decrypt_from_registrypriv(_adapter *adapter)
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* the fucntion is at passive_level */
|
||||
@ -4513,7 +4470,7 @@ void rtw_joinbss_reset(_adapter *padapter)
|
||||
|
||||
phtpriv->ampdu_enable = _FALSE;/* reset to disabled */
|
||||
|
||||
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI)
|
||||
#if defined(CONFIG_USB_HCI)
|
||||
/* TH=1 => means that invalidate usb rx aggregation */
|
||||
/* TH=0 => means that validate usb rx aggregation, use init value. */
|
||||
if (phtpriv->ht_option) {
|
||||
@ -4526,8 +4483,7 @@ void rtw_joinbss_reset(_adapter *padapter)
|
||||
threshold = 1;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold));
|
||||
}
|
||||
#endif/* #if defined( CONFIG_USB_HCI) || defined (CONFIG_SDIO_HCI) */
|
||||
|
||||
#endif/* #if defined( CONFIG_USB_HCI) */
|
||||
#endif/* #ifdef CONFIG_80211N_HT */
|
||||
|
||||
}
|
||||
|
||||
@ -247,26 +247,32 @@ void rtw_txpwr_init_regd(struct rf_ctl_t *rfctl)
|
||||
case TXPWR_LMT_CHILE:
|
||||
if (regd == TXPWR_LMT_IC || regd == TXPWR_LMT_CHILE)
|
||||
regd = TXPWR_LMT_FCC;
|
||||
|
||||
else if (regd == TXPWR_LMT_KCC || regd == TXPWR_LMT_ACMA)
|
||||
regd = TXPWR_LMT_ETSI;
|
||||
ent = _rtw_txpwr_lmt_get_by_name(rfctl, regd_str(regd));
|
||||
|
||||
if (ent)
|
||||
rfctl->regd_name = ent->regd_name;
|
||||
RTW_PRINT("alternate regd_name:%s %s\n"
|
||||
, regd_str(regd)
|
||||
, rfctl->regd_name ? "is used" : "not found"
|
||||
/* fallthrough */
|
||||
);
|
||||
|
||||
if (rfctl->regd_name)
|
||||
break;
|
||||
default:
|
||||
rfctl->regd_name = regd_str(TXPWR_LMT_WW);
|
||||
RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW));
|
||||
break;
|
||||
};
|
||||
/* fallthrough */
|
||||
|
||||
default:
|
||||
rfctl->regd_name = regd_str(TXPWR_LMT_WW);
|
||||
RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW));
|
||||
/* fallthrough */
|
||||
}
|
||||
|
||||
release_lock:
|
||||
_exit_critical_mutex(&rfctl->txpwr_lmt_mutex, &irqL);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_TXPWR_LIMIT */
|
||||
|
||||
void rtw_rfctl_init(_adapter *adapter)
|
||||
@ -1343,6 +1349,8 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
else
|
||||
ptable->func = &OnAuthClient;
|
||||
case WIFI_ASSOCREQ:
|
||||
break;
|
||||
|
||||
case WIFI_REASSOCREQ:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
@ -1350,6 +1358,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
rtw_hostapd_mlme_rx(padapter, precv_frame);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case WIFI_PROBEREQ:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
@ -1357,12 +1366,15 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
rtw_hostapd_mlme_rx(padapter, precv_frame);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case WIFI_BEACON:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
break;
|
||||
|
||||
case WIFI_ACTION:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
break;
|
||||
|
||||
default:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
@ -1370,6 +1382,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
rtw_hostapd_mlme_rx(padapter, precv_frame);
|
||||
#endif
|
||||
break;
|
||||
|
||||
}
|
||||
#else
|
||||
|
||||
|
||||
@ -112,7 +112,6 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
pcur += psta->dev_name_len;
|
||||
}
|
||||
|
||||
|
||||
tmplen = (u8)(pcur - pstart);
|
||||
|
||||
*pstart = (tmplen - 1);
|
||||
@ -123,8 +122,6 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
pstart = pcur;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
|
||||
|
||||
@ -249,7 +246,6 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
|
||||
pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &(pattrib->pktlen));
|
||||
pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pattrib->pktlen));
|
||||
|
||||
|
||||
/* Build P2P IE */
|
||||
/* P2P OUI */
|
||||
p2pielen = 0;
|
||||
@ -450,10 +446,8 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
|
||||
p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_NOA, 2, noa_attr_content);
|
||||
|
||||
|
||||
|
||||
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen));
|
||||
|
||||
|
||||
pattrib->last_txcmdsz = pattrib->pktlen;
|
||||
|
||||
dump_mgntframe(padapter, pmgntframe);
|
||||
@ -466,7 +460,6 @@ u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
u16 capability = 0;
|
||||
u32 len = 0, p2pielen = 0;
|
||||
|
||||
|
||||
/* P2P OUI */
|
||||
p2pielen = 0;
|
||||
p2pie[p2pielen++] = 0x50;
|
||||
@ -501,7 +494,6 @@ u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* P2P Device ID ATTR */
|
||||
p2pielen += rtw_set_p2p_attr_content(&p2pie[p2pielen], P2P_ATTR_DEVICE_ID, ETH_ALEN, pwdinfo->device_addr);
|
||||
|
||||
|
||||
/* Notice of Absence ATTR */
|
||||
/* Type: */
|
||||
/* Length: */
|
||||
@ -509,10 +501,8 @@ u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
|
||||
/* go_add_noa_attr(pwdinfo); */
|
||||
|
||||
|
||||
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len);
|
||||
|
||||
|
||||
return len;
|
||||
|
||||
}
|
||||
@ -543,7 +533,6 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* 2. Associated BSSID */
|
||||
/* 3. Coupled Sink Information */
|
||||
|
||||
|
||||
/* WFD Device Information ATTR */
|
||||
/* Type: */
|
||||
wfdie[wfdielen++] = WFD_ATTR_DEVICE_INFO;
|
||||
@ -657,7 +646,6 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* 2. Associated BSSID */
|
||||
/* 3. Coupled Sink Information */
|
||||
|
||||
|
||||
/* WFD Device Information ATTR */
|
||||
/* Type: */
|
||||
wfdie[wfdielen++] = WFD_ATTR_DEVICE_INFO;
|
||||
@ -1332,7 +1320,6 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
wfdie[wfdielen++] = 0;
|
||||
wfdie[wfdielen++] = 0;
|
||||
|
||||
|
||||
rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len);
|
||||
|
||||
exit:
|
||||
@ -1432,7 +1419,6 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
wfdie[wfdielen++] = 0;
|
||||
wfdie[wfdielen++] = 0;
|
||||
|
||||
|
||||
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len);
|
||||
|
||||
exit:
|
||||
@ -1464,7 +1450,6 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* 2. Associated BSSID ( Optional ) */
|
||||
/* 3. Local IP Adress ( Optional ) */
|
||||
|
||||
|
||||
/* WFD Device Information ATTR */
|
||||
/* Type: */
|
||||
wfdie[wfdielen++] = WFD_ATTR_DEVICE_INFO;
|
||||
@ -1577,7 +1562,6 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* 2. Associated BSSID ( Optional ) */
|
||||
/* 3. Local IP Adress ( Optional ) */
|
||||
|
||||
|
||||
/* WFD Device Information ATTR */
|
||||
/* Type: */
|
||||
wfdie[wfdielen++] = WFD_ATTR_DEVICE_INFO;
|
||||
@ -1758,7 +1742,6 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
wfdie[wfdielen++] = 0;
|
||||
wfdie[wfdielen++] = 0;
|
||||
|
||||
|
||||
rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, &len);
|
||||
|
||||
exit:
|
||||
@ -1869,16 +1852,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
{
|
||||
u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 };
|
||||
u32 len = 0, p2pielen = 0;
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
struct mlme_priv *pmlmepriv = &(pwdinfo->padapter->mlmepriv);
|
||||
u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
|
||||
u8 widi_version = 0, i = 0;
|
||||
|
||||
if (_rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE)
|
||||
widi_version = 35;
|
||||
else if (pmlmepriv->num_p2p_sdt != 0)
|
||||
widi_version = 40;
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
/* P2P OUI */
|
||||
p2pielen = 0;
|
||||
@ -1961,13 +1934,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
/* 21->P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) */
|
||||
/* + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) */
|
||||
/* *(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); */
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (widi_version == 35)
|
||||
RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 + pwdinfo->device_name_len);
|
||||
else if (widi_version == 40)
|
||||
RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 * pmlmepriv->num_p2p_sdt + pwdinfo->device_name_len);
|
||||
else
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
RTW_PUT_LE16(p2pie + p2pielen, 21 + pwdinfo->device_name_len);
|
||||
p2pielen += 2;
|
||||
|
||||
@ -1982,25 +1948,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
RTW_PUT_BE16(p2pie + p2pielen, pwdinfo->supported_wps_cm);
|
||||
p2pielen += 2;
|
||||
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (widi_version == 40) {
|
||||
/* Primary Device Type */
|
||||
/* Category ID */
|
||||
/* *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); */
|
||||
RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_cid);
|
||||
p2pielen += 2;
|
||||
|
||||
/* OUI */
|
||||
/* *(u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); */
|
||||
RTW_PUT_BE32(p2pie + p2pielen, WPSOUI);
|
||||
p2pielen += 4;
|
||||
|
||||
/* Sub Category ID */
|
||||
/* *(u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); */
|
||||
RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_scid);
|
||||
p2pielen += 2;
|
||||
} else
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
{
|
||||
/* Primary Device Type */
|
||||
/* Category ID */
|
||||
@ -2020,32 +1967,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
}
|
||||
|
||||
/* Number of Secondary Device Types */
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (widi_version == 35) {
|
||||
p2pie[p2pielen++] = 0x01;
|
||||
|
||||
RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_DISPLAYS);
|
||||
p2pielen += 2;
|
||||
|
||||
RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI);
|
||||
p2pielen += 4;
|
||||
|
||||
RTW_PUT_BE16(p2pie + p2pielen, P2P_SCID_WIDI_CONSUMER_SINK);
|
||||
p2pielen += 2;
|
||||
} else if (widi_version == 40) {
|
||||
p2pie[p2pielen++] = pmlmepriv->num_p2p_sdt;
|
||||
for (; i < pmlmepriv->num_p2p_sdt; i++) {
|
||||
RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_cid[i]);
|
||||
p2pielen += 2;
|
||||
|
||||
RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI);
|
||||
p2pielen += 4;
|
||||
|
||||
RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_scid[i]);
|
||||
p2pielen += 2;
|
||||
}
|
||||
} else
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
p2pie[p2pielen++] = 0x00; /* No Secondary Device Type List */
|
||||
|
||||
/* Device Name */
|
||||
@ -2070,10 +1991,8 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
p2pielen += go_add_group_info_attr(pwdinfo, p2pie + p2pielen);
|
||||
|
||||
|
||||
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len);
|
||||
|
||||
|
||||
return len;
|
||||
|
||||
}
|
||||
@ -2202,12 +2121,9 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
|
||||
|
||||
pbuf = rtw_set_ie(pbuf, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &len);
|
||||
|
||||
|
||||
return len;
|
||||
|
||||
}
|
||||
|
||||
|
||||
u32 build_assoc_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 status_code)
|
||||
{
|
||||
u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 };
|
||||
@ -2310,7 +2226,6 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
||||
|
||||
}
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
@ -2399,7 +2314,6 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
||||
pattr_content += (num_of_secdev_type * 8);
|
||||
}
|
||||
|
||||
|
||||
/* dev_name_len = attr_contentlen - ETH_ALEN - 2 - 8 - 1 - (num_of_secdev_type*8); */
|
||||
psta->dev_name_len = 0;
|
||||
if (WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(u16 *)pattr_content)) {
|
||||
@ -2413,7 +2327,6 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
||||
rtw_mfree(pbuf, attr_contentlen);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Get the next P2P IE */
|
||||
@ -2486,16 +2399,12 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
|
||||
|
||||
} else
|
||||
status = P2P_STATUS_FAIL_INVALID_PARAM;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* issue Device Discoverability Response */
|
||||
issue_p2p_devdisc_resp(pwdinfo, get_addr2_ptr(pframe), status, dialogToken);
|
||||
|
||||
|
||||
return (status == P2P_STATUS_SUCCESS) ? _TRUE : _FALSE;
|
||||
|
||||
}
|
||||
@ -5388,10 +5297,6 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
|
||||
#endif
|
||||
|
||||
} else if (role == P2P_ROLE_DISABLE) {
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (padapter->mlmepriv.p2p_reject_disable == _TRUE)
|
||||
return ret;
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
if (padapter->wdinfo.driver_interface == DRIVER_CFG80211)
|
||||
@ -5436,10 +5341,6 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
|
||||
/* Restore to initial setting. */
|
||||
update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
|
||||
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
rtw_reset_widi_info(padapter);
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
/* For WiDi purpose. */
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
pwdinfo->driver_interface = DRIVER_CFG80211;
|
||||
|
||||
@ -548,13 +548,6 @@ void rtw_rson_scan_cmd_hdl(_adapter *padapter, int op)
|
||||
if (rtw_to_roam(padapter) != 0) {
|
||||
if (rtw_dec_to_roam(padapter) == 0) {
|
||||
rtw_set_to_roam(padapter, 0);
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) {
|
||||
_rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN);
|
||||
intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0);
|
||||
RTW_INFO("change to widi listen\n");
|
||||
}
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
rtw_free_assoc_resources(padapter, _TRUE);
|
||||
rtw_indicate_disconnect(padapter, 0, _FALSE);
|
||||
} else
|
||||
|
||||
@ -3062,10 +3062,6 @@ void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
|
||||
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
#endif /* CONFIG_P2P */
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE)
|
||||
return;
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
_rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PACKAGE_NAME="realtek-rtl88xxau"
|
||||
PACKAGE_VERSION="5.6.4.2~20230501"
|
||||
PACKAGE_VERSION="5.6.4.2~20240509"
|
||||
CLEAN="'make' clean"
|
||||
BUILT_MODULE_NAME[0]=88XXau
|
||||
PROCS_NUM=`nproc`
|
||||
|
||||
394
hal/hal_com.c
394
hal/hal_com.c
@ -1075,6 +1075,8 @@ static VOID _ThreeOutPipeMapping(
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
static VOID _FourOutPipeMapping(
|
||||
IN PADAPTER pAdapter,
|
||||
IN BOOLEAN bWIFICfg
|
||||
@ -1082,41 +1084,40 @@ static VOID _FourOutPipeMapping(
|
||||
{
|
||||
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
|
||||
|
||||
if (bWIFICfg) { /* for WMM */
|
||||
if (bWIFICfg) {
|
||||
|
||||
/* BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA */
|
||||
/* { 1, 2, 1, 0, 0, 0, 0, 0, 0 }; */
|
||||
/* 0:H, 1:N, 2:L ,3:E */
|
||||
BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
|
||||
{ 1, 2, 1, 0, 0, 0, 0, 0, 0 };
|
||||
0:H, 1:N, 2:L ,3:E
|
||||
|
||||
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */
|
||||
pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];/* VI */
|
||||
pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];/* BE */
|
||||
pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[1];/* BK */
|
||||
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];// VO
|
||||
pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];// VI
|
||||
pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];// BE
|
||||
pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[1];// BK
|
||||
|
||||
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0];/* BCN */
|
||||
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0];/* MGT */
|
||||
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[3];/* HIGH */
|
||||
pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */
|
||||
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0];// BCN
|
||||
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0];// MGT
|
||||
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[3];// HIGH
|
||||
pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];// TXCMD
|
||||
|
||||
} else { /* typical setting */
|
||||
} else {
|
||||
|
||||
BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA
|
||||
{ 2, 2, 1, 0, 0, 0, 0, 0, 0 };
|
||||
0:H, 1:N, 2:L
|
||||
|
||||
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];// VO
|
||||
pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];// VI
|
||||
pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];// BE
|
||||
pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[2];// BK
|
||||
|
||||
/* BK, BE, VI, VO, BCN, CMD,MGT,HIGH,HCCA */
|
||||
/* { 2, 2, 1, 0, 0, 0, 0, 0, 0 }; */
|
||||
/* 0:H, 1:N, 2:L */
|
||||
|
||||
pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */
|
||||
pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];/* VI */
|
||||
pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];/* BE */
|
||||
pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[2];/* BK */
|
||||
|
||||
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0];/* BCN */
|
||||
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0];/* MGT */
|
||||
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[3];/* HIGH */
|
||||
pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */
|
||||
pdvobjpriv->Queue2Pipe[4] = pdvobjpriv->RtOutPipe[0];// BCN
|
||||
pdvobjpriv->Queue2Pipe[5] = pdvobjpriv->RtOutPipe[0];// MGT
|
||||
pdvobjpriv->Queue2Pipe[6] = pdvobjpriv->RtOutPipe[3];// HIGH
|
||||
pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];// TXCMD
|
||||
}
|
||||
|
||||
}
|
||||
} */
|
||||
BOOLEAN
|
||||
Hal_MappingOutPipe(
|
||||
IN PADAPTER pAdapter,
|
||||
@ -6291,9 +6292,6 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
|
||||
#ifdef CONFIG_WFD
|
||||
u32 wfdielen = 0;
|
||||
#endif
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
/* for debug */
|
||||
u8 *dbgbuf = pframe;
|
||||
@ -6388,39 +6386,6 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
|
||||
/* Value: */
|
||||
wpsie[wpsielen++] = WPS_VERSION_1; /* Version 1.0 */
|
||||
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
/* Commented by Kurt */
|
||||
/* Appended WiDi info. only if we did issued_probereq_widi(), and then we saved ven. ext. in pmlmepriv->sa_ext. */
|
||||
if (_rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE
|
||||
|| pmlmepriv->num_p2p_sdt != 0) {
|
||||
/* Sec dev type */
|
||||
*(u16 *)(wpsie + wpsielen) = cpu_to_be16(WPS_ATTR_SEC_DEV_TYPE_LIST);
|
||||
wpsielen += 2;
|
||||
|
||||
/* Length: */
|
||||
*(u16 *)(wpsie + wpsielen) = cpu_to_be16(0x0008);
|
||||
wpsielen += 2;
|
||||
|
||||
/* Value: */
|
||||
/* Category ID */
|
||||
*(u16 *)(wpsie + wpsielen) = cpu_to_be16(WPS_PDT_CID_DISPLAYS);
|
||||
wpsielen += 2;
|
||||
|
||||
/* OUI */
|
||||
*(u32 *)(wpsie + wpsielen) = cpu_to_be32(INTEL_DEV_TYPE_OUI);
|
||||
wpsielen += 4;
|
||||
|
||||
*(u16 *)(wpsie + wpsielen) = cpu_to_be16(WPS_PDT_SCID_WIDI_CONSUMER_SINK);
|
||||
wpsielen += 2;
|
||||
|
||||
if (_rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == _FALSE) {
|
||||
/* Vendor Extension */
|
||||
_rtw_memcpy(wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN);
|
||||
wpsielen += L2SDTA_SERVICE_VE_LEN;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
/* WiFi Simple Config State */
|
||||
/* Type: */
|
||||
*(u16 *)(wpsie + wpsielen) = cpu_to_be16(WPS_ATTR_SIMPLE_CONF_STATE);
|
||||
@ -9636,12 +9601,6 @@ static void rtw_hal_wow_enable(_adapter *adapter)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
|
||||
/* Enable CPWM2 only. */
|
||||
res = rtw_hal_enable_cpwm2(adapter);
|
||||
if (res == _FAIL)
|
||||
RTW_PRINT("[WARNING] enable cpwm2 fail\n");
|
||||
#endif
|
||||
#ifdef CONFIG_GPIO_WAKEUP
|
||||
rtw_hal_switch_gpio_wl_ctrl(adapter, WAKEUP_GPIO_IDX, _TRUE);
|
||||
#endif
|
||||
@ -10212,6 +10171,7 @@ static u8 _rtw_mi_assoc_if_num(_adapter *adapter)
|
||||
return mi_iface_num;
|
||||
}
|
||||
|
||||
/*
|
||||
static _adapter *_rtw_search_sta_iface(_adapter *adapter)
|
||||
{
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
|
||||
@ -10229,9 +10189,11 @@ static _adapter *_rtw_search_sta_iface(_adapter *adapter)
|
||||
}
|
||||
}
|
||||
return sta_iface;
|
||||
}
|
||||
}*/
|
||||
|
||||
/*
|
||||
#ifdef CONFIG_AP_MODE
|
||||
static _adapter *_rtw_search_ap_iface(_adapter *adapter)
|
||||
static _adapter *_rtw_search_ap_iface(_adapter *adapter)
|
||||
{
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
|
||||
_adapter *iface = NULL;
|
||||
@ -10248,6 +10210,7 @@ static _adapter *_rtw_search_ap_iface(_adapter *adapter)
|
||||
return ap_iface;
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_CUSTOMER01_SMART_ANTENNA
|
||||
void rtw_hal_set_pathb_phase(_adapter *adapter, u8 phase_idx)
|
||||
@ -12604,61 +12567,7 @@ int hal_efuse_macaddr_offset(_adapter *adapter)
|
||||
interface_type = rtw_get_intf_type(adapter);
|
||||
|
||||
switch (rtw_get_chip_type(adapter)) {
|
||||
#ifdef CONFIG_RTL8723B
|
||||
case RTL8723B:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723BU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723BS;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723BE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8703B
|
||||
case RTL8703B:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8703BU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8703BS;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8723D
|
||||
case RTL8723D:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723DU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723DS;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8723DE;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8188E
|
||||
case RTL8188E:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_88EU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_88ES;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_88EE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188F
|
||||
case RTL8188F:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8188FU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8188FS;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188GTV
|
||||
case RTL8188GTV:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8188GTVU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8188GTVS;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8812A
|
||||
case RTL8812:
|
||||
if (interface_type == RTW_USB)
|
||||
@ -12677,16 +12586,6 @@ int hal_efuse_macaddr_offset(_adapter *adapter)
|
||||
addr_offset = EEPROM_MAC_ADDR_8821AE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8192E
|
||||
case RTL8192E:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192EU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192ES;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192EE;
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8814A
|
||||
case RTL8814A:
|
||||
if (interface_type == RTW_USB)
|
||||
@ -12696,46 +12595,6 @@ int hal_efuse_macaddr_offset(_adapter *adapter)
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8822B
|
||||
case RTL8822B:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8822BU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8822BS;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8822BE;
|
||||
break;
|
||||
#endif /* CONFIG_RTL8822B */
|
||||
|
||||
#ifdef CONFIG_RTL8821C
|
||||
case RTL8821C:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8821CU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8821CS;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8821CE;
|
||||
break;
|
||||
#endif /* CONFIG_RTL8821C */
|
||||
|
||||
#ifdef CONFIG_RTL8710B
|
||||
case RTL8710B:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8710B;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_RTL8192F
|
||||
case RTL8192F:
|
||||
if (interface_type == RTW_USB)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192FU;
|
||||
else if (interface_type == RTW_SDIO)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192FS;
|
||||
else if (interface_type == RTW_PCIE)
|
||||
addr_offset = EEPROM_MAC_ADDR_8192FE;
|
||||
break;
|
||||
#endif /* CONFIG_RTL8192F */
|
||||
|
||||
}
|
||||
|
||||
if (addr_offset == -1) {
|
||||
@ -12833,9 +12692,6 @@ int hal_config_macaddr(_adapter *adapter, bool autoload_fail)
|
||||
int addr_offset = hal_efuse_macaddr_offset(adapter);
|
||||
u8 *hw_addr = NULL;
|
||||
int ret = _SUCCESS;
|
||||
#if defined(CONFIG_RTL8822B) && defined(CONFIG_USB_HCI)
|
||||
u8 ft_mac_addr[ETH_ALEN] = {0x00, 0xff, 0xff, 0xff, 0xff, 0xff}; /* FT USB2 for 8822B */
|
||||
#endif
|
||||
|
||||
if (autoload_fail)
|
||||
goto bypass_hw_pg;
|
||||
@ -12855,11 +12711,6 @@ int hal_config_macaddr(_adapter *adapter, bool autoload_fail)
|
||||
hw_addr = addr;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_RTL8822B) && defined(CONFIG_USB_HCI)
|
||||
if (_rtw_memcmp(hw_addr, ft_mac_addr, ETH_ALEN))
|
||||
hw_addr[0] = 0xff;
|
||||
#endif
|
||||
|
||||
/* check hw pg data */
|
||||
if (hw_addr && rtw_check_invalid_mac_address(hw_addr, _TRUE) == _FALSE) {
|
||||
_rtw_memcpy(hal_data->EEPROMMACAddr, hw_addr, ETH_ALEN);
|
||||
@ -12914,75 +12765,9 @@ void rtw_bb_rf_gain_offset(_adapter *padapter)
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_RTL8723B)
|
||||
if (value & BIT4 && (registry_par->RegPwrTrimEnable == 1)) {
|
||||
RTW_INFO("Offset RF Gain.\n");
|
||||
RTW_INFO("Offset RF Gain. pHalData->EEPROMRFGainVal=0x%x\n", pHalData->EEPROMRFGainVal);
|
||||
|
||||
if (pHalData->EEPROMRFGainVal != 0xff) {
|
||||
|
||||
if (pHalData->ant_path == RF_PATH_A)
|
||||
GainValue = (pHalData->EEPROMRFGainVal & 0x0f);
|
||||
|
||||
else
|
||||
GainValue = (pHalData->EEPROMRFGainVal & 0xf0) >> 4;
|
||||
RTW_INFO("Ant PATH_%d GainValue Offset = 0x%x\n", (pHalData->ant_path == RF_PATH_A) ? (RF_PATH_A) : (RF_PATH_B), GainValue);
|
||||
|
||||
for (i = 0; i < ArrayLen; i += 2) {
|
||||
/* RTW_INFO("ArrayLen in =%d ,Array 1 =0x%x ,Array2 =0x%x\n",i,Array[i],Array[i]+1); */
|
||||
v1 = Array[i];
|
||||
v2 = Array[i + 1];
|
||||
if (v1 == GainValue) {
|
||||
RTW_INFO("Offset RF Gain. got v1 =0x%x ,v2 =0x%x\n", v1, v2);
|
||||
target = v2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
RTW_INFO("pHalData->EEPROMRFGainVal=0x%x ,Gain offset Target Value=0x%x\n", pHalData->EEPROMRFGainVal, target);
|
||||
|
||||
res = rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f, 0xffffffff);
|
||||
RTW_INFO("Offset RF Gain. before reg 0x7f=0x%08x\n", res);
|
||||
phy_set_rf_reg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, BIT18 | BIT17 | BIT16 | BIT15, target);
|
||||
res = rtw_hal_read_rfreg(padapter, RF_PATH_A, 0x7f, 0xffffffff);
|
||||
|
||||
RTW_INFO("Offset RF Gain. After reg 0x7f=0x%08x\n", res);
|
||||
|
||||
} else
|
||||
|
||||
RTW_INFO("Offset RF Gain. pHalData->EEPROMRFGainVal=0x%x != 0xff, didn't run Kfree\n", pHalData->EEPROMRFGainVal);
|
||||
} else
|
||||
RTW_INFO("Using the default RF gain.\n");
|
||||
|
||||
#elif defined(CONFIG_RTL8188E)
|
||||
if (value & BIT4 && (registry_par->RegPwrTrimEnable == 1)) {
|
||||
RTW_INFO("8188ES Offset RF Gain.\n");
|
||||
RTW_INFO("8188ES Offset RF Gain. EEPROMRFGainVal=0x%x\n",
|
||||
pHalData->EEPROMRFGainVal);
|
||||
|
||||
if (pHalData->EEPROMRFGainVal != 0xff) {
|
||||
res = rtw_hal_read_rfreg(padapter, RF_PATH_A,
|
||||
REG_RF_BB_GAIN_OFFSET, 0xffffffff);
|
||||
|
||||
RTW_INFO("Offset RF Gain. reg 0x55=0x%x\n", res);
|
||||
res &= 0xfff87fff;
|
||||
|
||||
res |= (pHalData->EEPROMRFGainVal & 0x0f) << 15;
|
||||
RTW_INFO("Offset RF Gain. res=0x%x\n", res);
|
||||
|
||||
rtw_hal_write_rfreg(padapter, RF_PATH_A,
|
||||
REG_RF_BB_GAIN_OFFSET,
|
||||
RF_GAIN_OFFSET_MASK, res);
|
||||
} else {
|
||||
RTW_INFO("Offset RF Gain. EEPROMRFGainVal=0x%x == 0xff, didn't run Kfree\n",
|
||||
pHalData->EEPROMRFGainVal);
|
||||
}
|
||||
} else
|
||||
RTW_INFO("Using the default RF gain.\n");
|
||||
#else
|
||||
/* TODO: call this when channel switch */
|
||||
if (kfree_data->flag & KFREE_FLAG_ON)
|
||||
rtw_rf_apply_tx_gain_offset(padapter, 6); /* input ch6 to select BB_GAIN_2G */
|
||||
#endif
|
||||
|
||||
}
|
||||
#endif /*CONFIG_RF_POWER_TRIM */
|
||||
@ -13710,14 +13495,9 @@ u8 rtw_get_current_tx_sgi(_adapter *padapter, struct sta_info *psta)
|
||||
return curr_tx_sgi;
|
||||
|
||||
if (padapter->fix_rate == 0xff) {
|
||||
#if defined(CONFIG_RTL8188E)
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
curr_tx_sgi = hal_data->odmpriv.ra_info[psta->cmn.mac_id].rate_sgi;
|
||||
#endif /* (RATE_ADAPTIVE_SUPPORT == 1)*/
|
||||
#else
|
||||
ra_info = &psta->cmn.ra_info;
|
||||
curr_tx_sgi = ((ra_info->curr_tx_rate) & 0x80) >> 7;
|
||||
#endif
|
||||
|
||||
} else {
|
||||
curr_tx_sgi = ((padapter->fix_rate) & 0x80) >> 7;
|
||||
}
|
||||
@ -13735,14 +13515,9 @@ u8 rtw_get_current_tx_rate(_adapter *padapter, struct sta_info *psta)
|
||||
return rate_id;
|
||||
|
||||
if (padapter->fix_rate == 0xff) {
|
||||
#if defined(CONFIG_RTL8188E)
|
||||
#if (RATE_ADAPTIVE_SUPPORT == 1)
|
||||
rate_id = hal_data->odmpriv.ra_info[psta->cmn.mac_id].decision_rate;
|
||||
#endif /* (RATE_ADAPTIVE_SUPPORT == 1)*/
|
||||
#else
|
||||
ra_info = &psta->cmn.ra_info;
|
||||
rate_id = ra_info->curr_tx_rate & 0x7f;
|
||||
#endif
|
||||
|
||||
} else {
|
||||
rate_id = padapter->fix_rate & 0x7f;
|
||||
}
|
||||
@ -13826,28 +13601,14 @@ void hal_set_crystal_cap(_adapter *adapter, u8 crystal_cap)
|
||||
crystal_cap = crystal_cap & 0x3F;
|
||||
|
||||
switch (rtw_get_chip_type(adapter)) {
|
||||
#if defined(CONFIG_RTL8188E) || defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8188GTV)
|
||||
case RTL8188E:
|
||||
case RTL8188F:
|
||||
case RTL8188GTV:
|
||||
/* write 0x24[16:11] = 0x24[22:17] = CrystalCap */
|
||||
phy_set_bb_reg(adapter, REG_AFE_XTAL_CTRL, 0x007FF800, (crystal_cap | (crystal_cap << 6)));
|
||||
break;
|
||||
#endif
|
||||
#if defined(CONFIG_RTL8812A)
|
||||
case RTL8812:
|
||||
/* write 0x2C[30:25] = 0x2C[24:19] = CrystalCap */
|
||||
phy_set_bb_reg(adapter, REG_MAC_PHY_CTRL, 0x7FF80000, (crystal_cap | (crystal_cap << 6)));
|
||||
break;
|
||||
#endif
|
||||
#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) || \
|
||||
defined(CONFIG_RTL8723D) || defined(CONFIG_RTL8821A) || \
|
||||
defined(CONFIG_RTL8192E)
|
||||
case RTL8723B:
|
||||
case RTL8703B:
|
||||
case RTL8723D:
|
||||
#if defined(CONFIG_RTL8821A)
|
||||
case RTL8821:
|
||||
case RTL8192E:
|
||||
/* write 0x2C[23:18] = 0x2C[17:12] = CrystalCap */
|
||||
phy_set_bb_reg(adapter, REG_MAC_PHY_CTRL, 0x00FFF000, (crystal_cap | (crystal_cap << 6)));
|
||||
break;
|
||||
@ -13857,25 +13618,6 @@ void hal_set_crystal_cap(_adapter *adapter, u8 crystal_cap)
|
||||
/* write 0x2C[26:21] = 0x2C[20:15] = CrystalCap*/
|
||||
phy_set_bb_reg(adapter, REG_MAC_PHY_CTRL, 0x07FF8000, (crystal_cap | (crystal_cap << 6)));
|
||||
break;
|
||||
#endif
|
||||
#if defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C) || defined(CONFIG_RTL8192F)
|
||||
|
||||
case RTL8822B:
|
||||
case RTL8821C:
|
||||
case RTL8192F:
|
||||
/* write 0x28[6:1] = 0x24[30:25] = CrystalCap */
|
||||
crystal_cap = crystal_cap & 0x3F;
|
||||
phy_set_bb_reg(adapter, REG_AFE_XTAL_CTRL, 0x7E000000, crystal_cap);
|
||||
phy_set_bb_reg(adapter, REG_AFE_PLL_CTRL, 0x7E, crystal_cap);
|
||||
break;
|
||||
#endif
|
||||
#if defined(CONFIG_RTL8710B)
|
||||
case RTL8710B:
|
||||
/*Change by ylb 20160728, Becase 0x2C[23:12] is removed to syson 0x60[29:18] */
|
||||
/* 0x2C[23:18] = 0x2C[29:24] = CrystalCap //Xo:[29:24], Xi:[23:18]*/
|
||||
crystal_cap = crystal_cap & 0x3F;
|
||||
hal_set_syson_reg(adapter, REG_SYS_XTAL_CTRL0, 0x3FFC0000, (crystal_cap | (crystal_cap << 6)));
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
rtw_warn_on(1);
|
||||
@ -13890,36 +13632,6 @@ int hal_spec_init(_adapter *adapter)
|
||||
interface_type = rtw_get_intf_type(adapter);
|
||||
|
||||
switch (rtw_get_chip_type(adapter)) {
|
||||
#ifdef CONFIG_RTL8723B
|
||||
case RTL8723B:
|
||||
init_hal_spec_8723b(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8703B
|
||||
case RTL8703B:
|
||||
init_hal_spec_8703b(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8723D
|
||||
case RTL8723D:
|
||||
init_hal_spec_8723d(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188E
|
||||
case RTL8188E:
|
||||
init_hal_spec_8188e(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188F
|
||||
case RTL8188F:
|
||||
init_hal_spec_8188f(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8188GTV
|
||||
case RTL8188GTV:
|
||||
init_hal_spec_8188gtv(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8812A
|
||||
case RTL8812:
|
||||
init_hal_spec_8812a(adapter);
|
||||
@ -13930,36 +13642,11 @@ int hal_spec_init(_adapter *adapter)
|
||||
init_hal_spec_8821a(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8192E
|
||||
case RTL8192E:
|
||||
init_hal_spec_8192e(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8814A
|
||||
case RTL8814A:
|
||||
init_hal_spec_8814a(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8822B
|
||||
case RTL8822B:
|
||||
rtl8822b_init_hal_spec(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8821C
|
||||
case RTL8821C:
|
||||
init_hal_spec_rtl8821c(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8710B
|
||||
case RTL8710B:
|
||||
init_hal_spec_8710b(adapter);
|
||||
break;
|
||||
#endif
|
||||
#ifdef CONFIG_RTL8192F
|
||||
case RTL8192F:
|
||||
init_hal_spec_8192f(adapter);
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
RTW_ERR("%s: unknown chip_type:%u\n"
|
||||
@ -14296,10 +13983,6 @@ void hw_var_set_opmode_mbid(_adapter *Adapter, u8 mode)
|
||||
else
|
||||
rtw_hw_client_port_release(Adapter);
|
||||
#endif
|
||||
#if defined(CONFIG_RTL8192F)
|
||||
rtw_write16(Adapter, REG_WLAN_ACT_MASK_CTRL_1, rtw_read16(Adapter,
|
||||
REG_WLAN_ACT_MASK_CTRL_1) | EN_PORT_0_FUNCTION);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -14589,8 +14272,7 @@ void rtw_hal_switch_chnl_and_set_bw_offload(_adapter *adapter, u8 central_ch, u8
|
||||
#endif /* RTW_CHANNEL_SWITCH_OFFLOAD */
|
||||
|
||||
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8812A) ||\
|
||||
defined(CONFIG_RTL8192F) || defined(CONFIG_RTL8192E) ||\
|
||||
defined(CONFIG_RTL8822B) ||defined(CONFIG_RTL8821A)
|
||||
defined(CONFIG_RTL8821A)
|
||||
u8 phy_get_current_tx_num(
|
||||
IN PADAPTER pAdapter,
|
||||
IN u8 Rate
|
||||
|
||||
@ -93,7 +93,6 @@ struct rtw_halmac_bcn_ctrl {
|
||||
u8 tsf_update:1; /* Update TSF when beacon or probe response */
|
||||
u8 enable_bcn:1; /* Enable beacon related functions */
|
||||
u8 rxbcn_rpt:1; /* Enable RXBCNOK report */
|
||||
u8 p2p_ctwin:1; /* Enable P2P CTN WINDOWS function */
|
||||
u8 p2p_bcn_area:1; /* Enable P2P BCN area on function */
|
||||
};
|
||||
|
||||
|
||||
222
hal/hal_intf.c
222
hal/hal_intf.c
@ -20,20 +20,9 @@
|
||||
|
||||
const u32 _chip_type_to_odm_ic_type[] = {
|
||||
0,
|
||||
ODM_RTL8188E,
|
||||
ODM_RTL8192E,
|
||||
ODM_RTL8812,
|
||||
ODM_RTL8821,
|
||||
ODM_RTL8723B,
|
||||
ODM_RTL8814A,
|
||||
ODM_RTL8703B,
|
||||
ODM_RTL8188F,
|
||||
ODM_RTL8188F,
|
||||
ODM_RTL8822B,
|
||||
ODM_RTL8723D,
|
||||
ODM_RTL8821C,
|
||||
ODM_RTL8710B,
|
||||
ODM_RTL8192F,
|
||||
0,
|
||||
};
|
||||
|
||||
@ -322,11 +311,6 @@ uint rtw_hal_init(_adapter *padapter)
|
||||
#ifdef CONFIG_SUPPORT_MULTI_BCN
|
||||
rtw_ap_multi_bcn_cfg(padapter);
|
||||
#endif
|
||||
#if (RTL8822B_SUPPORT == 1) || (RTL8192F_SUPPORT == 1)
|
||||
#ifdef CONFIG_DYNAMIC_SOML
|
||||
rtw_dyn_soml_config(padapter);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_TDMADIG
|
||||
rtw_phydm_tdmadig(padapter, TDMADIG_INIT);
|
||||
#endif/*CONFIG_TDMADIG*/
|
||||
@ -374,11 +358,6 @@ uint rtw_hal_init(_adapter *padapter)
|
||||
rtw_ap_multi_bcn_cfg(padapter);
|
||||
#endif
|
||||
|
||||
#if (RTL8822B_SUPPORT == 1) || (RTL8192F_SUPPORT == 1)
|
||||
#ifdef CONFIG_DYNAMIC_SOML
|
||||
rtw_dyn_soml_config(padapter);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_TDMADIG
|
||||
rtw_phydm_tdmadig(padapter, TDMADIG_INIT);
|
||||
#endif/*CONFIG_TDMADIG*/
|
||||
@ -391,7 +370,6 @@ uint rtw_hal_init(_adapter *padapter)
|
||||
RTW_ERR("%s: fail\n", __func__);
|
||||
}
|
||||
|
||||
|
||||
return status;
|
||||
|
||||
}
|
||||
@ -411,7 +389,6 @@ uint rtw_hal_deinit(_adapter *padapter)
|
||||
} else
|
||||
RTW_INFO("\n rtw_hal_deinit: hal_init fail\n");
|
||||
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -443,23 +420,6 @@ void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID p
|
||||
padapter->hal_func.GetHalODMVarHandler(padapter, eVariable, pValue1, pValue2);
|
||||
}
|
||||