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

rtl8188eu: Fix some gcc12 compiler warnings

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2022-07-15 13:51:36 -05:00
parent 903b6fcb82
commit a36cfdfdb6
2 changed files with 34 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ioctl_cfg80211.c
View file

@ -2270,10 +2270,8 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if (pwdinfo->driver_interface == DRIVER_CFG80211) { if (pwdinfo->driver_interface == DRIVER_CFG80211) {
if (ssids->ssid != NULL if (!memcmp(ssids->ssid, "DIRECT-", 7) &&
&& !memcmp(ssids->ssid, "DIRECT-", 7) rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)) {
&& rtw_get_p2p_ie((u8 *)request->ie, request->ie_len, NULL, NULL)
) {
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
rtw_p2p_enable(padapter, P2P_ROLE_DEVICE); rtw_p2p_enable(padapter, P2P_ROLE_DEVICE);
else { else {

49
phydm_debug.c
View file

@ -1489,13 +1489,9 @@ phydm_cmd_parser(
case PHYDM_RA: case PHYDM_RA:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
/*PHYDM_SNPRINTF((output + used, out_len - used, "new SET, RA_var[%d]= (( %d ))\n", i, var1[i]));*/
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
/*PHYDM_SNPRINTF((output+used, out_len-used, "odm_RA_debug\n"));*/ /*PHYDM_SNPRINTF((output+used, out_len-used, "odm_RA_debug\n"));*/
@ -1512,13 +1508,9 @@ phydm_cmd_parser(
case PHYDM_ANTDIV: case PHYDM_ANTDIV:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
/*PHYDM_SNPRINTF((output+used, out_len-used, "new SET, PATHDIV_var[%d]= (( %d ))\n", i, var1[i]));*/
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
/*PHYDM_SNPRINTF((output+used, out_len-used, "odm_PATHDIV_debug\n"));*/ /*PHYDM_SNPRINTF((output+used, out_len-used, "odm_PATHDIV_debug\n"));*/
@ -1532,13 +1524,9 @@ phydm_cmd_parser(
case PHYDM_PATHDIV: case PHYDM_PATHDIV:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
/*PHYDM_SNPRINTF((output+used, out_len-used, "new SET, PATHDIV_var[%d]= (( %d ))\n", i, var1[i]));*/
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
/*PHYDM_SNPRINTF((output+used, out_len-used, "odm_PATHDIV_debug\n"));*/ /*PHYDM_SNPRINTF((output+used, out_len-used, "odm_PATHDIV_debug\n"));*/
@ -1552,13 +1540,9 @@ phydm_cmd_parser(
case PHYDM_DEBUG: case PHYDM_DEBUG:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
/*PHYDM_SNPRINTF((output+used, out_len-used, "new SET, Debug_var[%d]= (( %d ))\n", i, var1[i]));*/
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
/*PHYDM_SNPRINTF((output+used, out_len-used, "odm_debug_comp\n"));*/ /*PHYDM_SNPRINTF((output+used, out_len-used, "odm_debug_comp\n"));*/
@ -1571,11 +1555,9 @@ phydm_cmd_parser(
case PHYDM_FW_DEBUG: case PHYDM_FW_DEBUG:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) if (input_idx >= 1)
phydm_fw_debug_trace(p_dm_odm, (u32 *)var1, &used, output, &out_len); phydm_fw_debug_trace(p_dm_odm, (u32 *)var1, &used, output, &out_len);
@ -1585,13 +1567,9 @@ phydm_cmd_parser(
case PHYDM_SUPPORT_ABILITY: case PHYDM_SUPPORT_ABILITY:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
/*PHYDM_SNPRINTF((output+used, out_len-used, "new SET, support ablity_var[%d]= (( %d ))\n", i, var1[i]));*/
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
/*PHYDM_SNPRINTF((output+used, out_len-used, "support ablity\n"));*/ /*PHYDM_SNPRINTF((output+used, out_len-used, "support ablity\n"));*/
@ -1603,11 +1581,9 @@ phydm_cmd_parser(
case PHYDM_SMART_ANT: case PHYDM_SMART_ANT:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
#if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY)) #if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY))
@ -1633,11 +1609,9 @@ phydm_cmd_parser(
bool is_enable_dbg_mode; bool is_enable_dbg_mode;
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
input_idx++; input_idx++;
} }
}
if ((strcmp(input[1], help) == 0)) { if ((strcmp(input[1], help) == 0)) {
PHYDM_SNPRINTF((output + used, out_len - used, "{En} {pathA~D(0~3)} {rate_idx(Hex), All_rate:0xff} {txagc_idx (Hex)}\n")); PHYDM_SNPRINTF((output + used, out_len - used, "{En} {pathA~D(0~3)} {rate_idx(Hex), All_rate:0xff} {txagc_idx (Hex)}\n"));
@ -1661,7 +1635,6 @@ phydm_cmd_parser(
case PHYDM_TRX_PATH: case PHYDM_TRX_PATH:
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (input[i + 1])
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
} }
phydm_config_trx_path(p_dm_odm, (u32 *)var1, &used, output, &out_len); phydm_config_trx_path(p_dm_odm, (u32 *)var1, &used, output, &out_len);
@ -1683,10 +1656,8 @@ phydm_cmd_parser(
{ {
u8 type = 0; u8 type = 0;
if (input[1]) {
PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]); PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
type = (u8)var1[0]; type = (u8)var1[0];
}
if (type == 0) if (type == 0)
phydm_dump_bb_reg(p_dm_odm, &used, output, &out_len); phydm_dump_bb_reg(p_dm_odm, &used, output, &out_len);
@ -1707,29 +1678,23 @@ phydm_cmd_parser(
break; break;
case PHYDM_NBI_EN: case PHYDM_NBI_EN:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
phydm_api_debug(p_dm_odm, PHYDM_API_NBI, (u32 *)var1, &used, output, &out_len); phydm_api_debug(p_dm_odm, PHYDM_API_NBI, (u32 *)var1, &used, output, &out_len);
/**/ /**/
} }
break; break;
case PHYDM_CSI_MASK_EN: case PHYDM_CSI_MASK_EN:
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {
@ -1745,11 +1710,9 @@ phydm_cmd_parser(
u32 var[6] = {0}; u32 var[6] = {0};
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) if (input_idx >= 1)
phydm_dfs_debug(p_dm_odm, var, &used, output, &out_len); phydm_dfs_debug(p_dm_odm, var, &used, output, &out_len);
@ -1908,7 +1871,7 @@ phydm_cmd_parser(
phydm_bb_debug_info(p_dm_odm, &used, output, &out_len); phydm_bb_debug_info(p_dm_odm, &used, output, &out_len);
if (p_dm_odm->support_ic_type & ODM_RTL8822B && input[1]) { if (p_dm_odm->support_ic_type & ODM_RTL8822B) {
PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]); PHYDM_SSCANF(input[1], DCMD_DECIMAL, &var1[0]);
odm_set_bb_reg(p_dm_odm, 0x1988, 0x003fff00, var1[0]); odm_set_bb_reg(p_dm_odm, 0x1988, 0x003fff00, var1[0]);
value32 = odm_get_bb_reg(p_dm_odm, 0xf84, MASKDWORD); value32 = odm_get_bb_reg(p_dm_odm, 0xf84, MASKDWORD);
@ -1942,14 +1905,8 @@ phydm_cmd_parser(
break; break;
case PHYDM_PAUSE_DIG_EN: case PHYDM_PAUSE_DIG_EN:
for (i = 0; i < 5; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
input_idx++; input_idx++;
}
}
if (input_idx >= 1) { if (input_idx >= 1) {
if (var1[0] == 0) { if (var1[0] == 0) {
@ -1967,11 +1924,9 @@ phydm_cmd_parser(
case PHYDM_H2C: case PHYDM_H2C:
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_HEX, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) if (input_idx >= 1)
phydm_h2C_debug(p_dm_odm, (u32 *)var1, &used, output, &out_len); phydm_h2C_debug(p_dm_odm, (u32 *)var1, &used, output, &out_len);
@ -1982,11 +1937,9 @@ phydm_cmd_parser(
case PHYDM_ANT_SWITCH: case PHYDM_ANT_SWITCH:
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (input[i + 1]) {
PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]); PHYDM_SSCANF(input[i + 1], DCMD_DECIMAL, &var1[i]);
input_idx++; input_idx++;
} }
}
if (input_idx >= 1) { if (input_idx >= 1) {