merge develop, compile only

cmake_targets/CMakeLists.txt

@@ -2519,7 +2519,7 @@ target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem ${T_LIB})
 
 
-add_executable(ocp-softmodem
+add_executable(ocp-enb
   ${OPENAIR_DIR}/executables/main-ocp.c
   ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2545,15 +2545,15 @@ add_executable(ocp-softmodem
   ${CONFIG_SOURCES}
   ${SHLIB_LOADER_SOURCES}
   )
-add_dependencies(ocp-softmodem rrc_flag s1ap_flag x2_flag oai_iqplayer)
+add_dependencies(ocp-enb rrc_flag s1ap_flag x2_flag oai_iqplayer)
 
-target_link_libraries (ocp-softmodem
+target_link_libraries (ocp-enb
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB 
   PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
   -Wl,--end-group z dl)
-target_link_libraries (ocp-softmodem ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
+target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
 
 add_executable(cu_test
   ${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/cu_test.c

cmake_targets/phy_simulators/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
-set(PACKAGE_NAME "unitary_tests_simulators")
-set(PHYSIM True)
-set(RF_BOARD None)
-set(XFORMS True)
-set(ENABLE_ITTI True)
-set(DEBUG_PHY False)
-set(MU_RECIEVER False)
-set(NAS_UE False)
-set(MESSAGE_CHART_GENERATOR False)
-set(RRC_ASN1_VERSION "Rel15")
+set ( CMAKE_BUILD_TYPE  )
+set ( CFLAGS_PROCESSOR_USER "" )
+set ( UE_EXPANSION False )
+set ( PRE_SCD_THREAD False )
+set ( UESIM_EXPANSION False )
+set ( ENABLE_VCD_FIFO False )
+set ( RF_BOARD "OAI_USRP")
+set ( TRANSP_PRO "None")
+set ( PACKAGE_NAME "")
+set ( DEADLINE_SCHEDULER "False" )
+set ( CPU_AFFINITY "False" )
 set(T_TRACER True)
 set ( UE_AUTOTEST_TRACE False )
 set ( UE_DEBUG_TRACE False )

executables/ocp-gnb.c

@@ -131,7 +131,7 @@ static inline int rxtx(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int frame_t
     oai_subframe_ind(frame_rx, slot_rx);
     stop_meas(&nfapi_meas);
 
-    if (gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus||
+    /*if (gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus||
         gNB->UL_INFO.harq_ind.harq_indication_body.number_of_harqs ||
         gNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs ||
         gNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles ||
@@ -145,7 +145,7 @@ static inline int rxtx(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int frame_t
             gNB->UL_INFO.cqi_ind.number_of_cqis,
             frame_rx, slot_rx,
             frame_tx, slot_tx);
-    }
+    }*/
   }
 
   /// NR disabling
@@ -296,12 +296,12 @@ void init_gNB(int single_thread_flag,int wait_for_sync) {
     memset((void *)&gNB->UL_tti_req,0,sizeof(nfapi_nr_ul_tti_request_t));
     //memset((void *)&gNB->Sched_INFO,0,sizeof(gNB->Sched_INFO));
     LOG_I(PHY,"Setting indication lists\n");
-    gNB->UL_INFO.rx_ind.rx_indication_body.rx_pdu_list   = gNB->rx_pdu_list;
-    gNB->UL_INFO.crc_ind.crc_indication_body.crc_pdu_list = gNB->crc_pdu_list;
-    gNB->UL_INFO.sr_ind.sr_indication_body.sr_pdu_list = gNB->sr_pdu_list;
+    gNB->UL_INFO.rx_ind.pdu_list = gNB->rx_pdu_list;
+    gNB->UL_INFO.crc_ind.crc_list = gNB->crc_pdu_list;
+    /*gNB->UL_INFO.sr_ind.sr_indication_body.sr_pdu_list = gNB->sr_pdu_list;
     gNB->UL_INFO.harq_ind.harq_indication_body.harq_pdu_list = gNB->harq_pdu_list;
     gNB->UL_INFO.cqi_ind.cqi_pdu_list = gNB->cqi_pdu_list;
-    gNB->UL_INFO.cqi_ind.cqi_raw_pdu_list = gNB->cqi_raw_pdu_list;
+    gNB->UL_INFO.cqi_ind.cqi_raw_pdu_list = gNB->cqi_raw_pdu_list;*/
     gNB->prach_energy_counter = 0;
   }
 

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

@@ -572,7 +572,7 @@ unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,
   G = G - Q_RI - Q_CQI;
   ulsch_harq->G = G;
   AssertFatal((int)G > 0,
-              "FATAL: ulsch_decoding.c G < 0 (%d) : Q_RI %d, Q_CQI %d\n",G,Q_RI,Q_CQI);
+              "FATAL: ulsch_decoding.c G < 0 (%u) : Q_RI %u, Q_CQI %u\n",G,Q_RI,Q_CQI);
   H = G + Q_CQI;
   Hprime = H/Q_m;
   // Demultiplexing/Deinterleaving of PUSCH/ACK/RI/CQI

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

@@ -780,7 +780,6 @@ void ulsch_channel_compensation(int32_t **rxdataF_ext,
 #endif
 
     for (rb=0; rb<nb_rb; rb++) {
-      LOG_D(PHY,"comp: symbol %d rb %d\n",symbol,rb);
       // just compute channel magnitude without scaling, this is done after equalization for SC-FDMA
 #if defined(__x86_64__) || defined(__i386__)
       mmtmpU0 = _mm_madd_epi16(ul_ch128[0],ul_ch128[0]);

openair1/SCHED_NR/nr_prach_procedures.c

@@ -55,7 +55,7 @@ extern int oai_nfapi_nr_rach_ind(nfapi_rach_indication_t *rach_ind);
 void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot,
 			    nfapi_nr_prach_pdu_t *prach_pdu) {
 
-  uint16_t max_preamble[4],max_preamble_energy[4],max_preamble_delay[4];
+  uint16_t max_preamble[4]={0},max_preamble_energy[4]={0},max_preamble_delay[4]={0};
   uint16_t i;
 
 

openair2/MCE_APP/mce_app.c

@@ -343,7 +343,9 @@ void *MCE_app_task(void *args_p) {
 
   /* Try to register each MCE */
   // This assumes that node_type of all RRC instances is the same
-  if (EPC_MODE_ENABLED) {
+  if ( EPC_MODE_ENABLED && RC.rrc == NULL )
+	  LOG_E(RRC, "inconsistent global variables\n");
+  if (EPC_MODE_ENABLED && RC.rrc ) {
     register_mce_pending = MCE_app_register(RC.rrc[0]->node_type, mce_id_start, mce_id_end);
   }
 

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -879,10 +879,7 @@ int memcpy_dl_config_req(L1_rxtx_proc_t *proc,
 
 int memcpy_ul_config_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_ul_config_request_t* req)
 {
-
-	//for (Mod_id=0; Mod_id<NB_UE_INST; Mod_id++){
-
-		ul_config_req = (nfapi_ul_config_request_t*)malloc(sizeof(nfapi_ul_config_request_t));
+  ul_config_req = malloc(sizeof(nfapi_ul_config_request_t));
 
 
   ul_config_req->sfn_sf = req->sfn_sf;
@@ -928,9 +925,12 @@ int memcpy_tx_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_tx_request_t *req) {
   return 0;
 }
 
-int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc, nfapi_pnf_p7_config_t* pnf_p7, nfapi_hi_dci0_request_t* req)
-{
+int memcpy_hi_dci0_req (L1_rxtx_proc_t *proc, 
+			nfapi_pnf_p7_config_t* pnf_p7, 
+			nfapi_hi_dci0_request_t* req) {
   hi_dci0_req = (nfapi_hi_dci0_request_t *)malloc(sizeof(nfapi_hi_dci0_request_t));
+	//if(req!=0){
+
 
   hi_dci0_req->sfn_sf = req->sfn_sf;
   hi_dci0_req->vendor_extension = req->vendor_extension;

targets/ARCH/rfsimulator/README.md

@@ -3,6 +3,12 @@ This is an RF simulator that allows to test OAI without an RF board. It replaces
 
 As much as possible, it works like an RF board, but not in real-time: It can run faster than real-time if there is enough CPU, or slower (it is CPU-bound instead of real-time RF sampling-bound).
 
+It can be run either in:
+
+- "noS1" mode: the generated IP traffic is sent and received between gNB and UE IP tunnel interfaces ("oaitun") by applications like ping and iperf
+- "phy-test" mode: random UL and DL traffic is generated at every scheduling opportunity 
+
+
 # build
 
 ## From [build_oai](../../../doc/BUILD.md) script