Skip to content

O
OpenXG-RAN
Commit a191f7f2 authored by Sakthivel Velumani's avatar Sakthivel Velumani
Browse files
Options

bugfix from previous commit

parent 8adfe07b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @ a191f7f2
...@@ -681,7 +681,7 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -681,7 +681,7 @@ void nr_generate_Msg2(module_id_t module_idP,
dci_pdu_rel15[0].mcs, dci_pdu_rel15[0].mcs,
dci_pdu_rel15[0].tb_scaling); dci_pdu_rel15[0].tb_scaling);
nr_configure_pdcch(nr_mac, pdcch_pdu_rel15, RA_rnti, 0, ss, scc, bwp); nr_configure_pdcch(nr_mac, pdcch_pdu_rel15, UE_id, RA_rnti, 0, ss, scc, bwp);
LOG_I(MAC, "Frame %d: Subframe %d : Adding common DL DCI for RA_RNTI %x\n", frameP, slotP, RA_rnti); LOG_I(MAC, "Frame %d: Subframe %d : Adding common DL DCI for RA_RNTI %x\n", frameP, slotP, RA_rnti);
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @ a191f7f2
...@@ -419,6 +419,7 @@ int configure_fapi_dl_pdu(int Mod_idP, ...@@ -419,6 +419,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
int ret = nr_configure_pdcch(nr_mac, int ret = nr_configure_pdcch(nr_mac,
pdcch_pdu_rel15, pdcch_pdu_rel15,
UE_id, UE_id,
UE_list->rnti[UE_id],
1, // ue-specific 1, // ue-specific
ss, ss,
scc, scc,
...@@ -1086,6 +1087,7 @@ void schedule_fapi_ul_pdu(int Mod_idP, ...@@ -1086,6 +1087,7 @@ void schedule_fapi_ul_pdu(int Mod_idP,
int ret = nr_configure_pdcch(nr_mac, int ret = nr_configure_pdcch(nr_mac,
pdcch_pdu_rel15, pdcch_pdu_rel15,
UE_id,
UE_list->rnti[UE_id], UE_list->rnti[UE_id],
1, // ue-specific, 1, // ue-specific,
ss, ss,
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @ a191f7f2
...@@ -413,6 +413,7 @@ void nr_configure_css_dci_initial(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu, ...@@ -413,6 +413,7 @@ void nr_configure_css_dci_initial(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
int nr_configure_pdcch(gNB_MAC_INST *nr_mac, int nr_configure_pdcch(gNB_MAC_INST *nr_mac,
nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu, nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
int UE_id, int UE_id,
rnti_t rnti,
int ss_type, int ss_type,
NR_SearchSpace_t *ss, NR_SearchSpace_t *ss,
NR_ServingCellConfigCommon_t *scc, NR_ServingCellConfigCommon_t *scc,
...@@ -421,7 +422,6 @@ int nr_configure_pdcch(gNB_MAC_INST *nr_mac, ...@@ -421,7 +422,6 @@ int nr_configure_pdcch(gNB_MAC_INST *nr_mac,
int CCEIndex = -1; int CCEIndex = -1;
int cid = 0; int cid = 0;
NR_ControlResourceSet_t *coreset = NULL; NR_ControlResourceSet_t *coreset = NULL;
uint16_t rnti = nr_mac->UE_list.rnti[UE_id];
if (bwp) { // This is not the InitialBWP if (bwp) { // This is not the InitialBWP
NR_ControlResourceSet_t *temp_coreset; NR_ControlResourceSet_t *temp_coreset;
......
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @ a191f7f2
...@@ -214,6 +214,7 @@ void find_search_space(int ss_type, ...@@ -214,6 +214,7 @@ void find_search_space(int ss_type,
int nr_configure_pdcch(gNB_MAC_INST *nr_mac, int nr_configure_pdcch(gNB_MAC_INST *nr_mac,
nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu, nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
int UE_id, int UE_id,
rnti_t rnti,
int ss_type, int ss_type,
NR_SearchSpace_t *ss, NR_SearchSpace_t *ss,
NR_ServingCellConfigCommon_t *scc, NR_ServingCellConfigCommon_t *scc,
......
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