mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-09 14:53:05 +00:00
rtl8188eu: Replace wrapper for memcpy
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
120368c717
commit
529328fd3d
30 changed files with 921 additions and 927 deletions
|
|
@ -138,7 +138,7 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
|
|||
u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source,
|
||||
unsigned int *frlen)
|
||||
{
|
||||
_rtw_memcpy((void *)pbuf, (void *)source, len);
|
||||
memcpy((void *)pbuf, (void *)source, len);
|
||||
*frlen = *frlen + len;
|
||||
return (pbuf + len);
|
||||
}
|
||||
|
|
@ -159,7 +159,7 @@ u8 *rtw_set_ie
|
|||
*(pbuf + 1) = (u8)len;
|
||||
|
||||
if (len > 0)
|
||||
_rtw_memcpy((void *)(pbuf + 2), (void *)source, len);
|
||||
memcpy((void *)(pbuf + 2), (void *)source, len);
|
||||
|
||||
*frlen = *frlen + (len + 2);
|
||||
|
||||
|
|
@ -290,7 +290,7 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, u
|
|||
target_ie = &in_ie[cnt];
|
||||
|
||||
if(ie)
|
||||
_rtw_memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
|
||||
memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
|
||||
|
||||
if(ielen)
|
||||
*ielen = in_ie[cnt+1]+2;
|
||||
|
|
@ -339,8 +339,8 @@ int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 o
|
|||
u8 *remain_ies = target_ie + target_ielen;
|
||||
uint remain_len = search_len - (remain_ies - start);
|
||||
|
||||
_rtw_memcpy(buf, remain_ies, remain_len);
|
||||
_rtw_memcpy(target_ie, buf, remain_len);
|
||||
memcpy(buf, remain_ies, remain_len);
|
||||
memcpy(target_ie, buf, remain_len);
|
||||
*ies_len = *ies_len - target_ielen;
|
||||
ret = _SUCCESS;
|
||||
|
||||
|
|
@ -363,22 +363,22 @@ void rtw_set_supported_rate(u8* SupportedRates, uint mode)
|
|||
switch (mode)
|
||||
{
|
||||
case WIRELESS_11B:
|
||||
_rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
|
||||
memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
|
||||
break;
|
||||
|
||||
case WIRELESS_11G:
|
||||
case WIRELESS_11A:
|
||||
case WIRELESS_11_5N:
|
||||
case WIRELESS_11A_5N://Todo: no basic rate for ofdm ?
|
||||
_rtw_memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
|
||||
memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
|
||||
break;
|
||||
|
||||
case WIRELESS_11BG:
|
||||
case WIRELESS_11G_24N:
|
||||
case WIRELESS_11_24N:
|
||||
case WIRELESS_11BG_24N:
|
||||
_rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
|
||||
_rtw_memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
|
||||
memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
|
||||
memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
|
||||
break;
|
||||
|
||||
}
|
||||
|
|
@ -776,7 +776,7 @@ int rtw_get_wapi_ie(u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len)
|
|||
_rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==true))
|
||||
{
|
||||
if (wapi_ie) {
|
||||
_rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
|
||||
for(i=0;i<(in_ie[cnt+1]+2);i=i+8){
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",
|
||||
|
|
@ -824,7 +824,7 @@ int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16
|
|||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n rtw_get_wpa_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
|
||||
|
||||
if (wpa_ie) {
|
||||
_rtw_memcpy(wpa_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
memcpy(wpa_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
|
||||
for(i=0;i<(in_ie[cnt+1]+2);i=i+8){
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",
|
||||
|
|
@ -843,7 +843,7 @@ int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16
|
|||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n get_rsn_ie: sec_idx=%d in_ie[cnt+1]+2=%d\n",sec_idx,in_ie[cnt+1]+2));
|
||||
|
||||
if (rsn_ie) {
|
||||
_rtw_memcpy(rsn_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
memcpy(rsn_ie, &in_ie[cnt],in_ie[cnt+1]+2);
|
||||
|
||||
for(i=0;i<(in_ie[cnt+1]+2);i=i+8){
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",
|
||||
|
|
@ -941,7 +941,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
|
|||
wpsie_ptr = &in_ie[cnt];
|
||||
|
||||
if(wps_ie)
|
||||
_rtw_memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
|
||||
memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
|
||||
|
||||
if(wps_ielen)
|
||||
*wps_ielen = in_ie[cnt+1]+2;
|
||||
|
|
@ -1001,7 +1001,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_att
|
|||
target_attr_ptr = attr_ptr;
|
||||
|
||||
if(buf_attr)
|
||||
_rtw_memcpy(buf_attr, attr_ptr, attr_len);
|
||||
memcpy(buf_attr, attr_ptr, attr_len);
|
||||
|
||||
if(len_attr)
|
||||
*len_attr = attr_len;
|
||||
|
|
@ -1041,7 +1041,7 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8
|
|||
if(attr_ptr && attr_len)
|
||||
{
|
||||
if(buf_content)
|
||||
_rtw_memcpy(buf_content, attr_ptr+4, attr_len-4);
|
||||
memcpy(buf_content, attr_ptr+4, attr_len-4);
|
||||
|
||||
if(len_content)
|
||||
*len_content = attr_len-4;
|
||||
|
|
@ -1327,11 +1327,11 @@ void rtw_macaddr_cfg(u8 *mac_addr)
|
|||
{
|
||||
mac[jj] = key_2char2num(rtw_initmac[kk], rtw_initmac[kk+ 1]);
|
||||
}
|
||||
_rtw_memcpy(mac_addr, mac, ETH_ALEN);
|
||||
memcpy(mac_addr, mac, ETH_ALEN);
|
||||
}
|
||||
else
|
||||
{ // Use the mac address stored in the Efuse
|
||||
_rtw_memcpy(mac, mac_addr, ETH_ALEN);
|
||||
memcpy(mac, mac_addr, ETH_ALEN);
|
||||
}
|
||||
|
||||
if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) &&
|
||||
|
|
@ -1346,7 +1346,7 @@ void rtw_macaddr_cfg(u8 *mac_addr)
|
|||
mac[4] = 0x00;
|
||||
mac[5] = 0x00;
|
||||
// use default mac addresss
|
||||
_rtw_memcpy(mac_addr, mac, ETH_ALEN);
|
||||
memcpy(mac_addr, mac, ETH_ALEN);
|
||||
DBG_871X("MAC Address from efuse error, assign default one !!!\n");
|
||||
}
|
||||
|
||||
|
|
@ -1446,7 +1446,7 @@ int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
|
|||
if( merge_ie != NULL)
|
||||
{
|
||||
//Set first P2P OUI
|
||||
_rtw_memcpy(merge_ie, ELOUI, 6);
|
||||
memcpy(merge_ie, ELOUI, 6);
|
||||
merge_ie += 6;
|
||||
|
||||
while( i < in_len)
|
||||
|
|
@ -1456,7 +1456,7 @@ int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
|
|||
// Take out the rest of P2P OUIs
|
||||
if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) )
|
||||
{
|
||||
_rtw_memcpy( merge_ie, pIE->data +4, pIE->Length -4);
|
||||
memcpy( merge_ie, pIE->data +4, pIE->Length -4);
|
||||
len += pIE->Length-4;
|
||||
merge_ie += pIE->Length-4;
|
||||
}
|
||||
|
|
@ -1547,7 +1547,7 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen)
|
|||
|
||||
if ( p2p_ie != NULL )
|
||||
{
|
||||
_rtw_memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
|
||||
memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
|
||||
}
|
||||
|
||||
if ( p2p_ielen != NULL )
|
||||
|
|
@ -1611,7 +1611,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr
|
|||
target_attr_ptr = attr_ptr;
|
||||
|
||||
if(buf_attr)
|
||||
_rtw_memcpy(buf_attr, attr_ptr, attr_len);
|
||||
memcpy(buf_attr, attr_ptr, attr_len);
|
||||
|
||||
if(len_attr)
|
||||
*len_attr = attr_len;
|
||||
|
|
@ -1651,7 +1651,7 @@ u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *
|
|||
if(attr_ptr && attr_len)
|
||||
{
|
||||
if(buf_content)
|
||||
_rtw_memcpy(buf_content, attr_ptr+3, attr_len-3);
|
||||
memcpy(buf_content, attr_ptr+3, attr_len-3);
|
||||
|
||||
if(len_content)
|
||||
*len_content = attr_len-3;
|
||||
|
|
@ -1672,7 +1672,7 @@ u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr)
|
|||
RTW_PUT_LE16(pbuf + 1, attr_len);
|
||||
|
||||
if(pdata_attr)
|
||||
_rtw_memcpy(pbuf + 3, pdata_attr, attr_len);
|
||||
memcpy(pbuf + 3, pdata_attr, attr_len);
|
||||
|
||||
a_len = attr_len + 3;
|
||||
|
||||
|
|
@ -1694,7 +1694,7 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id)
|
|||
uint remain_len = ielen-(next_attr-ie);
|
||||
|
||||
_rtw_memset(target_attr, 0, target_attr_len);
|
||||
_rtw_memcpy(target_attr, next_attr, remain_len);
|
||||
memcpy(target_attr, next_attr, remain_len);
|
||||
_rtw_memset(target_attr+remain_len, 0, target_attr_len);
|
||||
*(ie+1) -= target_attr_len;
|
||||
ielen-=target_attr_len;
|
||||
|
|
@ -1723,7 +1723,7 @@ void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
|
|||
u8 *next_ie = p2p_ie+p2p_ielen;
|
||||
uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs);
|
||||
|
||||
_rtw_memcpy(next_ie, next_ie_ori, remain_len);
|
||||
memcpy(next_ie, next_ie_ori, remain_len);
|
||||
_rtw_memset(next_ie+remain_len, 0, p2p_ielen_ori-p2p_ielen);
|
||||
bss_ex->IELength -= p2p_ielen_ori-p2p_ielen;
|
||||
}
|
||||
|
|
@ -1778,7 +1778,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen)
|
|||
{
|
||||
if ( wfd_ie != NULL )
|
||||
{
|
||||
_rtw_memcpy( wfd_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
|
||||
memcpy( wfd_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
|
||||
|
||||
}
|
||||
else
|
||||
|
|
@ -1867,7 +1867,7 @@ int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 *
|
|||
{
|
||||
// 3 -> 1 byte for attribute ID field, 2 bytes for length field
|
||||
if(attr_content)
|
||||
_rtw_memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen );
|
||||
memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen );
|
||||
|
||||
if(attr_contentlen)
|
||||
*attr_contentlen = attrlen;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue