Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-22 13:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace _rtw_memmove with memmove

Browse Source
This commit is contained in:
Carlos Garces 2021-10-12 17:09:01 +02:00
parent 71d5c54af2
commit bb3dc5ca12
4 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/rtw_ieee80211.c
View File

@ -395,7 +395,7 @@ 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; u8 *remain_ies = target_ie + target_ielen;
uint remain_len = search_len - (remain_ies - start); uint remain_len = search_len - (remain_ies - start);
_rtw_memmove(target_ie, remain_ies, remain_len); memmove(target_ie, remain_ies, remain_len);
*ies_len = *ies_len - target_ielen; *ies_len = *ies_len - target_ielen;
ret = _SUCCESS; ret = _SUCCESS;
@ -442,7 +442,7 @@ int rtw_remove_ie_g_rate(u8 *ie, uint *ie_len, uint offset, u8 eid)
*(tem_target_ie+1)=target_ielen;/*set new length to Supposrted Rates*/ *(tem_target_ie+1)=target_ielen;/*set new length to Supposrted Rates*/
target_ie=tem_target_ie+target_ielen + 2;/*set target ie to address of rate 6Mbps */ target_ie=tem_target_ie+target_ielen + 2;/*set target ie to address of rate 6Mbps */
_rtw_memmove(target_ie, remain_ies, remain_len); memmove(target_ie, remain_ies, remain_len);
*ie_len = *ie_len - rm_size; *ie_len = *ie_len - rm_size;
ret = rm_size; ret = rm_size;
@ -2205,7 +2205,7 @@ uint rtw_del_p2p_ie(u8 *ies, uint ies_len_ori, const char *msg)
RTW_INFO("next_ie:%p, remain_len:%u\n", next_ie, remain_len); RTW_INFO("next_ie:%p, remain_len:%u\n", next_ie, remain_len);
} }
_rtw_memmove(target_ie, next_ie, remain_len); memmove(target_ie, next_ie, remain_len);
memset(target_ie + remain_len, 0, target_ie_len); memset(target_ie + remain_len, 0, target_ie_len);
ies_len -= target_ie_len; ies_len -= target_ie_len;
@ -2246,7 +2246,7 @@ uint rtw_del_p2p_attr(u8 *ie, uint ielen_ori, u8 attr_id)
RTW_INFO("next_attr:%p, remain_len:%u\n", next_attr, remain_len); RTW_INFO("next_attr:%p, remain_len:%u\n", next_attr, remain_len);
} }
_rtw_memmove(target_attr, next_attr, remain_len); memmove(target_attr, next_attr, remain_len);
memset(target_attr + remain_len, 0, target_attr_len); memset(target_attr + remain_len, 0, target_attr_len);
*(ie + 1) -= target_attr_len; *(ie + 1) -= target_attr_len;
ielen -= target_attr_len; ielen -= target_attr_len;
@ -2316,7 +2316,7 @@ void rtw_bss_ex_del_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
if (ie_len != ie_len_ori) { if (ie_len != ie_len_ori) {
u8 *next_ie = ie + ie_len; u8 *next_ie = ie + ie_len;
_rtw_memmove(next_ie, next_ie_ori, remain_len); memmove(next_ie, next_ie_ori, remain_len);
memset(next_ie + remain_len, 0, ie_len_ori - ie_len); memset(next_ie + remain_len, 0, ie_len_ori - ie_len);
bss_ex->IELength -= ie_len_ori - ie_len; bss_ex->IELength -= ie_len_ori - ie_len;
@ -2532,7 +2532,7 @@ uint rtw_del_wfd_ie(u8 *ies, uint ies_len_ori, const char *msg)
RTW_INFO("next_ie:%p, remain_len:%u\n", next_ie, remain_len); RTW_INFO("next_ie:%p, remain_len:%u\n", next_ie, remain_len);
} }
_rtw_memmove(target_ie, next_ie, remain_len); memmove(target_ie, next_ie, remain_len);
memset(target_ie + remain_len, 0, target_ie_len); memset(target_ie + remain_len, 0, target_ie_len);
ies_len -= target_ie_len; ies_len -= target_ie_len;
@ -2573,7 +2573,7 @@ uint rtw_del_wfd_attr(u8 *ie, uint ielen_ori, u8 attr_id)
RTW_INFO("next_attr:%p, remain_len:%u\n", next_attr, remain_len); RTW_INFO("next_attr:%p, remain_len:%u\n", next_attr, remain_len);
} }
_rtw_memmove(target_attr, next_attr, remain_len); memmove(target_attr, next_attr, remain_len);
memset(target_attr + remain_len, 0, target_attr_len); memset(target_attr + remain_len, 0, target_attr_len);
*(ie + 1) -= target_attr_len; *(ie + 1) -= target_attr_len;
ielen -= target_attr_len; ielen -= target_attr_len;
@ -2642,7 +2642,7 @@ void rtw_bss_ex_del_wfd_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
if (ie_len != ie_len_ori) { if (ie_len != ie_len_ori) {
u8 *next_ie = ie + ie_len; u8 *next_ie = ie + ie_len;
_rtw_memmove(next_ie, next_ie_ori, remain_len); memmove(next_ie, next_ie_ori, remain_len);
memset(next_ie + remain_len, 0, ie_len_ori - ie_len); memset(next_ie + remain_len, 0, ie_len_ori - ie_len);
bss_ex->IELength -= ie_len_ori - ie_len; bss_ex->IELength -= ie_len_ori - ie_len;

12
hal/hal_btcoex.c
View File

@ -2304,7 +2304,7 @@ static COL_H2C_STATUS halbtcoutsrc_check_c2h_ack(PADAPTER Adapter, PCOL_SINGLE_H
} }
/* else */ /* else */
{ {
_rtw_memmove(&pH2cRecord->c2h_ack_buf[0], &gl_coex_offload.c2h_ack_buf[req_num], gl_coex_offload.c2h_ack_len[req_num]); memmove(&pH2cRecord->c2h_ack_buf[0], &gl_coex_offload.c2h_ack_buf[req_num], gl_coex_offload.c2h_ack_len[req_num]);
pH2cRecord->c2h_ack_len = gl_coex_offload.c2h_ack_len[req_num]; pH2cRecord->c2h_ack_len = gl_coex_offload.c2h_ack_len[req_num];
} }
@ -2337,7 +2337,7 @@ COL_H2C_STATUS halbtcoutsrc_CoexH2cProcess(void *pBtCoexist,
gl_coex_offload.h2c_req_num++; gl_coex_offload.h2c_req_num++;
gl_coex_offload.h2c_req_num %= 16; gl_coex_offload.h2c_req_num %= 16;
_rtw_memmove(&pcol_h2c->buf[0], ph2c_par, h2c_par_len); memmove(&pcol_h2c->buf[0], ph2c_par, h2c_par_len);
col_h2c_len = h2c_par_len + 2; /* 2=sizeof(OPCode, OPCode_version and Request number) */ col_h2c_len = h2c_par_len + 2; /* 2=sizeof(OPCode, OPCode_version and Request number) */
@ -2347,7 +2347,7 @@ COL_H2C_STATUS halbtcoutsrc_CoexH2cProcess(void *pBtCoexist,
gl_coex_offload.h2c_record[opcode].count++; gl_coex_offload.h2c_record[opcode].count++;
gl_coex_offload.h2c_record[opcode].h2c_len = col_h2c_len; gl_coex_offload.h2c_record[opcode].h2c_len = col_h2c_len;
_rtw_memmove((PVOID)&gl_coex_offload.h2c_record[opcode].h2c_buf[0], (PVOID)pcol_h2c, col_h2c_len); memmove((PVOID)&gl_coex_offload.h2c_record[opcode].h2c_buf[0], (PVOID)pcol_h2c, col_h2c_len);
h2c_status = halbtcoutsrc_send_h2c(Adapter, pcol_h2c, col_h2c_len); h2c_status = halbtcoutsrc_send_h2c(Adapter, pcol_h2c, col_h2c_len);
@ -2617,7 +2617,7 @@ static void BT_CoexOffloadC2hAckCheck(PADAPTER Adapter, u8 *tmpBuf, u8 length)
p_c2h_ack = (PCOL_C2H_ACK)tmpBuf; p_c2h_ack = (PCOL_C2H_ACK)tmpBuf;
req_num = p_c2h_ack->req_num; req_num = p_c2h_ack->req_num;
_rtw_memmove(&gl_coex_offload.c2h_ack_buf[req_num][0], tmpBuf, length); memmove(&gl_coex_offload.c2h_ack_buf[req_num][0], tmpBuf, length);
gl_coex_offload.c2h_ack_len[req_num] = length; gl_coex_offload.c2h_ack_len[req_num] = length;
complete(&gl_coex_offload.c2h_event[req_num]); complete(&gl_coex_offload.c2h_event[req_num]);
@ -2648,13 +2648,13 @@ static void BT_CoexOffloadC2hIndCheck(PADAPTER Adapter, u8 *tmpBuf, u8 length)
ind_version = p_c2h_ind->version; ind_version = p_c2h_ind->version;
ind_length = p_c2h_ind->length; ind_length = p_c2h_ind->length;
_rtw_memmove(&gl_coex_offload.c2h_ind_buf[0], tmpBuf, length); memmove(&gl_coex_offload.c2h_ind_buf[0], tmpBuf, length);
gl_coex_offload.c2h_ind_len = length; gl_coex_offload.c2h_ind_len = length;
/* log */ /* log */
gl_coex_offload.c2h_ind_record[ind_type].count++; gl_coex_offload.c2h_ind_record[ind_type].count++;
gl_coex_offload.c2h_ind_record[ind_type].status[COL_STATUS_C2H_OK]++; gl_coex_offload.c2h_ind_record[ind_type].status[COL_STATUS_C2H_OK]++;
_rtw_memmove(&gl_coex_offload.c2h_ind_record[ind_type].ind_buf[0], tmpBuf, length); memmove(&gl_coex_offload.c2h_ind_record[ind_type].ind_buf[0], tmpBuf, length);
gl_coex_offload.c2h_ind_record[ind_type].ind_len = length; gl_coex_offload.c2h_ind_record[ind_type].ind_len = length;
gl_coex_offload.c2h_ind_status[COL_STATUS_C2H_OK]++; gl_coex_offload.c2h_ind_status[COL_STATUS_C2H_OK]++;

1
include/osdep_service.h
View File

@ -254,7 +254,6 @@ _pkt *rtw_os_pkt_copy(_pkt *pkt);
void *rtw_os_pkt_data(_pkt *pkt); void *rtw_os_pkt_data(_pkt *pkt);
u32 rtw_os_pkt_len(_pkt *pkt); u32 rtw_os_pkt_len(_pkt *pkt);
extern void _rtw_memmove(void *dst, const void *src, u32 sz);
extern int _rtw_memcmp(const void *dst, const void *src, u32 sz); extern int _rtw_memcmp(const void *dst, const void *src, u32 sz);
extern void _rtw_init_listhead(_list *list); extern void _rtw_init_listhead(_list *list);

9
os_dep/osdep_service.c
View File

@ -792,15 +792,6 @@ inline u32 rtw_os_pkt_len(_pkt *pkt)
#endif #endif
} }
inline void _rtw_memmove(void *dst, const void *src, u32 sz)
{
#if defined(PLATFORM_LINUX)
memmove(dst, src, sz);
#else
#error "TBD\n"
#endif
}
int _rtw_memcmp(const void *dst, const void *src, u32 sz) int _rtw_memcmp(const void *dst, const void *src, u32 sz)
{ {