Commit cf54ec02 authored by francescomani's avatar francescomani

fix conflict not detected in sib1 generation + some cleanup

parent 80941d1b
......@@ -409,12 +409,20 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
dci_pdu_rel15[0].dmrs_sequence_initialization.val = pdsch_pdu_rel15->SCID;
nr_configure_pdcch(gNB_mac,
pdcch_pdu_rel15,
gNB_mac->sched_ctrlCommon->search_space,
gNB_mac->sched_ctrlCommon->coreset,
scc,
bwp);
nr_configure_dci(gNB_mac,
pdcch_pdu_rel15,
SI_RNTI,
gNB_mac->sched_ctrlCommon->search_space,
gNB_mac->sched_ctrlCommon->coreset,
scc,
bwp,
0, // beam index is not used in configure dci
gNB_mac->sched_ctrlCommon->aggregation_level,
gNB_mac->sched_ctrlCommon->cce_index);
......
......@@ -506,6 +506,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac,
uint8_t beam_index,
uint8_t aggregation_level,
int CCEIndex) {
pdcch_pdu->dci_pdu.RNTI[pdcch_pdu->numDlDci]=rnti;
if (coreset->pdcch_DMRS_ScramblingID != NULL &&
......
......@@ -790,6 +790,7 @@ void nr_schedule_ulsch(module_id_t module_id,
UE_info->UE_beam_index[UE_id],
sched_ctrl->aggregation_level,
sched_ctrl->cce_index);
pdcch_pdu_rel15->numDlDci++;
dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment