From fbeb87c53e4a39c6afcefe602aa0343e12326f15 Mon Sep 17 00:00:00 2001 From: Francisco Date: Fri, 2 Apr 2021 16:08:45 +0100 Subject: [PATCH] remove unused parameters from mac::ue --- srsenb/hdr/stack/mac/ue.h | 21 ++++++++------------- srsenb/src/stack/mac/ue.cc | 9 ++------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/srsenb/hdr/stack/mac/ue.h b/srsenb/hdr/stack/mac/ue.h index ab7a8f2e3..d983ffe1f 100644 --- a/srsenb/hdr/stack/mac/ue.h +++ b/srsenb/hdr/stack/mac/ue.h @@ -130,9 +130,7 @@ public: phy_interface_stack_lte* phy_, srslog::basic_logger& logger, uint32_t nof_cells_, - srsran::obj_pool_itf* softbuffer_pool, - uint32_t nof_rx_harq_proc = SRSRAN_FDD_NOF_HARQ, - uint32_t nof_tx_harq_proc = SRSRAN_FDD_NOF_HARQ); + srsran::obj_pool_itf* softbuffer_pool); virtual ~ue(); void reset(); @@ -155,7 +153,7 @@ public: generate_mch_pdu(uint32_t harq_pid, sched_interface::dl_pdu_mch_t sched, uint32_t nof_pdu_elems, uint32_t grant_size); srsran_softbuffer_tx_t* - get_tx_softbuffer(const uint32_t ue_cc_idx, const uint32_t harq_process, const uint32_t tb_idx); + get_tx_softbuffer(const uint32_t ue_cc_idx, const uint32_t harq_process, const uint32_t tb_idx); srsran_softbuffer_rx_t* get_rx_softbuffer(const uint32_t ue_cc_idx, const uint32_t tti); bool process_pdus(); @@ -187,15 +185,12 @@ private: uint32_t dl_pmi_counter = 0; mac_ue_metrics_t ue_metrics = {}; - srsran::mac_pcap* pcap = nullptr; - srsran::mac_pcap_net* pcap_net = nullptr; - uint64_t conres_id = 0; - uint16_t rnti = 0; - uint32_t nof_prb = 0; - uint32_t last_tti = 0; - uint32_t nof_failures = 0; - int nof_rx_harq_proc = 0; - int nof_tx_harq_proc = 0; + srsran::mac_pcap* pcap = nullptr; + srsran::mac_pcap_net* pcap_net = nullptr; + uint64_t conres_id = 0; + uint16_t rnti = 0; + uint32_t last_tti = 0; + uint32_t nof_failures = 0; srsran::obj_pool_itf* softbuffer_pool = nullptr; diff --git a/srsenb/src/stack/mac/ue.cc b/srsenb/src/stack/mac/ue.cc index be51a3b53..caade7ad4 100644 --- a/srsenb/src/stack/mac/ue.cc +++ b/srsenb/src/stack/mac/ue.cc @@ -199,11 +199,8 @@ ue::ue(uint16_t rnti_, phy_interface_stack_lte* phy_, srslog::basic_logger& logger_, uint32_t nof_cells_, - srsran::obj_pool_itf* softbuffer_pool_, - uint32_t nof_rx_harq_proc_, - uint32_t nof_tx_harq_proc_) : + srsran::obj_pool_itf* softbuffer_pool_) : rnti(rnti_), - nof_prb(nof_prb_), sched(sched_), rrc(rrc_), rlc(rlc_), @@ -213,8 +210,6 @@ ue::ue(uint16_t rnti_, mch_mac_msg_dl(10, logger_), mac_msg_ul(20, logger_), pdus(logger_), - nof_rx_harq_proc(nof_rx_harq_proc_), - nof_tx_harq_proc(nof_tx_harq_proc_), ta_fsm(this), softbuffer_pool(softbuffer_pool_) { @@ -262,7 +257,7 @@ srsran_softbuffer_rx_t* ue::get_rx_softbuffer(const uint32_t ue_cc_idx, const ui return nullptr; } - return &cc_buffers[ue_cc_idx].get_rx_softbuffer(tti % nof_rx_harq_proc); + return &cc_buffers[ue_cc_idx].get_rx_softbuffer(tti); } srsran_softbuffer_tx_t*