Resolved errors on multi user

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -874,11 +874,11 @@ void nr_generate_Msg2(module_id_t module_idP,
     nr_configure_dci(nr_mac,
                      pdcch_pdu_rel15,
                      RA_rnti,
-    	               ss,
-	                   coreset,
-	                   scc,
-	  	               bwp,
-		                 ra->beam_id,
+    	             ss,
+	             coreset,
+	             scc,
+	  	     bwp,
+		     ra->beam_id,
                      aggregation_level,
                      CCEIndex);
 
@@ -944,7 +944,6 @@ void nr_generate_Msg2(module_id_t module_idP,
     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);
 }
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -128,25 +128,26 @@ 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;
-				}
-			}
-		  AssertFatal(0, "Couldn't find coreset with id %ld\n", coreset_id);
+				     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);
+  }
 }
 
 NR_SearchSpace_t *get_searchspace(
@@ -481,7 +482,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
   gNB_MAC_INST                        *nr_mac  = RC.nrmac[Mod_idP];
   NR_COMMON_channels_t                *cc      = nr_mac->common_channels;
   NR_ServingCellConfigCommon_t        *scc     = cc->ServingCellConfigCommon;
-
+  
   const int bwp_id = sched_ctrl->active_bwp->bwp_Id;
   const int nrOfLayers = 1;
   const int mcs = sched_ctrl->mcs;