Commit cf54ec02 authored by francescomani's avatar francescomani

fix conflict not detected in sib1 generation + some cleanup

parent 80941d1b
...@@ -950,11 +950,11 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -950,11 +950,11 @@ void nr_generate_Msg2(module_id_t module_idP,
nr_configure_dci(nr_mac, nr_configure_dci(nr_mac,
pdcch_pdu_rel15, pdcch_pdu_rel15,
RA_rnti, RA_rnti,
ss, ss,
coreset, coreset,
scc, scc,
bwp, bwp,
ra->beam_id, ra->beam_id,
aggregation_level, aggregation_level,
CCEIndex); CCEIndex);
......
...@@ -410,13 +410,21 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP, ...@@ -410,13 +410,21 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
nr_configure_pdcch(gNB_mac, nr_configure_pdcch(gNB_mac,
pdcch_pdu_rel15, pdcch_pdu_rel15,
SI_RNTI,
gNB_mac->sched_ctrlCommon->search_space, gNB_mac->sched_ctrlCommon->search_space,
gNB_mac->sched_ctrlCommon->coreset, gNB_mac->sched_ctrlCommon->coreset,
scc, scc,
bwp, bwp);
gNB_mac->sched_ctrlCommon->aggregation_level,
gNB_mac->sched_ctrlCommon->cce_index); 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);
int dci_formats[2]; int dci_formats[2];
int rnti_types[2]; int rnti_types[2];
...@@ -504,4 +512,4 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP) ...@@ -504,4 +512,4 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
gNB_mac->TX_req[CC_id].SFN = frameP; gNB_mac->TX_req[CC_id].SFN = frameP;
gNB_mac->TX_req[CC_id].Slot = slotP; gNB_mac->TX_req[CC_id].Slot = slotP;
} }
} }
\ No newline at end of file
...@@ -506,6 +506,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac, ...@@ -506,6 +506,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac,
uint8_t beam_index, uint8_t beam_index,
uint8_t aggregation_level, uint8_t aggregation_level,
int CCEIndex) { int CCEIndex) {
pdcch_pdu->dci_pdu.RNTI[pdcch_pdu->numDlDci]=rnti; pdcch_pdu->dci_pdu.RNTI[pdcch_pdu->numDlDci]=rnti;
if (coreset->pdcch_DMRS_ScramblingID != NULL && if (coreset->pdcch_DMRS_ScramblingID != NULL &&
...@@ -701,7 +702,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP, ...@@ -701,7 +702,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
sched_ctrl->coreset, sched_ctrl->coreset,
scc, scc,
bwp, bwp,
UE_beam_index, UE_beam_index,
sched_ctrl->aggregation_level, sched_ctrl->aggregation_level,
sched_ctrl->cce_index); sched_ctrl->cce_index);
pdcch_pdu_rel15->numDlDci++; pdcch_pdu_rel15->numDlDci++;
......
...@@ -787,9 +787,10 @@ void nr_schedule_ulsch(module_id_t module_id, ...@@ -787,9 +787,10 @@ void nr_schedule_ulsch(module_id_t module_id,
sched_ctrl->coreset, sched_ctrl->coreset,
scc, scc,
sched_ctrl->active_bwp, sched_ctrl->active_bwp,
UE_info->UE_beam_index[UE_id], UE_info->UE_beam_index[UE_id],
sched_ctrl->aggregation_level, sched_ctrl->aggregation_level,
sched_ctrl->cce_index); sched_ctrl->cce_index);
pdcch_pdu_rel15->numDlDci++; pdcch_pdu_rel15->numDlDci++;
dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET]; 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