merge nfapi_cleanup

cmake_targets/CMakeLists.txt

@@ -664,12 +664,7 @@ add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION w
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
-#############################################################################
-# Flag for UE compilation to avoid issues in common eNB/UE PDCP/RLC functions
-#############################################################################
-
-add_boolean_option(UETARGET                 False         "set UE as target for compiler")
-
+########################
 # Include order
 ##########################
 add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
@@ -2292,6 +2287,7 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
     ${T_SOURCE}
     ${CONFIG_SOURCES}
     ${SHLIB_LOADER_SOURCES}
+    ${NFAPI_USER_DIR}/nfapi.c
     )
   target_link_libraries (${myExe}
 

cmake_targets/build_oai

@@ -70,7 +70,6 @@ DISABLE_LOG_X="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
 UE_NAS_USE_TUN="False"
-UETARGET="False"
 BASIC_SIMULATOR=0
 trap handle_ctrl_c INT
 
@@ -219,7 +218,6 @@ function main() {
 	    shift;;
        --UE)
             UE=1
-            UETARGET="True"
             echo_info "Will compile UE"
             shift;;
        --mu)
@@ -549,9 +547,6 @@ function main() {
     echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
     echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"        >>  $cmake_file
-    if [ "$UE" = 1 ] ; then
-       echo "set (UETARGET $UETARGET )"                   >> $cmake_file
-    fi
     if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
      echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
      echo "set (LINUX True )"              >>  $cmake_file
@@ -945,7 +940,6 @@ function main() {
     echo "set (USRP_REC_PLAY $USRP_REC_PLAY)"         >>  $cmake_file
     echo "set (LINUX True )"                          >>  $cmake_file
     echo "set (PDCP_USE_NETLINK True )"               >>  $cmake_file
-    echo "set (UETARGET True )"                       >>  $cmake_file
     echo "set (BASIC_SIMULATOR \"True\" )"            >>  $cmake_file
 #    echo "set (UE_NAS_USE_TUN \"True\" )"             >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)' >> $cmake_file

nfapi/oai_integration/nfapi.c

@@ -21,31 +21,55 @@
 
 #include <stdio.h>
 #include <pthread.h>
+#include "nfapi/oai_integration/vendor_ext.h"
+#include "common/utils/LOG/log.h"
+static char nfapi_str_mode[6][24] = {"MONOLITHIC","PNF","VNF","UE_STUB_PNF","UE_STUB_OFFNET","<UNKNOWN NFAPI MODE>"};
 
-void set_thread_priority(int priority)
-{
-  //printf("%s(priority:%d)\n", __FUNCTION__, priority);
+typedef struct {
+  nfapi_mode_t nfapi_mode;
+} nfapi_params_t;
 
-  pthread_attr_t ptAttr;
+static nfapi_params_t nfapi_params;
 
+void set_thread_priority(int priority) {
+  //printf("%s(priority:%d)\n", __FUNCTION__, priority);
+  pthread_attr_t ptAttr;
   struct sched_param schedParam;
   schedParam.__sched_priority = priority; //79;
-  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0)
-  {
+
+  if(sched_setscheduler(0, SCHED_RR, &schedParam) != 0) {
     printf("Failed to set scheduler to SCHED_RR\n");
   }
 
-  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0)
-  {
+  if(pthread_attr_setschedpolicy(&ptAttr, SCHED_RR) != 0) {
     printf("Failed to set pthread sched policy SCHED_RR\n");
   }
 
   pthread_attr_setinheritsched(&ptAttr, PTHREAD_EXPLICIT_SCHED);
-
   struct sched_param thread_params;
   thread_params.sched_priority = 20;
-  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0)
-  {
+
+  if(pthread_attr_setschedparam(&ptAttr, &thread_params) != 0) {
     printf("failed to set sched param\n");
   }
 }
+
+char *nfapi_get_strmode(void) {
+  if (nfapi_params.nfapi_mode > NFAPI_MODE_UNKNOWN)
+    return nfapi_str_mode[NFAPI_MODE_UNKNOWN];
+
+  return nfapi_str_mode[nfapi_params.nfapi_mode];
+}
+
+void nfapi_logmode() {
+  LOG_I(ENB_APP,"nfapi running mode: %s\n",nfapi_get_strmode());
+}
+
+nfapi_mode_t nfapi_getmode(void) {
+  return nfapi_params.nfapi_mode;
+}
+
+void nfapi_setmode(nfapi_mode_t nfapi_mode) {
+  nfapi_params.nfapi_mode = nfapi_mode;
+  nfapi_logmode();
+}

nfapi/oai_integration/nfapi_pnf.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "debug.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 #include "nfapi_pnf_interface.h"
 #include "nfapi.h"
 #include "nfapi_pnf.h"
@@ -76,7 +77,7 @@ extern void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame, int subfra
 extern void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame, int subframe, L1_rxtx_proc_t *proc, nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
 extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, nfapi_dl_config_request_pdu_t *dl_config_pdu, uint8_t *sdu);
 
-extern uint8_t  nfapi_mode;
+
 
 nfapi_tx_request_pdu_t *tx_request_pdu[1023][10][10]; // [frame][subframe][max_num_pdus]
 
@@ -485,7 +486,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
   // to keep only the necessary just to keep the nfapi FSM rolling by sending a dummy response.
   LTE_DL_FRAME_PARMS *fp;
 
-  if (nfapi_mode!=3) {
+  if (NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
     fp = &eNB->frame_parms;
   } else {
@@ -647,7 +648,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
     num_tlv++;
   }
 
-  if(nfapi_mode!=3) {
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     printf("[PNF] CONFIG_REQUEST[num_tlv:%d] TLVs processed:%d\n", req->num_tlv, num_tlv);
     printf("[PNF] Simulating PHY CONFIG - DJP\n");
     PHY_Config_t phy_config;
@@ -672,7 +673,7 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap
   nfapi_pnf_config_resp(config, &nfapi_resp);
   printf("[PNF] Sent NFAPI_CONFIG_RESPONSE phy_id:%d\n", phy_info->id);
 
-  if(nfapi_mode ==3)
+  if(NFAPI_MODE==NFAPI_UE_STUB_PNF)
     free(fp);
 
   return 0;
@@ -1023,7 +1024,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi
   p7_config->tx_req = &pnf_phy_tx_req;
   p7_config->lbt_dl_config_req = &pnf_phy_lbt_dl_config_req;
 
-  if (nfapi_mode==3) {
+  if (NFAPI_MODE==NFAPI_UE_STUB_PNF) {
     p7_config->dl_config_req = &memcpy_dl_config_req;
     p7_config->ul_config_req = &memcpy_ul_config_req;
     p7_config->hi_dci0_req = &memcpy_hi_dci0_req;
@@ -1080,7 +1081,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfapi
   //phy_init_RU(RC.ru[0]);
   printf("[PNF] About to call init_eNB_afterRU()\n");
 
-  if (nfapi_mode != 3) {
+  if (NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
     init_eNB_afterRU();
   }
 
@@ -1364,8 +1365,8 @@ void *pnf_start_thread(void *ptr) {
 void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port) {
   printf("%s() PNF\n\n\n\n\n\n", __FUNCTION__);
 
-  if(nfapi_mode!=3) {
-    nfapi_mode = 1;  // PNF!
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
+    nfapi_setmode(NFAPI_PNF);  // PNF!
   }
 
   nfapi_pnf_config_t *config = nfapi_pnf_config_create();

nfapi/oai_integration/nfapi_vnf.c

@@ -904,10 +904,10 @@ void vnf_start_thread(void *ptr) {
 }
 
 static vnf_info vnf;
-extern uint8_t nfapi_mode;
+
 /*------------------------------------------------------------------------------*/
 void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port) {
-  nfapi_mode = 2;
+  nfapi_setmode(NFAPI_MODE_VNF);
   memset(&vnf, 0, sizeof(vnf));
   memset(vnf.p7_vnfs, 0, sizeof(vnf.p7_vnfs));
   vnf.p7_vnfs[0].timing_window = 32;

nfapi/oai_integration/vendor_ext.h

 /*
  * Copyright 2017 Cisco Systems, Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,48 +20,62 @@
 #include "nfapi_interface.h"
 
 typedef enum {
-	P5_VENDOR_EXT_REQ = NFAPI_VENDOR_EXT_MSG_MIN,
-	P5_VENDOR_EXT_RSP,
+  P5_VENDOR_EXT_REQ = NFAPI_VENDOR_EXT_MSG_MIN,
+  P5_VENDOR_EXT_RSP,
 
-	P7_VENDOR_EXT_REQ,
-	P7_VENDOR_EXT_IND
+  P7_VENDOR_EXT_REQ,
+  P7_VENDOR_EXT_IND
 
 } vendor_ext_message_id_e;
 
 typedef struct {
-	nfapi_p4_p5_message_header_t header;
-	uint16_t dummy1;
-	uint16_t dummy2;
+  nfapi_p4_p5_message_header_t header;
+  uint16_t dummy1;
+  uint16_t dummy2;
 } vendor_ext_p5_req;
 
 typedef struct {
-	nfapi_p4_p5_message_header_t header;
-	uint16_t error_code;
+  nfapi_p4_p5_message_header_t header;
+  uint16_t error_code;
 } vendor_ext_p5_rsp;
 
 typedef struct {
-	nfapi_p7_message_header_t header;
-	uint16_t dummy1;
-	uint16_t dummy2;
+  nfapi_p7_message_header_t header;
+  uint16_t dummy1;
+  uint16_t dummy2;
 } vendor_ext_p7_req;
 
 typedef struct {
-	nfapi_p7_message_header_t header;
-	uint16_t error_code;
+  nfapi_p7_message_header_t header;
+  uint16_t error_code;
 } vendor_ext_p7_ind;
 
 typedef struct {
-	nfapi_tl_t tl;
-	uint32_t dummy;
+  nfapi_tl_t tl;
+  uint32_t dummy;
 } vendor_ext_tlv_1;
 
 #define VENDOR_EXT_TLV_1_TAG 0xF001
 
 typedef struct {
-	nfapi_tl_t tl;
-	uint32_t dummy;
+  nfapi_tl_t tl;
+  uint32_t dummy;
 } vendor_ext_tlv_2;
 
 #define VENDOR_EXT_TLV_2_TAG 0xF002
 
+typedef enum {
+  NFAPI_MONOLITHIC=0,
+  NFAPI_MODE_PNF,
+  NFAPI_MODE_VNF,
+  NFAPI_UE_STUB_PNF,
+  NFAPI_UE_STUB_OFFNET,
+  NFAPI_MODE_UNKNOWN
+} nfapi_mode_t;
+
+char *nfapi_get_strmode(void);
+void nfapi_logmode(void);
+nfapi_mode_t nfapi_getmode(void);
+void nfapi_setmode(nfapi_mode_t nfapi_mode);
+#define NFAPI_MODE (nfapi_getmode())
 #endif // _VENDOR_EXT_

openair1/SCHED_UE/pusch_pc.c

@@ -36,12 +36,10 @@
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/phy_extern_ue.h"
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 
-extern uint8_t  nfapi_mode;
-
-int16_t get_hundred_times_delta_IF(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t harq_pid)
-{
 
+int16_t get_hundred_times_delta_IF(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t harq_pid) {
   uint32_t Nre = 2*ue->ulsch[eNB_id]->harq_processes[harq_pid]->Nsymb_initial *
                  ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb*12;
 
@@ -51,9 +49,8 @@ int16_t get_hundred_times_delta_IF(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t harq_p
   uint32_t MPR_x100 = 100*ue->ulsch[eNB_id]->harq_processes[harq_pid]->TBS/Nre;
   // Note: MPR=is the effective spectral efficiency of the PUSCH
   // FK 20140908 sumKr is only set after the ulsch_encoding
-
   uint16_t beta_offset_pusch = (ue->ulsch[eNB_id]->harq_processes[harq_pid]->control_only == 1) ?
-    ue->ulsch[eNB_id]->beta_offset_cqi_times8:8;
+                               ue->ulsch[eNB_id]->beta_offset_cqi_times8:8;
 
   if (ue->ul_power_control_dedicated[eNB_id].deltaMCS_Enabled == 1) {
     // This is the formula from Section 5.1.1.1 in 36.213 10*log10(deltaIF_PUSCH = (2^(MPR*Ks)-1)*beta_offset_pusch)
@@ -67,34 +64,24 @@ int16_t get_hundred_times_delta_IF(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t harq_p
 
 uint8_t alpha_lut[8] = {0,40,50,60,70,80,90,100};
 
-void pusch_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t j, uint8_t abstraction_flag)
-{
-
-
+void pusch_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t j, uint8_t abstraction_flag) {
   uint8_t harq_pid = subframe2harq_pid(&ue->frame_parms,
                                        proc->frame_tx,
                                        proc->subframe_tx);
-
   uint8_t nb_rb = ue->ulsch[eNB_id]->harq_processes[harq_pid]->nb_rb;
   int16_t PL;
-
-
   // P_pusch = 10*log10(nb_rb + P_opusch(j)+ alpha(u)*PL + delta_TF(i) + f(i))
   //
   // P_opusch(0) = P_oPTR + deltaP_Msg3 if PUSCH is transporting Msg3
   // else
   // P_opusch(0) = PO_NOMINAL_PUSCH(j) + P_O_UE_PUSCH(j)
   PL = get_PL(ue->Mod_id,ue->CC_id,eNB_id);
-
   ue->ulsch[eNB_id]->Po_PUSCH = (hundred_times_log10_NPRB[nb_rb-1]+
-				 get_hundred_times_delta_IF(ue,eNB_id,harq_pid) +
-				 100*ue->ulsch[eNB_id]->f_pusch)/100;
+                                 get_hundred_times_delta_IF(ue,eNB_id,harq_pid) +
+                                 100*ue->ulsch[eNB_id]->f_pusch)/100;
 
   if(ue->ulsch_Msg3_active[eNB_id] == 1) {  // Msg3 PUSCH
-
     ue->ulsch[eNB_id]->Po_PUSCH += (get_Po_NOMINAL_PUSCH(ue->Mod_id,0) + PL);
-
-
     LOG_I(PHY,"[UE  %d][RAPROC] frame %d, subframe %d: Msg3 Po_PUSCH %d dBm (%d,%d,100*PL=%d,%d,%d)\n",
           ue->Mod_id,proc->frame_tx,proc->subframe_tx,ue->ulsch[eNB_id]->Po_PUSCH,
           100*get_Po_NOMINAL_PUSCH(ue->Mod_id,0),
@@ -104,10 +91,9 @@ void pusch_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_
           100*ue->ulsch[eNB_id]->f_pusch);
   } else if (j==0) { // SPS PUSCH
   } else if (j==1) { // Normal PUSCH
-
     ue->ulsch[eNB_id]->Po_PUSCH +=  ((alpha_lut[ue->frame_parms.ul_power_control_config_common.alpha]*PL)/100);
     ue->ulsch[eNB_id]->Po_PUSCH +=  ue->frame_parms.ul_power_control_config_common.p0_NominalPUSCH;
-    ue->ulsch[eNB_id]->PHR       =  ue->tx_power_max_dBm-ue->ulsch[eNB_id]->Po_PUSCH;  
+    ue->ulsch[eNB_id]->PHR       =  ue->tx_power_max_dBm-ue->ulsch[eNB_id]->Po_PUSCH;
 
     if (ue->ulsch[eNB_id]->PHR < -23)
       ue->ulsch[eNB_id]->PHR = -23;
@@ -126,13 +112,11 @@ void pusch_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_
           get_hundred_times_delta_IF(ue,eNB_id,harq_pid)/100.0,
           ue->ulsch[eNB_id]->f_pusch);
   }
-
 }
 
-int8_t get_PHR(uint8_t Mod_id, uint8_t CC_id,uint8_t eNB_index)
-{
-	if(nfapi_mode!=3)
-		return PHY_vars_UE_g[Mod_id][CC_id]->ulsch[eNB_index]->PHR;
-	else
-		return 40; // For nfapi_mode=3 consider ideal conditions
+int8_t get_PHR(uint8_t Mod_id, uint8_t CC_id,uint8_t eNB_index) {
+  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF)
+    return PHY_vars_UE_g[Mod_id][CC_id]->ulsch[eNB_index]->PHR;
+  else
+    return 40; // l1l2 simulator => ideal conditions
 }

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -92,11 +92,11 @@ static int tun_alloc(char *dev) {
   return fd;
 }
 
-int netlink_init_tun(char *ifprefix) {
+int netlink_init_tun(char *ifprefix, int num_if) {
   int ret;
   char ifname[64];
 
-  for (int i = 0; i < NUMBER_OF_UE_MAX; i++) {
+  for (int i = 0; i < num_if; i++) {
     sprintf(ifname, "oaitun_%.3s%d",ifprefix,i+1);
     nas_sock_fd[i] = tun_alloc(ifname);
 

openair1/SIMULATION/ETH_TRANSPORT/proto.h

@@ -62,6 +62,6 @@ int multicast_link_read_data_from_sock(uint8_t eNB_flag);
 void clear_eNB_transport_info(uint8_t);
 void clear_UE_transport_info(uint8_t);
 int netlink_init(void);
-int netlink_init_tun(char *ifsuffix);
+int netlink_init_tun(char *ifsuffix, int num_if);
 
 #endif /* EMU_PROTO_H_ */

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -66,7 +66,7 @@
 #include "SCHED_UE/sched_UE.h"
 #include "common/config/config_load_configmodule.h"
 #include "PHY/INIT/phy_init.h"
-
+#include "nfapi/oai_integration/vendor_ext.h"
 
 void feptx_ofdm(RU_t *ru);
 void feptx_prec(RU_t *ru);
@@ -471,7 +471,7 @@ int n_users = 1;
 int subframe=7;
 int num_common_dci=0,num_ue_spec_dci=0,num_dci=0,num_pdcch_symbols=1;
 uint16_t n_rnti=0x1234;
-int nfapi_mode=0;
+
 int abstx=0;
 int Nid_cell=0;
 int N_RB_DL=25;

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -55,7 +55,7 @@
 
 #include "PHY/TOOLS/lte_phy_scope.h"
 #include "dummy_functions.c"
-
+#include "nfapi/oai_integration/vendor_ext.h"
 #include "common/config/config_load_configmodule.h"
 double cpuf;
 #define inMicroS(a) (((double)(a))/(cpu_freq_GHz*1000.0))
@@ -81,7 +81,7 @@ double t_tx_min = 1000000000; /*!< \brief initial min process time for tx */
 double t_rx_min = 1000000000; /*!< \brief initial min process time for tx */
 int n_tx_dropped = 0; /*!< \brief initial max process time for tx */
 int n_rx_dropped = 0; /*!< \brief initial max process time for rx */
-int nfapi_mode = 0;
+
 
 extern void fep_full(RU_t *ru);
 extern void ru_fep_full_2thread(RU_t *ru);

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

@@ -40,6 +40,7 @@
 #include "LAYER2/MAC/mac_extern.h"
 #include "LAYER2/MAC/eNB_scheduler_fairRR.h"
 #include "common/utils/LOG/log.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 #include "OCG.h"
@@ -49,7 +50,7 @@
 
 #include "T.h"
 
-extern uint8_t nfapi_mode;
+
 #ifdef PHY_TX_THREAD
   extern volatile int16_t phy_tx_txdataF_end;
   extern int oai_exit;
@@ -841,7 +842,6 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
 #ifdef DEBUG_eNB_SCHEDULER
   int k;
 #endif
-
   start_meas(&eNB->schedule_dlsch);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
   (VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_IN);
@@ -1012,7 +1012,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
          DevCheck(((eNB_UE_stats->dl_cqi < MIN_CQI_VALUE) || (eNB_UE_stats->dl_cqi > MAX_CQI_VALUE)),
          eNB_UE_stats->dl_cqi, MIN_CQI_VALUE, MAX_CQI_VALUE);
        */
-      if (nfapi_mode) {
+      if (NFAPI_MODE != NFAPI_MONOLITHIC) {
         eNB_UE_stats->dlsch_mcs1 = 10;//cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];
       } else {
         eNB_UE_stats->dlsch_mcs1 = cqi_to_mcs[ue_sched_ctl->dl_cqi[CC_id]];

openair2/LAYER2/MAC/main_ue.c

@@ -39,12 +39,12 @@
 #include "LAYER2/PDCP_v10.1.0/pdcp.h"
 #include "RRC/LTE/rrc_defs.h"
 #include "common/utils/LOG/log.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 
 
 #include "common/ran_context.h"
 extern FILL_UL_INFO_MUTEX_t fill_ul_mutex;
-extern uint8_t nfapi_mode;
 extern void openair_rrc_top_init_ue( int eMBMS_active, char *uecap_xer, uint8_t cba_group_active, uint8_t HO_active);
 
 void dl_phy_sync_success(module_id_t module_idP, frame_t frameP, unsigned char eNB_index, uint8_t first_sync) { //init as MR
@@ -91,7 +91,7 @@ mac_top_init_ue(int eMBMS_active, char *uecap_xer,
   }
 
   // mutex below are used for multiple UE's L2 FAPI simulation.
-  if (nfapi_mode == 3) {
+  if (NFAPI_MODE == NFAPI_UE_STUB_PNF) {
     pthread_mutex_init(&fill_ul_mutex.rx_mutex,NULL);
     pthread_mutex_init(&fill_ul_mutex.crc_mutex,NULL);
     pthread_mutex_init(&fill_ul_mutex.sr_mutex,NULL);

openair2/LAYER2/PROTO_AGENT/proto_agent.h

@@ -29,7 +29,7 @@
  *******************************************************************************/
 
 /*! \file proto_agent.h
- * \brief top level protocol agent  
+ * \brief top level protocol agent
  * \author Navid Nikaein and Xenofon Foukas
  * \date 2016
  * \version 0.1
@@ -41,18 +41,18 @@
 #include "proto_agent_common.h"
 
 
-void * proto_agent_receive(void *args);
+void *proto_agent_receive(void *args);
 
 int proto_agent_start(mod_id_t mod_id, const cudu_params_t *p);
 void proto_agent_stop(mod_id_t mod_id);
 
-void proto_agent_send_rlc_data_req( const protocol_ctxt_t* const ctxt_pP,
+rlc_op_status_t proto_agent_send_rlc_data_req( const protocol_ctxt_t *const ctxt_pP,
     const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
     const rb_id_t rb_idP, const mui_t muiP, confirm_t confirmP,
     sdu_size_t sdu_sizeP, mem_block_t *sdu_pP);
 
-void proto_agent_send_pdcp_data_ind(const protocol_ctxt_t* const ctxt_pP,
-    const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
-    const rb_id_t rb_idP, sdu_size_t sdu_sizeP, mem_block_t *sdu_pP);
+void proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
+                                    const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
+                                    const rb_id_t rb_idP, sdu_size_t sdu_sizeP, mem_block_t *sdu_pP);
 
 #endif

openair2/RRC/NAS/nas_config.c

@@ -236,8 +236,8 @@ int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname)
   char broadcastAddress[20];
   char interfaceName[20];
   int returnValue;
-  sprintf(ipAddress, "10.0.%d.%d", thirdOctet,fourthOctet);
-  sprintf(broadcastAddress, "10.0.%d.255", thirdOctet);
+  sprintf(ipAddress, "%s.%d.%d", baseNetAddress,thirdOctet,fourthOctet);
+  sprintf(broadcastAddress, "%s.%d.255",baseNetAddress, thirdOctet);
   sprintf(interfaceName, "%s%s%d", (UE_NAS_USE_TUN || ENB_NAS_USE_TUN)?"oaitun_":ifname,
           UE_NAS_USE_TUN?"ue": (ENB_NAS_USE_TUN?"enb":""),interface_id);
   bringInterfaceUp(interfaceName, 0);

targets/RT/USER/lte-softmodem.h

@@ -243,6 +243,7 @@
 #define SOFTMODEM_NONBIOT_BIT         (1<<2)
 #define SOFTMODEM_RFSIM_BIT           (1<<10)
 #define SOFTMODEM_BASICSIM_BIT        (1<<11)
+#define SOFTMODEM_SIML1_BIT           (1<<12)
 typedef struct {
   uint64_t       optmask;
   THREAD_STRUCT  thread_struct;
@@ -265,6 +266,7 @@ typedef struct {
 #define IS_SOFTMODEM_NONBIOT         ( get_softmodem_optmask() & SOFTMODEM_NONBIOT_BIT)
 #define IS_SOFTMODEM_RFSIM           ( get_softmodem_optmask() & SOFTMODEM_RFSIM_BIT)
 #define IS_SOFTMODEM_BASICSIM        ( get_softmodem_optmask() & SOFTMODEM_BASICSIM_BIT)
+#define IS_SOFTMODEM_SIML1           ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)
 extern uint64_t get_softmodem_optmask(void);
 extern uint64_t set_softmodem_optmask(uint64_t bitmask);
 extern void get_common_options(void);