Added configuration option for nfapi-L2-emulation mode and updated instructions file.

nfapi-L2-emulator-setup.txt

@@ -22,8 +22,10 @@ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up
 cd ..
 cd lte_noS1_build_oai/build/
 
-# Run the eNB side on the first terminal (VNF)
+# Run the eNB process on one terminal (VNF)
 sudo ./lte-softmodem-nos1 -O PATH_OF:rcc.band7.tm1.50PRB.nfapi.conf
 
-# Run the UE side on the second terminal (nfapi-L2-PNF) (--num_ues specifying the number of UEs)
-sudo ./lte-softmodem-stub-nos1 -U -O PATH_OF:oaiL1.nfapi.usrpb210.conf --num-ues 5 > debug_log.txt
+# Run the UE process on the other terminal (PNF) (--L2-emul specifying the operation in nfapi-L2-emulation mode
+# and it has to be equal to 3, --num_ues specifying the number of UEs)
+sudo ./lte-softmodem-stub-nos1 -U -O PATH_OF:oaiL1.nfapi.usrpb210.conf --L2-emul 3 --num-ues 5 > debug_log.txt
+

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -672,7 +672,7 @@ rx_sdu(const module_id_t enb_mod_idP,
 		      enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
 		      rx_lcids[i]);
 
-		LOG_I(MAC, "Panos-D: rx_sdu before mac_rlc_data_ind 1, frame:%d, subframe: %d \n", frameP, subframeP);
+		//LOG_D(MAC, "Panos-D: rx_sdu before mac_rlc_data_ind 1, frame:%d, subframe: %d \n", frameP, subframeP);
 		mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL);	//(unsigned int*)crc_status);
 		UE_list->eNB_UE_stats[CC_idP][UE_id].
 		    num_pdu_rx[rx_lcids[i]] += 1;

openair2/RRC/LITE/rrc_eNB.c

@@ -7141,7 +7141,7 @@ rrc_rx_tx(
       }
       if (ue_context_p->ue_context.ue_release_timer>0) {
 	ue_context_p->ue_context.ue_release_timer++;
-	LOG_I(RRC, "Panos-D: rrc_rx_tx(), release timer: %d \n", ue_context_p->ue_context.ue_release_timer);
+	//LOG_D(RRC, "Panos-D: rrc_rx_tx(), release timer: %d \n", ue_context_p->ue_context.ue_release_timer);
 	if (ue_context_p->ue_context.ue_release_timer >= 
 	    ue_context_p->ue_context.ue_release_timer_thres) {
 	  LOG_I(RRC,"Removing UE %x instance, Release timer: %d, Release timer thres.: %d \n",ue_context_p->ue_context.rnti, ue_context_p->ue_context.ue_release_timer, ue_context_p->ue_context.ue_release_timer_thres);

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

@@ -129,7 +129,7 @@ pthread_cond_t nfapi_sync_cond;
 pthread_mutex_t nfapi_sync_mutex;
 int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
 
-uint8_t nfapi_mode = 3;
+uint8_t nfapi_mode = 0;
 
 uint16_t sf_ahead=2;
 

targets/RT/USER/lte-softmodem.h

@@ -131,6 +131,7 @@
 {"ue-max-power",     	       NULL,		      0,		iptr:&(tx_max_power[0]),	    defintval:90,   TYPE_INT,	   0},     \
 {"r"  ,                        CONFIG_HLP_PRB,        0,                u8ptr:&n_rb_dl,                     defintval:0,    TYPE_UINT8,    0},     \
 {"emul-iface",                 CONFIG_HLP_EMULIFACE,  0,                strptr:&emul_iface,                  defstrval:"lo", TYPE_STRING,   100}, \
+{"L2-emul",                 	NULL,  				  0,                u8ptr:&nfapi_mode,                  defuintval:3, TYPE_UINT8,   0}, \
 {"num-ues",     	       		   NULL,		      	  0,				iptr:&(NB_UE_INST),	    defintval:1,   	TYPE_INT,	   0}     \
  }