mirror of https://github.com/PentHertz/srsLTE.git
sched,nr: forward SRs present in PUCCH from MAC to scheduler
This commit is contained in:
parent
5a45767c73
commit
aabec3d7af
|
@ -339,6 +339,11 @@ bool mac_nr::handle_uci_data(const uint16_t rnti, const srsran_uci_cfg_nr_t& cfg
|
||||||
bool is_ok = (value.ack[i] == 1) and value.valid;
|
bool is_ok = (value.ack[i] == 1) and value.valid;
|
||||||
sched.dl_ack_info(rnti, 0, ack_bit->pid, 0, is_ok);
|
sched.dl_ack_info(rnti, 0, ack_bit->pid, 0, is_ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Process SR
|
||||||
|
if (value.valid and value.sr > 0) {
|
||||||
|
sched.ul_sr_info(pdsch_slot - TX_ENB_DELAY, cfg_.pucch.rnti);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,10 +119,12 @@ void ue::new_slot(slot_point pdcch_slot)
|
||||||
auto& cc = carriers[ue_cc_cfg.cc];
|
auto& cc = carriers[ue_cc_cfg.cc];
|
||||||
if (cc != nullptr) {
|
if (cc != nullptr) {
|
||||||
// Discount UL HARQ pending bytes to BSR
|
// Discount UL HARQ pending bytes to BSR
|
||||||
for (uint32_t pid = 0; pid < cc->harq_ent.nof_dl_harqs(); ++pid) {
|
for (uint32_t pid = 0; pid < cc->harq_ent.nof_ul_harqs(); ++pid) {
|
||||||
ul_pending_bytes -= cc->harq_ent.ul_harq(pid).tbs();
|
if (not cc->harq_ent.ul_harq(pid).empty()) {
|
||||||
if (last_sr_slot.valid() and cc->harq_ent.ul_harq(pid).harq_slot_tx() > last_sr_slot) {
|
ul_pending_bytes -= cc->harq_ent.ul_harq(pid).tbs();
|
||||||
last_sr_slot.clear();
|
if (last_sr_slot.valid() and cc->harq_ent.ul_harq(pid).harq_slot_tx() > last_sr_slot) {
|
||||||
|
last_sr_slot.clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue