CellID taken from config file

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -184,6 +184,7 @@ void config_nr_mib(int Mod_idP,
 
 void config_common(int Mod_idP, 
                    int CC_idP,
+		   int cellid,
                    int nr_bandP,
                    uint64_t dl_CarrierFreqP,
                    uint32_t dl_BandwidthP
@@ -193,6 +194,8 @@ void config_common(int Mod_idP,
 
   int mu = 1;
 
+  cfg->sch_config.physical_cell_id.value = cellid;
+
   // FDD
   cfg->subframe_config.duplex_mode.value                          = 1;
   cfg->subframe_config.duplex_mode.tl.tag = NFAPI_SUBFRAME_CONFIG_DUPLEX_MODE_TAG;
@@ -232,6 +235,7 @@ void config_common(int Mod_idP,
 
 int rrc_mac_config_req_gNB(module_id_t Mod_idP, 
                            int CC_idP,
+			   int cellid,
                            int p_gNB,
                            int nr_bandP,
                            uint64_t dl_CarrierFreqP,
@@ -261,6 +265,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
   if( servingcellconfigcommon != NULL ){
     config_common(Mod_idP, 
                   CC_idP,
+		  cellid,
                   nr_bandP,
                   dl_CarrierFreqP,
                   dl_BandwidthP

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -38,6 +38,7 @@ void mac_top_init_gNB(void);
 
 int rrc_mac_config_req_gNB(module_id_t Mod_idP, 
                            int CC_id,
+			   int cellid,
                            int p_gNB,
                            int nr_bandP,
                            uint64_t dl_CarrierFreqP,

openair2/RRC/NR/rrc_gNB.c

@@ -236,7 +236,7 @@ static void init_NR_SI(const protocol_ctxt_t* const ctxt_pP,
   RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].Ncp_UL          = configuration->UL_prefix_type[CC_id];
   RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].dl_CarrierFreq  = configuration->downlink_frequency[CC_id];
   RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].ul_CarrierFreq  = configuration->downlink_frequency[CC_id]+ configuration->uplink_frequency_offset[CC_id];
-  
+
   ///MIB
   RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].sizeof_MIB      = 0;
   RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].MIB             = (uint8_t*) malloc16(4);
@@ -264,6 +264,7 @@ static void init_NR_SI(const protocol_ctxt_t* const ctxt_pP,
   
   rrc_mac_config_req_gNB(ctxt_pP->module_id,
                          CC_id,
+			 RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].physCellId,
                          RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].p_gNB,
                          configuration->nr_band[CC_id],
                          RC.nrrrc[ctxt_pP->module_id]->carrier[CC_id].dl_CarrierFreq,