5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unused parameters from mac::ue

Browse Source
master
Francisco 4 years ago committed by Francisco Paisana
parent 62a6d9a8dc
commit fbeb87c53e
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File

21
srsenb/hdr/stack/mac/ue.h
Unescape Escape View File

@ -130,9 +130,7 @@ public:
phy_interface_stack_lte* phy_, phy_interface_stack_lte* phy_,
srslog::basic_logger& logger, srslog::basic_logger& logger,
uint32_t nof_cells_, uint32_t nof_cells_,
srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool, srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool);
uint32_t nof_rx_harq_proc = SRSRAN_FDD_NOF_HARQ,
uint32_t nof_tx_harq_proc = SRSRAN_FDD_NOF_HARQ);
virtual ~ue(); virtual ~ue();
void reset(); 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); 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* 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); srsran_softbuffer_rx_t* get_rx_softbuffer(const uint32_t ue_cc_idx, const uint32_t tti);
bool process_pdus(); bool process_pdus();
@ -187,15 +185,12 @@ private:
uint32_t dl_pmi_counter = 0; uint32_t dl_pmi_counter = 0;
mac_ue_metrics_t ue_metrics = {}; mac_ue_metrics_t ue_metrics = {};
srsran::mac_pcap* pcap = nullptr; srsran::mac_pcap* pcap = nullptr;
srsran::mac_pcap_net* pcap_net = nullptr; srsran::mac_pcap_net* pcap_net = nullptr;
uint64_t conres_id = 0; uint64_t conres_id = 0;
uint16_t rnti = 0; uint16_t rnti = 0;
uint32_t nof_prb = 0; uint32_t last_tti = 0;
uint32_t last_tti = 0; uint32_t nof_failures = 0;
uint32_t nof_failures = 0;
int nof_rx_harq_proc = 0;
int nof_tx_harq_proc = 0;
srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool = nullptr; srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool = nullptr;

9
srsenb/src/stack/mac/ue.cc
Unescape Escape View File

@ -199,11 +199,8 @@ ue::ue(uint16_t rnti_,
phy_interface_stack_lte* phy_, phy_interface_stack_lte* phy_,
srslog::basic_logger& logger_, srslog::basic_logger& logger_,
uint32_t nof_cells_, uint32_t nof_cells_,
srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool_, srsran::obj_pool_itf<ue_cc_softbuffers>* softbuffer_pool_) :
uint32_t nof_rx_harq_proc_,
uint32_t nof_tx_harq_proc_) :
rnti(rnti_), rnti(rnti_),
nof_prb(nof_prb_),
sched(sched_), sched(sched_),
rrc(rrc_), rrc(rrc_),
rlc(rlc_), rlc(rlc_),
@ -213,8 +210,6 @@ ue::ue(uint16_t rnti_,
mch_mac_msg_dl(10, logger_), mch_mac_msg_dl(10, logger_),
mac_msg_ul(20, logger_), mac_msg_ul(20, logger_),
pdus(logger_), pdus(logger_),
nof_rx_harq_proc(nof_rx_harq_proc_),
nof_tx_harq_proc(nof_tx_harq_proc_),
ta_fsm(this), ta_fsm(this),
softbuffer_pool(softbuffer_pool_) 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 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* srsran_softbuffer_tx_t*

Write Preview
Loading…
Cancel
Save