diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c index 242f3de711031946f415a81a619084259e90b719..461451d200d2c05b226a76632edb8d3eb809dfb2 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c @@ -38,8 +38,6 @@ #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h" //#define SRS_IND_DEBUG -static int nofBlocks = 0; -static int nofErrors = 0; int get_dci_format(NR_UE_sched_ctrl_t *sched_ctrl) { @@ -436,8 +434,6 @@ int nr_process_mac_pdu(instance_t module_idP, void abort_nr_ul_harq(NR_UE_info_t *UE, int8_t harq_pid) { - - nofErrors++; NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl; NR_UE_ul_harq_t *harq = &sched_ctrl->ul_harq_processes[harq_pid]; @@ -453,16 +449,6 @@ void abort_nr_ul_harq(NR_UE_info_t *UE, int8_t harq_pid) sched_ctrl->sched_ul_bytes = 0; } -float returnULBLER(void) -{ - float BLER = (float) nofErrors / (float) nofBlocks; - - nofErrors = 0; - nofBlocks = 0; - - return BLER; -} - void handle_nr_ul_harq(const int CC_idP, module_id_t mod_id, frame_t frame, @@ -512,7 +498,6 @@ void handle_nr_ul_harq(const int CC_idP, harq->feedback_slot = -1; harq->is_waiting = false; if (!crc_pdu->tb_crc_status) { - nofBlocks++; harq->ndi ^= 1; harq->round = 0; LOG_D(NR_MAC, @@ -521,10 +506,7 @@ void handle_nr_ul_harq(const int CC_idP, crc_pdu->rnti); add_tail_nr_list(&sched_ctrl->available_ul_harq, harq_pid); - } else if (harq->round >= RC.nrmac[mod_id]->ul_bler.harq_round_max - 1) { - - } else if (harq->round >= RC.nrmac[mod_id]->harq_round_max - 1) { - nofBlocks++; + } else if (harq->round >= RC.nrmac[mod_id]->ul_bler.harq_round_max - 1){ abort_nr_ul_harq(UE, harq_pid); LOG_D(NR_MAC, "RNTI %04x: Ulharq id %d crc failed in all rounds\n", diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h index c1e112f033978f00eaa89b432c91e8dfb394dc98..7b55aa2b3806994fe97ef63118592c1e09e81487 100644 --- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h +++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h @@ -449,8 +449,6 @@ void handle_nr_srs_measurements(const module_id_t module_id, const uint8_t num_reported_symbols, nfapi_nr_srs_indication_reported_symbol_t* reported_symbol_list); -float returnULBLER(void); - int16_t ssb_index_from_prach(module_id_t module_idP, frame_t frameP, sub_frame_t slotP,