Multi-user RACH

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -723,7 +723,6 @@ void nr_generate_Msg2(module_id_t module_idP,
   NR_RA_t                               *ra = &cc->ra[CC_id];
   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_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];
   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,
     locationAndBandwidth = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth;
     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;
   int rbStart = NRRIV2PRBOFFSET(locationAndBandwidth, 275);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -128,26 +128,25 @@ static inline uint8_t get_max_cces(uint8_t scs) {
 
 NR_ControlResourceSet_t *get_coreset(NR_BWP_Downlink_t *bwp,
                                      NR_SearchSpace_t *ss,
-                                     int ss_type) {
-  NR_ControlResourceSetId_t coreset_id = *ss->controlResourceSetId;
-  if (ss_type == 0) { // common search space
-    AssertFatal(coreset_id != 0, "coreset0 currently not supported\n");
-    NR_ControlResourceSet_t *coreset = bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonControlResourceSet;
-    AssertFatal(coreset_id == coreset->controlResourceSetId,
-                "ID of common ss coreset does not correspond to id set in the "
-                "search space\n");
-    return coreset;
-  } else {
-    const int n = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.count;
-    for (int i = 0; i < n; i++) {
-      NR_ControlResourceSet_t *coreset =
-          bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.array[i];
-      if (coreset_id == coreset->controlResourceSetId) {
-        return coreset;
-      }
+																		 int ss_type) {
+		NR_ControlResourceSetId_t coreset_id = *ss->controlResourceSetId;
+		if (ss_type == 0) { // common search space
+		  AssertFatal(coreset_id != 0, "coreset0 currently not supported\n");
+			NR_ControlResourceSet_t *coreset = bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonControlResourceSet;
+			AssertFatal(coreset_id == coreset->controlResourceSetId,
+			            "ID of common ss coreset does not correspond to id set in the "
+															                "search space\n");
+			return coreset;
+		} else {
+		  const int n = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.count;
+		  for (int i = 0; i < n; i++) {
+			  NR_ControlResourceSet_t *coreset = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list.array[i];
+				if (coreset_id == coreset->controlResourceSetId) {
+				  return coreset;
+				}
+			}
+		  AssertFatal(0, "Couldn't find coreset with id %ld\n", coreset_id);
     }
-    AssertFatal(0, "Couldn't find coreset with id %ld\n", coreset_id);
-  }
 }
 
 NR_SearchSpace_t *get_searchspace(