diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index e00a885812e553781097233fa12f0f76c29744e0..89e14fd79dd9e0cbfa31dc95fc05275d0d830eb5 100755 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -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);