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

fix cfi to cc assignment

This commit is contained in:
Francisco Paisana 2020-03-18 18:56:17 +00:00 committed by Francisco Paisana
parent 0770c13f08
commit 34bc48d31a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsenb/src/phy/sf_worker.cc
View File

@ -228,7 +228,6 @@ void sf_worker::work_imp()
// Configure DL subframe
dl_sf.tti = tti_tx_dl;
dl_sf.cfi = dl_grants[t_tx_dl][0].cfi;
dl_sf.sf_type = sf_type;
dl_sf.non_mbsfn_region = mbsfn_cfg.non_mbsfn_region_length;
@ -237,6 +236,7 @@ void sf_worker::work_imp()
// Process DL
for (uint32_t cc = 0; cc < cc_workers.size(); cc++) {
dl_sf.cfi = dl_grants[t_tx_dl][cc].cfi;
cc_workers[cc]->work_dl(dl_sf, phy->dl_grants[t_tx_dl][cc], phy->ul_grants[t_tx_ul][cc], &mbsfn_cfg);
}

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

@ -136,6 +136,8 @@ int test_pdcch_one_ue()
TESTASSERT(pdcch_result[1]->current_mask.count() == 1u << aggr_idx);
TESTASSERT(pdcch_result[1]->total_mask == (pdcch_result[0]->current_mask | pdcch_result[1]->current_mask));
TESTASSERT(std::count(dci_locs, dci_locs + nof_dci_locs, pdcch_result[0]->dci_pos.ncce) > 0);
srslte::logmap::get("TEST")->info("PDCCH alloc result: %s\n", pdcch.result_to_string(true).c_str());
}
TESTASSERT(tti_counter == nof_ttis);