Skip to content

O
OpenXG-RAN
Commit a5ae96ea authored by kn.raju's avatar kn.raju
Browse files
Options

Multi-user RACH

parent f496a08a
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @ a5ae96ea
...@@ -723,7 +723,6 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -723,7 +723,6 @@ void nr_generate_Msg2(module_id_t module_idP,
NR_RA_t *ra = &cc->ra[CC_id]; NR_RA_t *ra = &cc->ra[CC_id];
NR_SearchSpace_t *ss = ra->ra_ss; NR_SearchSpace_t *ss = ra->ra_ss;
nfapi_nr_dl_tti_request_body_t *dl_req = &nr_mac->DL_req[CC_id].dl_tti_request_body; nfapi_nr_dl_tti_request_body_t *dl_req = &nr_mac->DL_req[CC_id].dl_tti_request_body;
// nfapi_nr_pdu_t *tx_req = &nr_mac->TX_req[CC_id].pdu_list[nr_mac->TX_req[CC_id].Number_of_PDUs];
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs]; nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t)); memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
...@@ -772,6 +771,7 @@ void nr_generate_Msg2(module_id_t module_idP, ...@@ -772,6 +771,7 @@ 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);
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @ a5ae96ea
...@@ -140,8 +140,7 @@ NR_ControlResourceSet_t *get_coreset(NR_BWP_Downlink_t *bwp, ...@@ -140,8 +140,7 @@ NR_ControlResourceSet_t *get_coreset(NR_BWP_Downlink_t *bwp,
} else { } else {
const int n = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.count; const int n = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.count;
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
NR_ControlResourceSet_t *coreset = NR_ControlResourceSet_t *coreset = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.array[i];
bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.array[i];
if (coreset_id == coreset->controlResourceSetId) { if (coreset_id == coreset->controlResourceSetId) {
return coreset; return 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