Merge remote-tracking branch 'origin/nr-gnb-config-refactor' into integration_2025_w16 (!3293)

Cleanup and refactor initial gNB configuration

This is follow-up on !3048 (merged). Major changes in this MR:
- Add config functions to reduce redundant code repeated in multiple places in the file
- Add macros to reduce redundant code in gNB configuration
- Refactor RCconfig_NR_NG
- Cleanup obsolete and commented out code
- Refactor includes in executables/nr-gnb.c
- Introduce platform type plmn_id_t for consistency across the stack: F1AP, NGAP can now use the same struct type
- And other minor formatting

executables/nr-gnb.c

@@ -31,54 +31,45 @@
  */
 
 #define _GNU_SOURCE
-#include <pthread.h>
+#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
 
-#include "assertions.h"
-#include <common/utils/LOG/log.h>
-#include <common/utils/system.h>
-
-#include "PHY/types.h"
-
+#include <fcntl.h> // for SEEK_SET
+#include <pthread.h> // for pthread_join
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include "common/utils/LOG/log.h"
+#include "common/utils/system.h"
+#include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
+#include "openair1/PHY/NR_TRANSPORT/nr_dlsch.h"
+#include "openair1/PHY/NR_TRANSPORT/nr_ulsch.h"
+#include "NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "PHY/INIT/nr_phy_init.h"
-
+#include "PHY/MODULATION/nr_modulation.h"
+#include "PHY/NR_TRANSPORT/nr_transport_proto.h"
+#include "PHY/TOOLS/tools_defs.h"
+#include "PHY/defs_RU.h"
+#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
+#include "PHY/defs_nr_common.h"
+#include "PHY/impl_defs_nr.h"
+#include "SCHED_NR/fapi_nr_l1.h"
+#include "SCHED_NR/phy_frame_config_nr.h"
 #include "SCHED_NR/sched_nr.h"
-#include "SCHED_NR/fapi_nr_l1.h"
-#include "PHY/NR_TRANSPORT/nr_transport_proto.h"
-#include "PHY/MODULATION/nr_modulation.h"
-#include "PHY/NR_TRANSPORT/nr_dlsch.h"
-#include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
-#include "LAYER2/NR_MAC_gNB/mac_proto.h"
-
-#include "radio/COMMON/common_lib.h"
-#include "PHY/LTE_TRANSPORT/if4_tools.h"
-
-#include "PHY/phy_extern.h"
-
+#include "assertions.h"
 #include "common/ran_context.h"
-#include "RRC/LTE/rrc_extern.h"
-#include "PHY_INTERFACE/phy_interface.h"
 #include "common/utils/LOG/log.h"
-#include "UTIL/OTG/otg_tx.h"
-#include "UTIL/OTG/otg_externs.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-#include "UTIL/OPT/opt.h"
-#include "gnb_paramdef.h"
-
-#include <executables/softmodem-common.h>
-
-#include "T.h"
-#include "nfapi/oai_integration/vendor_ext.h"
 #include "executables/softmodem-common.h"
-#include <nfapi/oai_integration/nfapi_pnf.h>
-#include <openair1/PHY/NR_TRANSPORT/nr_ulsch.h>
-#include <openair1/PHY/NR_TRANSPORT/nr_dlsch.h>
-#include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "nfapi_nr_interface_scf.h"
+#include "notified_fifo.h"
+#include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
+#include "thread-pool.h"
+#include "time_meas.h"
+#include "utils.h"
 
-// #define USRP_DEBUG 1
-#include "executables/thread-common.h"
-
-//#define TICK_TO_US(ts) (ts.diff)
 #define TICK_TO_US(ts) (ts.trials==0?0:ts.diff/ts.trials)
 #define L1STATSSTRLEN 16384
 static void rx_func(processingData_L1_t *param);

executables/nr-softmodem.c

@@ -518,9 +518,9 @@ static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
   const gNB_RRC_INST* rrc = RC.nrrrc[0];
   assert(rrc != NULL && "rrc cannot be NULL");
 
-  const int mcc = rrc->configuration.mcc[0];
-  const int mnc = rrc->configuration.mnc[0];
-  const int mnc_digit_len = rrc->configuration.mnc_digit_length[0];
+  const int mcc = rrc->configuration.plmn[0].mcc;
+  const int mnc = rrc->configuration.plmn[0].mnc;
+  const int mnc_digit_len = rrc->configuration.plmn[0].mnc_digit_length;
   // const ngran_node_t node_type = rrc->node_type;
   int nb_id = 0;
   int cu_du_id = 0;
@@ -597,8 +597,6 @@ int main( int argc, char **argv ) {
   char *pckg = strdup(OAI_PACKAGE_VERSION);
   LOG_I(HW, "Version: %s\n", pckg);
 
-  // don't create if node doesn't connect to RRC/S1/GTP
-  const ngran_node_t node_type = get_node_type();
   // Init RAN context
   if (!(CONFIG_ISFLAGSET(CONFIG_ABORT)))
     NRRCConfig();
@@ -613,6 +611,9 @@ int main( int argc, char **argv ) {
       RCconfig_nr_prs();
   }
 
+  // don't create if node doesn't connect to RRC/S1/GTP
+  const ngran_node_t node_type = get_node_type();
+
   if (NFAPI_MODE != NFAPI_MODE_PNF) {
     int ret = create_gNB_tasks(node_type, uniqCfg);
     AssertFatal(ret == 0, "cannot create ITTI tasks\n");