Merge remote-tracking branch 'origin/handle_issue_730' into integration_2024_w06

executables/nr-softmodem.c

@@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf
 
   RCconfig_verify(cfg, node_type);
 
-  RCconfig_NR_L1();
   RCconfig_nr_prs();
 
   if (RC.nb_nr_macrlc_inst > 0)
@@ -682,11 +681,13 @@ int main( int argc, char **argv ) {
 #endif
   LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
 
-  if (RC.nb_nr_L1_inst > 0)
-    RCconfig_NR_L1();
 
   // don't create if node doesn't connect to RRC/S1/GTP
   const ngran_node_t node_type = get_node_type();
+
+  if (RC.nb_nr_L1_inst > 0)
+    RCconfig_NR_L1();
+
   if (NFAPI_MODE != NFAPI_MODE_PNF) {
     int ret = create_gNB_tasks(node_type, uniqCfg);
     AssertFatal(ret == 0, "cannot create ITTI tasks\n");

openair2/GNB_APP/gnb_config.c

@@ -809,7 +809,6 @@ void RCconfig_nr_prs(void)
 void RCconfig_NR_L1(void)
 {
   int j = 0;
-
   if (RC.gNB == NULL) {
     RC.gNB = (PHY_VARS_gNB **)malloc((1 + NUMBER_OF_gNB_MAX) * sizeof(PHY_VARS_gNB *));
     LOG_I(NR_PHY, "RC.gNB = %p\n", RC.gNB);