Commit 88bbbe0a authored by kn.raju's avatar kn.raju

changes in vrb_map for multi-rach and resolved indentation

parent a2f28902
...@@ -771,7 +771,6 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -771,7 +771,6 @@ void nr_generate_Msg2(module_id_t module_idP,
locationAndBandwidth = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth; locationAndBandwidth = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth;
dci10_bw = NRRIV2BW(locationAndBandwidth,275); dci10_bw = NRRIV2BW(locationAndBandwidth,275);
} }
LOG_I(MAC, "[RAPROC] Scheduling common search space DCI type 1 dlBWP BW %d\n", dci10_bw);
uint16_t *vrb_map = cc[CC_id].vrb_map; uint16_t *vrb_map = cc[CC_id].vrb_map;
int rbStart = NRRIV2PRBOFFSET(locationAndBandwidth, 275); int rbStart = NRRIV2PRBOFFSET(locationAndBandwidth, 275);
...@@ -944,6 +943,7 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -944,6 +943,7 @@ void nr_generate_Msg2(module_id_t module_idP,
pdcch_pdu_rel15->numDlDci++; pdcch_pdu_rel15->numDlDci++;
} }
} }
}
fill_dci_pdu_rel15(scc,ra->secondaryCellGroup,pdcch_pdu_rel15, dci_pdu_rel15, dci_formats, rnti_types,dci10_bw,ra->bwp_id); fill_dci_pdu_rel15(scc,ra->secondaryCellGroup,pdcch_pdu_rel15, dci_pdu_rel15, dci_formats, rnti_types,dci10_bw,ra->bwp_id);
} }
......
...@@ -128,7 +128,7 @@ static inline uint8_t get_max_cces(uint8_t scs) { ...@@ -128,7 +128,7 @@ static inline uint8_t get_max_cces(uint8_t scs) {
NR_ControlResourceSet_t *get_coreset(NR_BWP_Downlink_t *bwp, NR_ControlResourceSet_t *get_coreset(NR_BWP_Downlink_t *bwp,
NR_SearchSpace_t *ss, NR_SearchSpace_t *ss,
int ss_type) { int ss_type) {
NR_ControlResourceSetId_t coreset_id = *ss->controlResourceSetId; NR_ControlResourceSetId_t coreset_id = *ss->controlResourceSetId;
if (ss_type == 0) { // common search space if (ss_type == 0) { // common search space
AssertFatal(coreset_id != 0, "coreset0 currently not supported\n"); AssertFatal(coreset_id != 0, "coreset0 currently not supported\n");
...@@ -482,7 +482,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP, ...@@ -482,7 +482,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
gNB_MAC_INST *nr_mac = RC.nrmac[Mod_idP]; gNB_MAC_INST *nr_mac = RC.nrmac[Mod_idP];
NR_COMMON_channels_t *cc = nr_mac->common_channels; NR_COMMON_channels_t *cc = nr_mac->common_channels;
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon; NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
const int bwp_id = sched_ctrl->active_bwp->bwp_Id; const int bwp_id = sched_ctrl->active_bwp->bwp_Id;
const int nrOfLayers = 1; const int nrOfLayers = 1;
const int mcs = sched_ctrl->mcs; const int mcs = sched_ctrl->mcs;
......
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