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: Remove the wrapper around memcmp()

Browse source 
The tricky part here is that the wrapper, _rtw_memcmp(), returns true if the
two arguments are equal, whereas memcmp() returns false in that case.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-12-17 13:31:01 -06:00
parent 999a777041
commit a010d15b64
35 changed files with 881 additions and 890 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hal/hal_btcoex.c
View file

@ -503,12 +503,12 @@ static u32 _halbtcoutsrc_GetWifiLinkStatus(PADAPTER padapter)
if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE) == true) {
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
if (true == bp2p)
if (bp2p)
portConnectedStatus |= WIFI_P2P_GO_CONNECTED;
else
portConnectedStatus |= WIFI_AP_CONNECTED;
} else {
if (true == bp2p)
if (bp2p)
portConnectedStatus |= WIFI_P2P_GC_CONNECTED;
else
portConnectedStatus |= WIFI_STA_CONNECTED;
@ -1234,7 +1234,7 @@ u8 halbtcoutsrc_UnderIps(PBTC_COEXIST pBtCoexist)
pwrpriv = &padapter->dvobj->pwrctl_priv;
bMacPwrCtrlOn = false;
if ((true == pwrpriv->bips_processing)
if ((pwrpriv->bips_processing)
&& (IPS_NONE != pwrpriv->ips_mode_req)
)
return true;

46
hal/hal_com.c
View file

@ -1772,7 +1772,7 @@ s32 rtw_hal_customer_str_write(_adapter *adapter, const u8 *cs)
_enter_critical_mutex(&dvobj->customer_str_mutex, NULL);
dvobj->customer_str_sctx = NULL;
if (sctx.status == RTW_SCTX_DONE_SUCCESS) {
if (_rtw_memcmp(cs, dvobj->customer_str, RTW_CUSTOMER_STR_LEN) != true) {
if (memcmp(cs, dvobj->customer_str, RTW_CUSTOMER_STR_LEN)) {
RTW_WARN("%s read back check fail\n", __func__);
RTW_INFO_DUMP("write req: ", cs, RTW_CUSTOMER_STR_LEN);
RTW_INFO_DUMP("read back: ", dvobj->customer_str, RTW_CUSTOMER_STR_LEN);
@ -2084,7 +2084,7 @@ static u8 _rtw_mbid_cam_search_by_macaddr(_adapter *adapter, u8 *mac_addr)
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
for (i = 0; i < TOTAL_MBID_CAM_NUM; i++) {
if (mac_addr && _rtw_memcmp(dvobj->mbid_cam_cache[i].mac_addr, mac_addr, ETH_ALEN) == true) {
if (mac_addr && !memcmp(dvobj->mbid_cam_cache[i].mac_addr, mac_addr, ETH_ALEN) == true) {
cam_id = i;
break;
}
@ -3248,7 +3248,7 @@ static u8 rtw_hal_pause_rx_dma(_adapter *adapter)
do {
if ((rtw_read32(adapter, REG_RXPKT_NUM) & RXDMA_IDLE)) {
/* stop interface before leave */
if (true == hal->usb_intf_start) {
if (hal->usb_intf_start) {
rtw_intf_stop(adapter);
RTW_ENABLE_FUNC(adapter, DF_RX_BIT);
RTW_ENABLE_FUNC(adapter, DF_TX_BIT);
@ -3807,7 +3807,7 @@ static u8 rtw_hal_set_remote_wake_ctrl_cmd(_adapter *adapter, u8 enable)
#endif
#ifdef CONFIG_P2P_WOWLAN
if (true == ppwrpriv->wowlan_p2p_mode) {
if (ppwrpriv->wowlan_p2p_mode) {
RTW_INFO("P2P OFFLOAD ENABLE\n");
SET_H2CCMD_REMOTE_WAKE_CTRL_P2P_OFFLAD_EN(u1H2CRemoteWakeCtrlParm, 1);
} else {
@ -4575,7 +4575,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
#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
if (!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);
@ -4597,7 +4597,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
*(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) {
if (!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;
@ -5697,9 +5697,9 @@ static void rtw_hal_append_tkip_mic(PADAPTER padapter,
psta = rtw_get_stainfo(&padapter->stapriv,
get_my_bssid(&(pmlmeinfo->network)));
if (psta != NULL) {
res = _rtw_memcmp(&psta->dot11tkiptxmickey.skey[0],
res = !memcmp(&psta->dot11tkiptxmickey.skey[0],
null_key, 16);
if (res == true)
if (res)
RTW_INFO("%s(): STA dot11tkiptxmickey==0\n", __func__);
rtw_secmicsetkey(&micdata, &psta->dot11tkiptxmickey.skey[0]);
}
@ -7911,7 +7911,7 @@ void rtw_hal_set_fw_rsvd_page(_adapter *adapter, bool finished)
#endif /* CONFIG_WOWLAN */
#ifdef CONFIG_P2P_WOWLAN
if (true == pwrctl->wowlan_p2p_mode) {
if (pwrctl->wowlan_p2p_mode) {
rtw_hal_set_p2p_wow_fw_rsvd_page(adapter, ReservedPagePacket,
BufIndex, TxDescLen, PageSize,
&TotalPageNum, &TotalPacketLen, &RsvdPageLoc);
@ -7985,7 +7985,7 @@ download_page:
#endif /* CONFIG_PNO_SUPPORT */
}
#ifdef CONFIG_P2P_WOWLAN
if (true == pwrctl->wowlan_p2p_mode)
if (pwrctl->wowlan_p2p_mode)
rtw_hal_set_FwP2PRsvdPage_cmd(adapter, &RsvdPageLoc);
#endif /* CONFIG_P2P_WOWLAN */
return;
@ -9019,9 +9019,9 @@ void rtw_dump_rx_dframe_info(_adapter *padapter, void *sel)
if (psta) {
psta_dframe_info = &psta->sta_dframe_info;
if ((_rtw_memcmp(psta->hwaddr, bc_addr, 6) != true)
&& (_rtw_memcmp(psta->hwaddr, null_addr, 6) != true)
&& (_rtw_memcmp(psta->hwaddr, adapter_mac_addr(padapter), 6) != true)) {
if ((memcmp(psta->hwaddr, bc_addr, 6))
&& (memcmp(psta->hwaddr, null_addr, 6))
&& (memcmp(psta->hwaddr, adapter_mac_addr(padapter), 6))) {
isCCKrate = (psta_dframe_info->sta_data_rate <= DESC_RATE11M) ? true : false;
@ -9114,7 +9114,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe)
if (psta) {
psta_dframe_info = &psta->sta_dframe_info;
/*RTW_INFO("=>%s psta->hwaddr="MAC_FMT" !\n", __func__, MAC_ARG(psta->hwaddr));*/
if ((_rtw_memcmp(psta->hwaddr, bc_addr, ETH_ALEN) != true) || (padapter->registrypriv.mp_mode == 1)) {
if ((memcmp(psta->hwaddr, bc_addr, ETH_ALEN)) || (padapter->registrypriv.mp_mode == 1)) {
psta_dframe_info->sta_data_rate = pattrib->data_rate;
psta_dframe_info->sta_sgi = pattrib->sgi;
psta_dframe_info->sta_bw_mode = pattrib->bw;
@ -10099,7 +10099,7 @@ void update_IOT_info(_adapter *padapter)
#ifdef CONFIG_AUTO_CHNL_SEL_NHM
void rtw_acs_start(_adapter *padapter, bool bStart)
{
if (true == bStart) {
if (bStart) {
ACS_OP acs_op = ACS_INIT;
rtw_hal_set_odm_var(padapter, HAL_ODM_AUTO_CHNL_SEL, &acs_op, true);
@ -10513,37 +10513,37 @@ static void rtw_dump_phy_cap_by_hal(void *sel, _adapter *adapter)
/* STBC */
rtw_hal_get_def_var(adapter, HAL_DEF_TX_STBC, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] STBC Tx : %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] STBC Tx : %s\n", (phy_cap) ? "Supported" : "N/A");
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_RX_STBC, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] STBC Rx : %s\n\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] STBC Rx : %s\n\n", (phy_cap) ? "Supported" : "N/A");
/* LDPC support */
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_TX_LDPC, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] LDPC Tx : %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] LDPC Tx : %s\n", (phy_cap) ? "Supported" : "N/A");
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] LDPC Rx : %s\n\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] LDPC Rx : %s\n\n", (phy_cap) ? "Supported" : "N/A");
#ifdef CONFIG_BEAMFORMING
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] Beamformer: %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] Beamformer: %s\n", (phy_cap) ? "Supported" : "N/A");
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMEE, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] Beamformee: %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] Beamformee: %s\n", (phy_cap) ? "Supported" : "N/A");
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_VHT_MU_BEAMFORMER, &phy_cap);
RTW_PRINT_SEL(sel, "[HAL] VHT MU Beamformer: %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] VHT MU Beamformer: %s\n", (phy_cap) ? "Supported" : "N/A");
phy_cap = false;
rtw_hal_get_def_var(adapter, HAL_DEF_VHT_MU_BEAMFORMEE, &phy_cap);
RTW_PRINT_SEL(sel, "[HAL] VHT MU Beamformee: %s\n", (true == phy_cap) ? "Supported" : "N/A");
RTW_PRINT_SEL(sel, "[HAL] VHT MU Beamformee: %s\n", (phy_cap) ? "Supported" : "N/A");
#endif
}
#endif

2
hal/phydm/phydm_interface.c
View file

@ -216,7 +216,7 @@ s32 odm_compare_memory(
u32 length
)
{
return _rtw_memcmp(p_buf1, p_buf2, length);
return !memcmp(p_buf1, p_buf2, length);
}
/*

2
hal/phydm/phydm_rainfo.c
View file

@ -1599,7 +1599,7 @@ odm_refresh_rate_adaptive_mask_ce(
/**/
}
#else
if (true == odm_ra_state_check(p_dm_odm, p_entry->rssi_stat.undecorated_smoothed_pwdb, false, &p_entry->rssi_level)) {
if (odm_ra_state_check(p_dm_odm, p_entry->rssi_stat.undecorated_smoothed_pwdb, false, &p_entry->rssi_level)) {
ODM_RT_TRACE(p_dm_odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("RSSI:%d, RSSI_LEVEL:%d\n", p_entry->rssi_stat.undecorated_smoothed_pwdb, p_entry->rssi_level));
/* printk("RSSI:%d, RSSI_LEVEL:%d\n", pstat->rssi_stat.undecorated_smoothed_pwdb, pstat->rssi_level); */
rtw_hal_update_ra_mask(p_entry, p_entry->rssi_level, false);

2
hal/rtl8188e_dm.c
View file

@ -79,7 +79,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
if (tmp1byte & HAL_8188E_HW_GPIO_WPS_BIT)
bPbcPressed = true;
if (true == bPbcPressed) {
if (bPbcPressed) {
/* Here we only set bPbcPressed to true */
/* After trigger PBC, the variable will be set to false */
RTW_INFO("CheckPbcGPIO - PBC is pressed\n");

2
hal/rtl8188e_hal_init.c
View file

@ -1335,7 +1335,7 @@ ReadEFuseByIC(
exit:
#ifdef DBG_IOL_READ_EFUSE_MAP
if (_rtw_memcmp(logical_map, pHalData->efuse_eeprom_data, 0x130) == false) {
if (!memcmp(logical_map, pHalData->efuse_eeprom_data, 0x130) == false) {
int i;
RTW_INFO("%s compare first 0x130 byte fail\n", __func__);
for (i = 0; i < 512; i++) {

4
hal/rtl8188eu_xmit.c
View file

@ -105,7 +105,7 @@ void rtl8188e_fill_fake_txdesc(
ptxdesc->txdw3 |= cpu_to_le32((8 << 28)); /* set bit3 to 1. Suugested by TimChen. 2009.12.29. */
}
if (true == IsBTQosNull) {
if (IsBTQosNull) {
ptxdesc->txdw2 |= cpu_to_le32(BIT(23)); /* BT NULL */
}
@ -115,7 +115,7 @@ void rtl8188e_fill_fake_txdesc(
/* */
/* Encrypt the data frame if under security mode excepct null data. Suggested by CCW. */
/* */
if (true == bDataFrame) {
if (bDataFrame) {
u32 EncAlg;
EncAlg = padapter->securitypriv.dot11PrivacyAlgrthm;