fixed bug introduced in r5766
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5772 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -3222,23 +3222,6 @@ void phy_procedures_eNB_RX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
|
||||
|
||||
}
|
||||
|
||||
if (frame % 100 == 0) {
|
||||
for (round=0;round<phy_vars_eNB->ulsch_eNB[i]->Mdlharq;round++) {
|
||||
if ((phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round]) != 0)
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_fer[harq_pid][round] =
|
||||
(100*(phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors_last[harq_pid][round]))/
|
||||
(phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round]);
|
||||
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round] =
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round];
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors_last[harq_pid][round] =
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors[harq_pid][round];
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef PUCCH
|
||||
else if ((phy_vars_eNB->dlsch_eNB[i][0]) &&
|
||||
(phy_vars_eNB->dlsch_eNB[i][0]->rnti>0)) { // check for PUCCH
|
||||
@@ -3489,6 +3472,24 @@ void phy_procedures_eNB_RX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
|
||||
|
||||
#endif //PUCCH
|
||||
|
||||
if ((frame % 100 == 0) && (subframe==4)) {
|
||||
for (round=0;round<phy_vars_eNB->ulsch_eNB[i]->Mdlharq;round++) {
|
||||
if ((phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round]) != 0)
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_fer[harq_pid][round] =
|
||||
(100*(phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors_last[harq_pid][round]))/
|
||||
(phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round] -
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round]);
|
||||
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts_last[harq_pid][round] =
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_decoding_attempts[harq_pid][round];
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors_last[harq_pid][round] =
|
||||
phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors[harq_pid][round];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((frame % 100 == 0) && (subframe==4)) {
|
||||
phy_vars_eNB->eNB_UE_stats[i].dlsch_bitrate = (phy_vars_eNB->eNB_UE_stats[i].total_TBS -
|
||||
phy_vars_eNB->eNB_UE_stats[i].total_TBS_last);
|
||||
|
||||
Reference in New Issue
Block a user