diff --git a/nfapi/nfapi_pnf.c b/nfapi/nfapi_pnf.c
index 3973315a6f87f679df91383c1989f0de69628a7d..708152be012f9153d70926813ca0b291eac8e9f5 100644
--- a/nfapi/nfapi_pnf.c
+++ b/nfapi/nfapi_pnf.c
@@ -685,8 +685,18 @@ int config_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfap
pnf_info* pnf = (pnf_info*)(config->user_data);
uint8_t num_tlv = 0;
- struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
- LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
+
+ // Panos: In the case of nfapi_mode = 3 (UE = PNF) we should not have dependency on any eNB var. So we aim
+ // 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) {
+ struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
+ fp = &eNB->frame_parms;
+ }
+ else{
+ fp = (LTE_DL_FRAME_PARMS*) malloc(sizeof(LTE_DL_FRAME_PARMS));
+ }
+
#if 0
//DJP
@@ -701,6 +711,7 @@ int config_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfap
//DJP
phy_info* phy_info = pnf->phys;
+ //if(nfapi_mode!=3) {
if(req->nfapi_config.timing_window.tl.tag == NFAPI_NFAPI_TIMING_WINDOW_TAG)
{
phy_info->timing_window = req->nfapi_config.timing_window.value;
@@ -879,6 +890,7 @@ int config_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfap
num_tlv++;
}
+ if(nfapi_mode!=3) {
printf("[PNF] CONFIG_REQUEST[num_tlv:%d] TLVs processed:%d\n", req->num_tlv, num_tlv);
printf("[PNF] Simulating PHY CONFIG - DJP\n");
@@ -890,6 +902,7 @@ int config_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfap
phy_config_request(&phy_config);
dump_frame_parms(fp);
+ }
phy_info->remote_port = req->nfapi_config.p7_vnf_port.value;
@@ -907,6 +920,8 @@ int config_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfap
nfapi_resp.error_code = 0; // DJP - some value resp->error_code;
nfapi_pnf_config_resp(config, &nfapi_resp);
printf("[PNF] Sent NFAPI_CONFIG_RESPONSE phy_id:%d\n", phy_info->id);
+ if(nfapi_mode ==3)
+ free(fp);
return 0;
}
@@ -1399,6 +1414,8 @@ int start_request(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi
NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] DJP - HACK - Set p7_config global ready for subframe ind%s\n", __FUNCTION__);
p7_config_g = p7_config;
+ printf("Panos-D: start_request, bUFFER SIZE: %d", p7_config_g->subframe_buffer_size);
+
// Need to wait for main thread to create RU structures
while(config_sync_var<0)
{
@@ -1754,7 +1771,9 @@ void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr,
{
printf("%s() PNF\n\n\n\n\n\n", __FUNCTION__);
+ if(nfapi_mode!=3) {
nfapi_mode = 1; // PNF!
+ }
nfapi_pnf_config_t* config = nfapi_pnf_config_create();
@@ -1822,7 +1841,9 @@ void oai_subframe_ind(uint16_t sfn, uint16_t sf)
if (p7_config_g != NULL && sync_var==0)
{
- uint16_t sfn_sf_tx = sfn<<4 | sf;
+ printf("Panos-D: oai_subframe_ind 1, buffer size:%d", p7_config_g->subframe_buffer_size);
+
+ uint16_t sfn_sf_tx = sfn<<4 | sf;
if ((sfn % 100 == 0) && sf==0)
{
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
index 251243c632e077b4babc6663fa62d5abf4dacc3a..de6eb72ee7887eb3602a225a62b1186ed8498ef8 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf
@@ -19,9 +19,9 @@ L1s = (
{
num_cc = 1;
tr_n_preference = "nfapi";
- local_n_if_name = "eth0";
- remote_n_address = "10.0.0.20";
- local_n_address = "10.0.0.10";
+ local_n_if_name = "enp0s31f6";
+ remote_n_address = "10.0.0.2";
+ local_n_address = "10.0.0.1";
local_n_portc = 50000;
remote_n_portc = 50001;
local_n_portd = 50010;
diff --git a/targets/RT/USER/lte-softmodem-stub.c b/targets/RT/USER/lte-softmodem-stub.c
index d9ed9f408f8823cd68e39a1b78aadd6ae0b53e93..e02a064fe4c7c69de881d706dc61576e050d6c2e 100644
--- a/targets/RT/USER/lte-softmodem-stub.c
+++ b/targets/RT/USER/lte-softmodem-stub.c
@@ -1349,6 +1349,8 @@ int main( int argc, char **argv )
init_UE_stub(1,eMBMS_active,uecap_xer_in);
//init_UE(1,eMBMS_active,uecap_xer_in);
number_of_cards = 1;
+
+ config_sync_var=0;
if (nfapi_mode==3) // UE-STUB-PNF
{
wait_nfapi_init("main?");
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 84f2452d4253797492808e58d5a2dedf3ea9f505..f8254c193f39def83ce222a965576ced37853b86 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -875,12 +875,19 @@ static void *UE_phy_stub_thread_rxn_txnp4(void *arg) {
// Panos: is this the right place to call oai_subframe_indication to invoke p7 nfapi callbacks here?
oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
- if(UE_mac_inst[Mod_id].tx_req!= NULL)
+ printf("Panos-D: UE_phy_stub_thread_rxn_txnp4 after oai_subframe_ind \n");
+ if(UE_mac_inst[Mod_id].tx_req!= NULL){
+ printf("Panos-D: UE_phy_stub_thread_rxn_txnp4 after oai_subframe_ind 2\n");
tx_req_UE_MAC(UE_mac_inst[Mod_id].tx_req);
- if(UE_mac_inst[Mod_id].dl_config_req!= NULL)
+ }
+ if(UE_mac_inst[Mod_id].dl_config_req!= NULL) {
+ printf("Panos-D: UE_phy_stub_thread_rxn_txnp4 after oai_subframe_ind 3\n");
dl_config_req_UE_MAC(UE_mac_inst[Mod_id].dl_config_req);
- if(UE_mac_inst[Mod_id].hi_dci0_req!= NULL)
+ }
+ if(UE_mac_inst[Mod_id].hi_dci0_req!= NULL){
+ printf("Panos-D: UE_phy_stub_thread_rxn_txnp4 after oai_subframe_ind 4\n");
hi_dci0_req_UE_MAC(UE_mac_inst[Mod_id].hi_dci0_req);
+ }
//#endif
}