Review comments incorporated

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -376,8 +376,9 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
       uint8_t ra_index = 0;
       /* checking for free RA process */
       for(; ra_index < NR_NB_RA_PROC_MAX; ra_index++) {
-	      if(cc->ra[ra_index].state == RA_IDLE) break;
+        if(cc->ra[ra_index].state == RA_IDLE) break;
       }
+      if (ra_index == NR_NB_RA_PROC_MAX) LOG_E(MAC, "%s() %s:%d RA processes are not available for CFRA RNTI :%x\n", __FUNCTION__, __FILE__, __LINE__, rnti);
       NR_RA_t *ra = &cc->ra[ra_index];
       ra->secondaryCellGroup = secondaryCellGroup;
       if (secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated!=NULL) {
@@ -388,17 +389,17 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
           uint8_t num_preamble = cfra.resources.choice.ssb->ssb_ResourceList.list.count;
           ra->preambles.num_preambles = num_preamble;
           ra->preambles.preamble_list = (uint8_t *) malloc(num_preamble*sizeof(uint8_t));
-      for(int i=0; i<cc->num_active_ssb; i++) {
-        for(int j=0; j<num_preamble; j++) {
-	        if(cc->ssb_index[i] == secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink->cfra->resources.choice.ssb->ssb_ResourceList.list.array[i]->ssb) {
+          for(int i=0; i<cc->num_active_ssb; i++) {
+            for(int j=0; j<num_preamble; j++) {
+	      if(cc->ssb_index[i] == secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink->cfra->resources.choice.ssb->ssb_ResourceList.list.array[i]->ssb) {
 	    //one dedicated preamble for each beam
 	        ra->preambles.preamble_list[i] = secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink->cfra->resources.choice.ssb->ssb_ResourceList.list.array[i]->ra_PreambleIndex;
 	        break;	
-	        }
 	      }
+	    }
+          }
+        }
       }
-      }
-			}
       LOG_I(PHY,"Added new RA process for UE RNTI %04x with initial secondaryCellGroup\n", rnti);
     } else { // secondaryCellGroup has been updated
       const int UE_id = find_nr_UE_id(Mod_idP,rnti);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -330,7 +330,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
               "%s(): could not find CCE for UE %d\n",
               __func__,
               UE_id);
-
   nr_acknack_scheduling(module_id,
                         UE_id,
                         frame,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -455,12 +455,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac,
   if (ss->searchSpaceType->choice.ue_Specific->dci_Formats==NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0)
     pdcch_pdu->dci_pdu.beta_PDCCH_1_0[pdcch_pdu->numDlDci]=0;
 
-    pdcch_pdu->dci_pdu.powerControlOffsetSS[pdcch_pdu->numDlDci]=1;
-    pdcch_pdu->dci_pdu.precodingAndBeamforming[pdcch_pdu->numDlDci].numPRGs         = 1;
-    pdcch_pdu->dci_pdu.precodingAndBeamforming[pdcch_pdu->numDlDci].prgSize         = 275;
-    pdcch_pdu->dci_pdu.precodingAndBeamforming[pdcch_pdu->numDlDci].digBFInterfaces = 1;
-    pdcch_pdu->dci_pdu.precodingAndBeamforming[pdcch_pdu->numDlDci].PMIdx[0]        = 0;
-    pdcch_pdu->dci_pdu.precodingAndBeamforming[pdcch_pdu->numDlDci].beamIdx[0]      = beam_index;
+  pdcch_pdu->dci_pdu.powerControlOffsetSS[pdcch_pdu->numDlDci]=1;
 
 }		
 void nr_fill_nfapi_dl_pdu(int Mod_idP,

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -206,6 +206,8 @@ typedef struct {
   uint8_t max_association_period;
   //SSB index
   uint8_t ssb_index[MAX_NUM_OF_SSB];
+  //CB preambles for each SSB
+  uint8_t cb_preambles_per_ssb;
 } NR_COMMON_channels_t;