mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2025-01-03 21:04:05 +00:00
Code Releases Activity

Fix compile warnings introduced with DEBUG commit

Browse Source
This commit is contained in:
kimocoder 2018-08-06 21:21:49 +02:00
parent 5a21cce8cd
commit dabd563f86
8 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dkms.conf
View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl88xxau" PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.2.20.2~20180805" PACKAGE_VERSION="5.2.20.2~20180806"
CLEAN="'make' clean" CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc` PROCS_NUM=`nproc`

3
hal/phydm/halrf/halphyrf_ce.c
View File

@ -301,8 +301,9 @@ odm_txpowertracking_callback_thermal_meter(
/*4 3. Initialize ThermalValues of rf_calibrate_info*/ /*4 3. Initialize ThermalValues of rf_calibrate_info*/
if (p_rf_calibrate_info->is_reloadtxpowerindex) if (p_rf_calibrate_info->is_reloadtxpowerindex) {
ODM_RT_TRACE(p_dm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("reload ofdm index for band switch\n")); ODM_RT_TRACE(p_dm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("reload ofdm index for band switch\n"));
}
/*4 4. Calculate average thermal meter*/ /*4 4. Calculate average thermal meter*/

10
hal/phydm/halrf/halrf.c
View File

@ -809,8 +809,9 @@ halrf_segment_iqk_trigger(
odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK);
p_dm->rf_calibrate_info.is_iqk_in_progress = false; p_dm->rf_calibrate_info.is_iqk_in_progress = false;
odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK);
} else } else {
ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the IQK CMD, because RFKs in Progress ==\n")); ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the IQK CMD, because RFKs in Progress ==\n"));
}
} }
@ -1331,12 +1332,12 @@ halrf_iqk_trigger(
odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK);
p_dm->rf_calibrate_info.is_iqk_in_progress = false; p_dm->rf_calibrate_info.is_iqk_in_progress = false;
odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK);
} else } else {
ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the IQK CMD, because RFKs in Progress ==\n")); ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the IQK CMD, because RFKs in Progress ==\n"));
}
} }
void void
halrf_lck_trigger( halrf_lck_trigger(
void *p_dm_void void *p_dm_void
@ -1457,8 +1458,9 @@ halrf_lck_trigger(
odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_acquire_spin_lock(p_dm, RT_IQK_SPINLOCK);
p_dm->rf_calibrate_info.is_lck_in_progress = false; p_dm->rf_calibrate_info.is_lck_in_progress = false;
odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK); odm_release_spin_lock(p_dm, RT_IQK_SPINLOCK);
}else } else {
ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the LCK CMD, because RFK is in Progress ==\n")); ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== Return the LCK CMD, because RFK is in Progress ==\n"));
}
} }
void void

25
hal/phydm/halrf/halrf_kfree.c
View File

@ -108,9 +108,9 @@ phydm_set_kfree_to_rf_8814a(
/*that means Kfree offset is negative, we need to record it.*/ /*that means Kfree offset is negative, we need to record it.*/
p_rf_calibrate_info->kfree_offset[e_rf_path] = (-1) * p_rf_calibrate_info->kfree_offset[e_rf_path]; p_rf_calibrate_info->kfree_offset[e_rf_path] = (-1) * p_rf_calibrate_info->kfree_offset[e_rf_path];
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("phy_ConfigKFree8814A(): kfree_offset = %d\n", p_rf_calibrate_info->kfree_offset[e_rf_path])); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("phy_ConfigKFree8814A(): kfree_offset = %d\n", p_rf_calibrate_info->kfree_offset[e_rf_path]));
} else } else {
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("phy_ConfigKFree8814A(): kfree_offset = %d\n", p_rf_calibrate_info->kfree_offset[e_rf_path])); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("phy_ConfigKFree8814A(): kfree_offset = %d\n", p_rf_calibrate_info->kfree_offset[e_rf_path]));
}
} }
@ -142,8 +142,9 @@ phydm_get_thermal_trim_offset_8821c(
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8821c thermal trim flag:0x%02x\n", p_power_trim_info->flag)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8821c thermal trim flag:0x%02x\n", p_power_trim_info->flag));
if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8821c thermal:%d\n", p_power_trim_info->thermal)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8821c thermal:%d\n", p_power_trim_info->thermal));
}
} }
@ -298,8 +299,9 @@ phydm_get_thermal_trim_offset_8822b(
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b thermal trim flag:0x%02x\n", p_power_trim_info->flag)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b thermal trim flag:0x%02x\n", p_power_trim_info->flag));
if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b thermal:%d\n", p_power_trim_info->thermal)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b thermal:%d\n", p_power_trim_info->thermal));
}
#if 0 #if 0
} else } else
return; return;
@ -493,9 +495,9 @@ phydm_get_pa_bias_offset_8822b(
for (e_rf_path = RF_PATH_A; e_rf_path < 2; e_rf_path++) for (e_rf_path = RF_PATH_A; e_rf_path < 2; e_rf_path++)
phydm_set_pa_bias_to_rf_8822b(p_dm, e_rf_path, tx_pa_bias[e_rf_path]); phydm_set_pa_bias_to_rf_8822b(p_dm, e_rf_path, tx_pa_bias[e_rf_path]);
} } else {
else
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b 2g tx pa bias no pg\n")); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8822b 2g tx pa bias no pg\n"));
}
} }
@ -581,9 +583,9 @@ void *p_dm_void)
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b thermal trim flag:0x%02x\n", p_power_trim_info->flag)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b thermal trim flag:0x%02x\n", p_power_trim_info->flag));
if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) if (p_power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b thermal:%d\n", p_power_trim_info->thermal)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b thermal:%d\n", p_power_trim_info->thermal));
}
} }
void void
@ -611,10 +613,9 @@ phydm_get_power_trim_offset_8710b(
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b power trim flag:0x%02x\n", p_power_trim_info->flag)); ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b power trim flag:0x%02x\n", p_power_trim_info->flag));
if (p_power_trim_info->flag & KFREE_FLAG_ON) if (p_power_trim_info->flag & KFREE_FLAG_ON) {
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b power_trim_data->bb_gain[0][0]=0x%X\n", p_power_trim_info->bb_gain[0][0]));
ODM_RT_TRACE(p_dm, ODM_COMP_MP, ODM_DBG_LOUD, ("[kfree] 8710b power_trim_data->bb_gain[0][0]=0x%X\n", p_power_trim_info->bb_gain[0][0])); }
} }
void void
phydm_set_kfree_to_rf_8710b( phydm_set_kfree_to_rf_8710b(

3
hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
View File

@ -1366,8 +1366,9 @@ phy_iq_calibrate_8812a(
if (p_dm->fw_offload_ability & PHYDM_RF_IQK_OFFLOAD) { if (p_dm->fw_offload_ability & PHYDM_RF_IQK_OFFLOAD) {
_phy_iq_calibrate_by_fw_8812a(p_dm); _phy_iq_calibrate_by_fw_8812a(p_dm);
phydm_iqk_wait(p_dm, 500); phydm_iqk_wait(p_dm, 500);
if (p_dm->rf_calibrate_info.is_iqk_in_progress) if (p_dm->rf_calibrate_info.is_iqk_in_progress) {
ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== FW IQK TIMEOUT (Still in progress after 500ms) ==\n")); ODM_RT_TRACE(p_dm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("== FW IQK TIMEOUT (Still in progress after 500ms) ==\n"));
}
} else } else
_phy_iq_calibrate_8812a(p_dm, *p_dm->p_channel); _phy_iq_calibrate_8812a(p_dm, *p_dm->p_channel);
} }

10
hal/phydm/phydm_beamforming.c
View File

@ -1069,8 +1069,9 @@ phydm_beamforming_notify(
/*if (p_sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || p_sound_info->sound_mode == SOUNDING_SW_HT_TIMER) /*if (p_sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || p_sound_info->sound_mode == SOUNDING_SW_HT_TIMER)
odm_set_timer(p_dm, &p_beam_info->beamforming_timer, p_sound_info->sound_period);*/ odm_set_timer(p_dm, &p_beam_info->beamforming_timer, p_sound_info->sound_period);*/
odm_set_timer(p_dm, &p_beam_info->beamforming_timer, 1000); /*Do MU sounding every 1sec*/ odm_set_timer(p_dm, &p_beam_info->beamforming_timer, 1000); /*Do MU sounding every 1sec*/
} else } else {
PHYDM_DBG(p_dm, DBG_TXBF, ("%s: Less or larger than 2 MU STAs, not to set timer\n", __func__)); PHYDM_DBG(p_dm, DBG_TXBF, ("%s: Less or larger than 2 MU STAs, not to set timer\n", __func__));
}
break; break;
case BEAMFORMEE_NOTIFY_DELETE_MU: case BEAMFORMEE_NOTIFY_DELETE_MU:
@ -1188,8 +1189,9 @@ beamforming_init_entry(
if (p_beamformer_entry == NULL) { if (p_beamformer_entry == NULL) {
p_beamformer_entry = beamforming_add_bfer_entry(p_dm, p_sta, beamform_cap, num_of_sounding_dim, &bfer_idx); p_beamformer_entry = beamforming_add_bfer_entry(p_dm, p_sta, beamform_cap, num_of_sounding_dim, &bfer_idx);
if (p_beamformer_entry == NULL) if (p_beamformer_entry == NULL) {
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s]Not enough BFer entry!!!!!\n", __func__)); PHYDM_DBG(p_dm, DBG_TXBF, ("[%s]Not enough BFer entry!!!!!\n", __func__));
}
} }
} }
@ -1594,9 +1596,9 @@ beamforming_timer_callback(
#endif #endif
if (ret) if (ret)
ret = beamforming_start_sw(p_dm, p_sound_info->sound_idx, p_sound_info->sound_mode, p_sound_info->sound_bw); ret = beamforming_start_sw(p_dm, p_sound_info->sound_idx, p_sound_info->sound_mode, p_sound_info->sound_bw);
else else {
PHYDM_DBG(p_dm, DBG_TXBF, ("%s, Error value return from BeamformingStart_V2\n", __func__)); PHYDM_DBG(p_dm, DBG_TXBF, ("%s, Error value return from BeamformingStart_V2\n", __func__));
}
if ((p_beam_info->beamformee_su_cnt != 0) || (p_beam_info->beamformee_mu_cnt > 1)) { if ((p_beam_info->beamformee_su_cnt != 0) || (p_beam_info->beamformee_mu_cnt > 1)) {
if (p_sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || p_sound_info->sound_mode == SOUNDING_SW_HT_TIMER) if (p_sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || p_sound_info->sound_mode == SOUNDING_SW_HT_TIMER)
odm_set_timer(p_dm, &p_beam_info->beamforming_timer, p_sound_info->sound_period); odm_set_timer(p_dm, &p_beam_info->beamforming_timer, p_sound_info->sound_period);

13
hal/phydm/phydm_debug.c
View File

@ -1283,9 +1283,9 @@ phydm_basic_dbg_message
if (p_dm->support_ic_type & ODM_IC_PHY_STATUE_NEW_TYPE) if (p_dm->support_ic_type & ODM_IC_PHY_STATUE_NEW_TYPE)
PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("Coding: LDPC=((%s)), STBC=((%s))\n", (p_dm->phy_dbg_info.is_ldpc_pkt) ? "Y" : "N", (p_dm->phy_dbg_info.is_stbc_pkt) ? "Y" : "N")); PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("Coding: LDPC=((%s)), STBC=((%s))\n", (p_dm->phy_dbg_info.is_ldpc_pkt) ? "Y" : "N", (p_dm->phy_dbg_info.is_stbc_pkt) ? "Y" : "N"));
#endif #endif
} else } else {
PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("No Link !!!\n")); PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("No Link !!!\n"));
}
PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("[CCA Cnt] {CCK, OFDM, Total} = {%d, %d, %d}\n", PHYDM_DBG(p_dm, ODM_COMP_COMMON, ("[CCA Cnt] {CCK, OFDM, Total} = {%d, %d, %d}\n",
false_alm_cnt->cnt_cck_cca, false_alm_cnt->cnt_ofdm_cca, false_alm_cnt->cnt_cca_all)); false_alm_cnt->cnt_cck_cca, false_alm_cnt->cnt_ofdm_cca, false_alm_cnt->cnt_cca_all));
@ -1567,9 +1567,10 @@ phydm_fw_trace_en_h2c(
PHYDM_DBG(p_dm, DBG_FW_TRACE, ("---->\n")); PHYDM_DBG(p_dm, DBG_FW_TRACE, ("---->\n"));
if (monitor_mode == 0) if (monitor_mode == 0)
PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[H2C] FW_debug_en: (( %d ))\n", enable)); PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[H2C] FW_debug_en: (( %d ))\n", enable));
else else {
PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[H2C] FW_debug_en: (( %d )), mode: (( %d )), macid: (( %d ))\n", enable, monitor_mode, macid)); PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[H2C] FW_debug_en: (( %d )), mode: (( %d )), macid: (( %d ))\n", enable, monitor_mode, macid));
odm_fill_h2c_cmd(p_dm, PHYDM_H2C_FW_TRACE_EN, cmd_length, h2c_parameter); odm_fill_h2c_cmd(p_dm, PHYDM_H2C_FW_TRACE_EN, cmd_length, h2c_parameter);
}
} }
void void
@ -3146,9 +3147,9 @@ phydm_fw_trace_handler_code(
u16 content_3 = (((u16)buffer[9]) << 8) | ((u16)buffer[8]); u16 content_3 = (((u16)buffer[9]) << 8) | ((u16)buffer[8]);
u16 content_4 = (((u16)buffer[11]) << 8) | ((u16)buffer[10]); u16 content_4 = (((u16)buffer[11]) << 8) | ((u16)buffer[10]);
if (cmd_len > 12) if (cmd_len > 12) {
PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[FW Msg] Invalid cmd length (( %d )) >12\n", cmd_len)); PHYDM_DBG(p_dm, DBG_FW_TRACE, ("[FW Msg] Invalid cmd length (( %d )) >12\n", cmd_len));
}
/* PHYDM_DBG(p_dm, DBG_FW_TRACE,("[FW Msg] Func=((%d)), num=((%d)), ct_0=((%d)), ct_1=((%d)), ct_2=((%d)), ct_3=((%d)), ct_4=((%d))\n", */ /* PHYDM_DBG(p_dm, DBG_FW_TRACE,("[FW Msg] Func=((%d)), num=((%d)), ct_0=((%d)), ct_1=((%d)), ct_2=((%d)), ct_3=((%d)), ct_4=((%d))\n", */
/* function, dbg_num, content_0, content_1, content_2, content_3, content_4)); */ /* function, dbg_num, content_0, content_1, content_2, content_3, content_4)); */

3
hal/phydm/txbf/haltxbfjaguar.c
View File

@ -147,8 +147,9 @@ hal_txbf_jaguar_download_ndpa(
dl_bcn_count++; dl_bcn_count++;
} while (!(bcn_valid_reg & BIT(0)) && dl_bcn_count < 5); } while (!(bcn_valid_reg & BIT(0)) && dl_bcn_count < 5);
if (!(bcn_valid_reg & BIT(0))) if (!(bcn_valid_reg & BIT(0))) {
PHYDM_DBG(p_dm, DBG_TXBF, ("%s Download RSVD page failed!\n", __func__)); PHYDM_DBG(p_dm, DBG_TXBF, ("%s Download RSVD page failed!\n", __func__));
}
/*TDECTRL[15:8] 0x209[7:0] = 0xF6 Beacon Head for TXDMA*/ /*TDECTRL[15:8] 0x209[7:0] = 0xF6 Beacon Head for TXDMA*/
odm_write_1byte(p_dm, REG_TDECTRL_8812A + 1, tx_page_bndy); odm_write_1byte(p_dm, REG_TDECTRL_8812A + 1, tx_page_bndy);