nr-ip-over-LTE: Add checks for noS1 use case (nr-UE side)

executables/nr-softmodem.c

@@ -989,7 +989,8 @@ int main( int argc, char **argv )
     flexran_agent_start(i);
   }
 
-  init_pdcp();
+  if(IS_SOFTMODEM_NOS1)
+	  init_pdcp();
 
   // init UE_PF_PO and mutex lock
   pthread_mutex_init(&ue_pf_po_mutex, NULL);

executables/nr-ue.c

@@ -45,6 +45,7 @@
 #include "common/utils/LOG/log.h"
 #include "common/utils/system.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
+#include "executables/nr-softmodem.h"
 
 #include "T.h"
 
@@ -383,12 +384,14 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
 #endif
   }
 
-  //Hardcoded rnti value
-  protocol_ctxt_t ctxt;
-  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO,
+  if(IS_SOFTMODEM_NOS1){
+	  //Hardcoded rnti value
+	  protocol_ctxt_t ctxt;
+	  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO,
                                    0x1234, proc->frame_rx,
                                    proc->nr_tti_rx, 0);
-  pdcp_run(&ctxt);
+	  pdcp_run(&ctxt);
+  }
   // no UL for now
   /*
   if (UE->mac_enabled==1) {

executables/nr-uesoftmodem.c

@@ -681,10 +681,11 @@ void init_pdcp(void) {
   if (IS_SOFTMODEM_NOKRNMOD)
     pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
 
-  if (rlc_module_init() != 0) {
+  /*if (rlc_module_init() != 0) {
 	  LOG_I(RLC, "Problem at RLC initiation \n");
   }
   pdcp_layer_init();
+  nr_ip_over_LTE_DRB_preconfiguration();*/
   pdcp_module_init(pdcp_initmask);
   pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
   pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
@@ -727,8 +728,8 @@ int main( int argc, char **argv ) {
     if (init_opt() == -1)
       LOG_E(OPT,"failed to run OPT \n");
   }
-  //Add --nr-ip-over-lte option check here
-  init_pdcp();
+  if(IS_SOFTMODEM_NOS1)
+	  init_pdcp();
 
   /*
 #ifdef PDCP_USE_NETLINK