mirror of https://github.com/PentHertz/srsLTE.git
sched,bugfix - reset harq used for msg3 correctly
This commit is contained in:
parent
d1483dc0f8
commit
fbbbf7886c
|
@ -175,7 +175,7 @@ public:
|
||||||
};
|
};
|
||||||
struct ul_alloc_t {
|
struct ul_alloc_t {
|
||||||
enum type_t { NEWTX, NOADAPT_RETX, ADAPT_RETX };
|
enum type_t { NEWTX, NOADAPT_RETX, ADAPT_RETX };
|
||||||
bool is_msg3;
|
bool is_msg3 = false;
|
||||||
size_t dci_idx;
|
size_t dci_idx;
|
||||||
type_t type;
|
type_t type;
|
||||||
uint16_t rnti;
|
uint16_t rnti;
|
||||||
|
|
|
@ -283,6 +283,7 @@ void ul_harq_proc::reset_pending_data()
|
||||||
reset_pending_data_common();
|
reset_pending_data_common();
|
||||||
if (is_empty(0)) {
|
if (is_empty(0)) {
|
||||||
pending_data = 0;
|
pending_data = 0;
|
||||||
|
is_msg3_ = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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(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(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 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 {
|
} else {
|
||||||
CONDERROR(pusch_ptr->current_tx_nb == 0, "UL retx has to have nof tx > 0");
|
CONDERROR(pusch_ptr->current_tx_nb == 0, "UL retx has to have nof tx > 0");
|
||||||
if (not h.active) {
|
if (not h.active) {
|
||||||
|
|
Loading…
Reference in New Issue