Works up to the reception of HI_DCI0.request at the UE-PNF. Sometimes Msg3...

Works up to the reception of HI_DCI0.request at the UE-PNF. Sometimes Msg3 arrives later than expected at the eNB-VNF.

cmake_targets/CMakeLists.txt

@@ -1933,6 +1933,55 @@ target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 
 
+
+
+# lte-softmodem-stub-nos1 is both eNB and UE implementation
+###################################################
+
+add_executable(lte-softmodem-stub-nos1
+  ${rrc_h}
+  ${s1ap_h}
+  ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem-stub.c
+  ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
+  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
+  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+  ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
+  #${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+  ${OPENAIR_DIR}/common/utils/utils.c
+  ${OPENAIR_DIR}/common/utils/system.c
+  #${GTPU_need_ITTI}
+  ${RTAI_SOURCE}
+  ${XFORMS_SOURCE}
+  ${XFORMS_SOURCE_SOFTMODEM}
+  ${T_SOURCE}
+  ${CONFIG_SOURCES}
+  ${SHLIB_LOADER_SOURCES}
+  )
+
+target_link_libraries (lte-softmodem-stub-nos1
+  -Wl,--start-group
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
+  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
+  NFAPI_USER_LIB
+  -Wl,--end-group z dl)
+
+target_link_libraries (lte-softmodem-stub-nos1 ${LIBXML2_LIBRARIES})
+target_link_libraries (lte-softmodem-stub-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp  ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
+target_link_libraries (lte-softmodem-stub-nos1 ${LIB_LMS_LIBRARIES})
+target_link_libraries (lte-softmodem-stub-nos1 ${T_LIB})
+
+
+
+
+
+
 # lte-softmodem-stub is both eNB and UE implementation
 ###################################################
 

cmake_targets/build_oai

@@ -503,7 +503,7 @@ function main() {
   if [ "$NOS1" =  "1" ] ; then
       lte_build_dir=lte_noS1_build_oai
       #lte_exec=lte-softmodem-nos1
-      lte_exec=lte-softmodem-stub
+      lte_exec=lte-softmodem-stub-nos1
   else
       lte_build_dir=lte_build_oai
       #lte_exec=lte-softmodem

nfapi/nfapi_pnf.c

@@ -51,6 +51,9 @@ extern void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, nfapi_
 
 extern uint8_t  nfapi_mode;
 
+extern int timer_subframe;
+extern int timer_frame;
+
 nfapi_tx_request_pdu_t* tx_request_pdu[1023][10][10]; // [frame][subframe][max_num_pdus]
 
 
@@ -1921,6 +1924,7 @@ int oai_nfapi_rx_ind(nfapi_rx_indication_t *ind)
   ind->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
   ind->header.message_id = NFAPI_RX_ULSCH_INDICATION;
 
+  LOG_I(MAC, "Panos-D: oai_nfapi_rx_ind 1 TIMER SFN/SF:%d.%d \n", timer_frame, timer_subframe);
   int retval = nfapi_pnf_p7_rx_ind(p7_config_g, ind);
 
   //LOG_D(PHY,"%s() SFN/SF:%d pdus:%d retval:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(ind->sfn_sf), ind->rx_indication_body.number_of_pdus, retval);

nfapi/nfapi_vnf.c

@@ -1362,6 +1362,7 @@ void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port)
 
   vnf.p7_vnfs[0].timing_window = 32;
   vnf.p7_vnfs[0].periodic_timing_enabled = 1;
+  // Panos:
   vnf.p7_vnfs[0].aperiodic_timing_enabled = 1;
   vnf.p7_vnfs[0].periodic_timing_period = 10;
 

openair2/LAYER2/MAC/ra_procedures.c

@@ -321,7 +321,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP,int CC_id,frame_t frameP,
 	      "Transmission on secondary CCs is not supported yet\n");
 
   if (UE_mode == PRACH) {
-	  LOG_I(MAC, "Panos-D: ue_get_rach 3");
+	  LOG_I(MAC, "Panos-D: ue_get_rach 3, RA_active value: %d", UE_mac_inst[module_idP].RA_active);
     if (UE_mac_inst[module_idP].radioResourceConfigCommon) {
       rach_ConfigCommon = &UE_mac_inst[module_idP].radioResourceConfigCommon->rach_ConfigCommon;
     } else {

openair2/PHY_INTERFACE/IF_Module.c

@@ -547,7 +547,7 @@ void UL_indication(UL_IND_t *UL_info)
   IF_Module_t  *ifi        = if_inst[module_id];
   eNB_MAC_INST *mac        = RC.mac[module_id];
 
-  LOG_D(PHY,"SFN/SF:%d%d module_id:%d CC_id:%d UL_info[rx_ind:%d harqs:%d crcs:%d cqis:%d preambles:%d sr_ind:%d]\n", 
+  LOG_D(PHY,"SFN/SF:%d%d module_id:%d CC_id:%d UL_info[rx_ind:%d harqs:%d crcs:%d cqis:%d preambles:%d sr_ind:%d]\n",
       UL_info->frame,UL_info->subframe,
       module_id,CC_id,
       UL_info->rx_ind.rx_indication_body.number_of_pdus, UL_info->harq_ind.harq_indication_body.number_of_harqs, UL_info->crc_ind.crc_indication_body.number_of_crcs, UL_info->cqi_ind.number_of_cqis, UL_info->rach_ind.rach_indication_body.number_of_preambles, UL_info->sr_ind.sr_indication_body.number_of_srs);

openair2/PHY_INTERFACE/phy_stub_UE.h

@@ -47,7 +47,7 @@ void send_nfapi_UL_indications(UL_IND_t UL_INFO);
 
 //void fill_rx_indication_UE_MAC(module_id_t Mod_id,int frame,int subframe);
 
-void fill_rx_indication_UE_MAC(module_id_t Mod_id,int frame,int subframe, UL_IND_t *UL_INFO, uint8_t *ulsch_buffer, uint16_t buflen, uint16_t rnti);
+void fill_rx_indication_UE_MAC(module_id_t Mod_id,int frame,int subframe, UL_IND_t *UL_INFO, uint8_t *ulsch_buffer, uint16_t buflen, uint16_t rnti, int index);
 
 
 // This function should be indicating directly to the eNB when there is a planned scheduling request at the MAC layer
@@ -56,7 +56,7 @@ void fill_sr_indication_UE_MAC(int Mod_id,int frame,int subframe, UL_IND_t *UL_I
 
 // In our case the this function will be always indicating ACK to the MAC of the eNB (i.e. always assuming)
 // successful decoding.
-void fill_crc_indication_UE_MAC(int Mod_id,int frame,int subframe, UL_IND_t *UL_INFO, uint8_t crc_flag);
+void fill_crc_indication_UE_MAC(int Mod_id,int frame,int subframe, UL_IND_t *UL_INFO, uint8_t crc_flag, int index, uint16_t rnti);
 
 
 void fill_rach_indication_UE_MAC(int Mod_id,int frame,int subframe, UL_IND_t *UL_INFO, uint8_t ra_PreambleIndex, uint16_t ra_RNTI);
@@ -71,11 +71,11 @@ void fill_uci_harq_indication_UE_MAC(int Mod_id, int frame, int subframe, UL_IND
 			      /*uint8_t tdd_mapping_mode,
 			      uint16_t tdd_multiplexing_mask*/);
 
-int ul_config_req_UE_MAC(nfapi_ul_config_request_t* req);
+int ul_config_req_UE_MAC(nfapi_ul_config_request_t* req, int frame, int subframe);
 
 void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
                          nfapi_ul_config_request_pdu_t *ul_config_pdu,
-                         uint16_t frame,uint8_t subframe,uint8_t srs_present);
+                         uint16_t frame,uint8_t subframe,uint8_t srs_present, int index);
 
 int dl_config_req_UE_MAC(nfapi_dl_config_request_t* req);
 

targets/RT/USER/lte-softmodem-stub.c

@@ -128,7 +128,7 @@ int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
 
 uint8_t nfapi_mode = 3;
 
-uint16_t sf_ahead=4;
+uint16_t sf_ahead=2;
 
 char *emul_iface;
 
@@ -1228,7 +1228,9 @@ int main( int argc, char **argv )
       printf("cannot create ITTI tasks\n");
       exit(-1); // need a softer mode
     }
-    //    UE_config_stub_pnf();
+    if(nfapi_mode==3){ //Panos: Here we should add another nfapi_mode for the case of Supervised LTE-D2D
+        UE_config_stub_pnf();
+    }
     printf("ITTI tasks created\n");
   }
   else {
@@ -1349,7 +1351,7 @@ int main( int argc, char **argv )
   if (nfapi_mode<3) // VNF
     wait_nfapi_init("main?");
 
-  printf("START MAIN THREADS\n");
+  printf("START MAIN THREADS, nfapi_mode:%d \n", nfapi_mode);
 
   // start the main threads
   if (UE_flag == 1) {
@@ -1366,9 +1368,11 @@ int main( int argc, char **argv )
     //phy_stub_ticking = (SF_ticking*)malloc(sizeof(SF_ticking));
 
 
-    init_timer_thread();
+    // Panos: CHANGE we call init_timer_thread() from inside init_UE_stub() now
+    //init_timer_thread();
     init_UE_stub(1,eMBMS_active,uecap_xer_in,emul_iface);
 
+
     /*for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
       PHY_vars_UE_g[0][CC_id]->rf_map.card=0;
       PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;