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

suppress scheduler warning for failed PUCCH allocation for 6 PRBs

Browse Source
master
Andre Puschmann 6 years ago
parent 5a3fa7c305
commit c35b467d57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
srsenb/src/mac/scheduler.cc
Unescape Escape View File

@ -876,12 +876,12 @@ int sched::ul_sched(uint32_t tti, srsenb::sched_interface::ul_sched_res_t* sched
// Allocate PUCCH resources // Allocate PUCCH resources
if (cfg.nrb_pucch >= 0) { if (cfg.nrb_pucch >= 0) {
ul_harq_proc::ul_alloc_t pucch = {0, (uint32_t) cfg.nrb_pucch}; ul_harq_proc::ul_alloc_t pucch = {0, (uint32_t) cfg.nrb_pucch};
if(!ul_metric->update_allocation(pucch)) { if (!ul_metric->update_allocation(pucch) and cfg.cell.nof_prb != 6) {
log_h->warning("SCHED: There was a collision with the PUCCH (%d, %d)\n", pucch.RB_start, pucch.RB_start+pucch.L); log_h->warning("SCHED: There was a collision with the PUCCH (%d, %d)\n", pucch.RB_start, pucch.RB_start+pucch.L);
} }
pucch.RB_start = cfg.cell.nof_prb-cfg.nrb_pucch; pucch.RB_start = cfg.cell.nof_prb-cfg.nrb_pucch;
pucch.L = (uint32_t) cfg.nrb_pucch; pucch.L = (uint32_t) cfg.nrb_pucch;
if(!ul_metric->update_allocation(pucch)) { if (!ul_metric->update_allocation(pucch) and cfg.cell.nof_prb != 6) {
log_h->warning("SCHED: There was a collision with the PUCCH (%d, %d)\n", pucch.RB_start, pucch.RB_start+pucch.L); log_h->warning("SCHED: There was a collision with the PUCCH (%d, %d)\n", pucch.RB_start, pucch.RB_start+pucch.L);
} }
} else { } else {

Write Preview
Loading…
Cancel
Save