maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to remove cppcheck warnings

Browse Source
This commit is contained in:
Louis Adrien Dufrene
2019-02-19 07:56:32 +01:00
parent 0f52ce5031
commit db51a61c2e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+5 -7
View File
@@ -1710,15 +1710,16 @@ schedule_ue_spec(module_id_t module_idP,
UE_id); UE_id);
continue_flag = 0; // reset the flag to allow allocation for the remaining UEs continue_flag = 0; // reset the flag to allow allocation for the remaining UEs
rnti = UE_RNTI(module_idP, UE_id); rnti = UE_RNTI(module_idP, UE_id);
eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
ue_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id]; ue_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id];
ue_template = &UE_list->UE_template[CC_id][UE_id]; ue_template = &UE_list->UE_template[CC_id][UE_id];
if (UE_list->UE_template[CC_id][UE_id].rach_resource_type > 0) continue_flag=1; if (ue_template->rach_resource_type > 0) continue_flag = 1;
if (eNB_UE_stats == NULL) { if (&(UE_list->eNB_UE_stats[CC_id][UE_id]) == NULL) {
LOG_D(MAC, "[eNB] Cannot find eNB_UE_stats\n"); LOG_D(MAC, "[eNB] Cannot find eNB_UE_stats\n");
continue_flag = 1; continue_flag = 1;
} else {
eNB_UE_stats = &(UE_list->eNB_UE_stats[CC_id][UE_id]);
} }
if (continue_flag != 1) { if (continue_flag != 1) {
@@ -1795,8 +1796,7 @@ schedule_ue_spec(module_id_t module_idP,
subframeP); subframeP);
round = ue_sched_ctrl->round[CC_id][harq_pid]; round = ue_sched_ctrl->round[CC_id][harq_pid];
eNB_UE_stats->crnti = rnti; eNB_UE_stats->crnti = rnti;
eNB_UE_stats->rrc_status = mac_eNB_get_rrc_status(module_idP, eNB_UE_stats->rrc_status = mac_eNB_get_rrc_status(module_idP, rnti);
rnti);
eNB_UE_stats->harq_pid = harq_pid; eNB_UE_stats->harq_pid = harq_pid;
eNB_UE_stats->harq_round = round; eNB_UE_stats->harq_round = round;
@@ -2009,7 +2009,6 @@ schedule_ue_spec(module_id_t module_idP,
eNB_UE_stats->num_retransmission += 1; eNB_UE_stats->num_retransmission += 1;
eNB_UE_stats->rbs_used_retx = nb_rb; eNB_UE_stats->rbs_used_retx = nb_rb;
eNB_UE_stats->total_rbs_used_retx += nb_rb; eNB_UE_stats->total_rbs_used_retx += nb_rb;
eNB_UE_stats->dlsch_mcs1 = eNB_UE_stats->dlsch_mcs1;
eNB_UE_stats->dlsch_mcs2 = eNB_UE_stats->dlsch_mcs1; eNB_UE_stats->dlsch_mcs2 = eNB_UE_stats->dlsch_mcs1;
} else { } else {
LOG_D(MAC, LOG_D(MAC,
@@ -2529,7 +2528,6 @@ schedule_ue_spec(module_id_t module_idP,
eNB_UE_stats->rbs_used = nb_rb; eNB_UE_stats->rbs_used = nb_rb;
eNB_UE_stats->num_mac_sdu_tx = num_sdus; eNB_UE_stats->num_mac_sdu_tx = num_sdus;
eNB_UE_stats->total_rbs_used += nb_rb; eNB_UE_stats->total_rbs_used += nb_rb;
eNB_UE_stats->dlsch_mcs1 = eNB_UE_stats->dlsch_mcs1;
eNB_UE_stats->dlsch_mcs2 = mcs; eNB_UE_stats->dlsch_mcs2 = mcs;
eNB_UE_stats->TBS = TBS; eNB_UE_stats->TBS = TBS;
eNB_UE_stats->overhead_bytes = TBS - sdu_length_total; eNB_UE_stats->overhead_bytes = TBS - sdu_length_total;
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1 -1
View File
@@ -3048,7 +3048,7 @@ dump_CCE_table(int *CCE_table,
break; break;
} }
printf("rnti %x, Yk*L = %d, nCCE %d (nCCE/L %d),nb_cand*L %d\n", LOG_I(PHY, "rnti %x, Yk*L = %u, nCCE %d (nCCE/L %d),nb_cand*L %d\n",
rnti, rnti,
Yk * L, Yk * L,
nCCE, nCCE,