PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sched,bugfix - reset harq used for msg3 correctly

This commit is contained in:
Francisco 2021-03-10 21:36:04 +00:00 committed by Francisco Paisana
parent d1483dc0f8
commit fbbbf7886c
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsenb/hdr/stack/mac/sched_grid.h
View File

@ -175,7 +175,7 @@ public:
};
struct ul_alloc_t {
enum type_t { NEWTX, NOADAPT_RETX, ADAPT_RETX };
bool is_msg3;
bool is_msg3 = false;
size_t dci_idx;
type_t type;
uint16_t rnti;

1
srsenb/src/stack/mac/sched_ue_ctrl/sched_harq.cc
View File

@ -283,6 +283,7 @@ void ul_harq_proc::reset_pending_data()
reset_pending_data_common();
if (is_empty(0)) {
pending_data = 0;
is_msg3_ = false;
}
}

2
srsenb/test/mac/sched_ue_ded_test_suite.cc
View File

@ -191,6 +191,8 @@ int test_ul_sched_result(const sim_enb_ctxt_t& enb_ctxt, const sf_output_res_t&
CONDERROR(nof_retx != 0, "Invalid rv index for new tx");
CONDERROR(pusch_ptr->current_tx_nb != 0, "UL HARQ retxs need to have been previously transmitted");
CONDERROR(not h_inactive, "New tx for already active UL HARQ");
CONDERROR(not pusch_ptr->needs_pdcch and ue.msg3_tti_rx.is_valid() and sf_out.tti_rx > ue.msg3_tti_rx,
"In case of newtx, PDCCH allocation is required, unless it is Msg3");
} else {
CONDERROR(pusch_ptr->current_tx_nb == 0, "UL retx has to have nof tx > 0");
if (not h.active) {