Merge remote-tracking branch 'origin/issue_947' into integration_2025_w17 (!3380)

Issue 947 and compilation improvements

This MR started with a small commit (03c7f151) to close #947. Little did
I know that I would be taken in a long journey through OAI compilation
hell.

executables/nr-uesoftmodem.c

@@ -49,7 +49,6 @@
 #include "PHY/NR_TRANSPORT/nr_dlsch.h"
 //#include "../../SIMU/USER/init_lte.h"
 
-#include "RRC/LTE/rrc_vars.h"
 #include "PHY_INTERFACE/phy_interface_vars.h"
 #include "NR_IF_Module.h"
 #include "openair1/SIMULATION/TOOLS/sim.h"
@@ -64,7 +63,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "common/utils/LOG/vcd_signal_dumper.h"
 
 #include "UTIL/OPT/opt.h"
-#include "enb_config.h"
 #include "LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
 
 #include "intertask_interface.h"
@@ -90,7 +88,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "nr_nas_msg.h"
 #include <openair1/PHY/MODULATION/nr_modulation.h>
 #include "openair2/GNB_APP/gnb_paramdef.h"
-#include "pdcp.h"
 #include "actor.h"
 
 THREAD_STRUCT thread_struct;
@@ -302,7 +299,7 @@ void init_openair0()
 
 static void init_pdcp(int ue_id)
 {
-  if (get_softmodem_params()->nsa && nr_rlc_module_init(0) != 0) {
+  if (get_softmodem_params()->nsa && nr_rlc_module_init(NR_RLC_OP_MODE_UE) != 0) {
     LOG_I(RLC, "Problem at RLC initiation \n");
   }
   nr_pdcp_layer_init();

executables/nr-uesoftmodem.h

@@ -5,6 +5,9 @@
 #include "common/utils/threadPool/thread-pool.h"
 #include "PHY/defs_nr_UE.h"
 
+extern int NB_UE_INST;
+extern uint16_t ue_id_g;
+
 #define  CONFIG_HLP_IF_FREQ                "IF frequency for RF, if needed\n"
 #define  CONFIG_HLP_IF_FREQ_OFF            "UL IF frequency offset for RF, if needed\n"
 #define  CONFIG_HLP_DLSCH_PARA             "number of threads for dlsch processing 0 for no parallelization\n"

executables/position_interface.c

@@ -21,8 +21,6 @@
 
 #include "position_interface.h"
 
-extern uint16_t NB_UE_INST;
-
 static void read_position_coordinates(char *sectionName, position_t *position)
 {
   paramdef_t position_params[] = POSITION_CONFIG_PARAMS_DEF;
@@ -36,4 +34,4 @@ void get_position_coordinates(int Mod_id, position_t *position)
   char positionName[64];
   snprintf(positionName, sizeof(positionName), "position%d", Mod_id);
   read_position_coordinates(positionName, position);
-}
+}