diff --git a/nfapi/README.md b/nfapi/README.md index c02df565df..f43d67b618 100644 --- a/nfapi/README.md +++ b/nfapi/README.md @@ -26,4 +26,9 @@ ``` * Need the `N_RB` value to be non-zero and obtained from the config file. (carrier config grid size) `int N_RB = gNB_config->carrier_config.dl_grid_size[gNB_config->ssb_config.scs_common.value].value;` -* how is this `gNB_config` assigned its values? \ No newline at end of file +* how is this `gNB_config` assigned its values? + +### 19/06/20 +* `ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);` sloc: 1428 in `nr-ru.c` +* the `ru->rfdevice` has all members zero or null. +* This issue was solved by adding `sdr_addrs` to config file of PNF. \ No newline at end of file diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c index fb855966f1..5ebd4936b9 100644 --- a/nfapi/oai_integration/nfapi_pnf.c +++ b/nfapi/oai_integration/nfapi_pnf.c @@ -1285,7 +1285,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap pthread_create(&p7_thread, NULL, &pnf_p7_thread_start, p7_config); //((pnf_phy_user_data_t*)(phy_info->fapi->user_data))->p7_config = p7_config; NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] Calling l1_north_init_eNB() %s\n", __FUNCTION__); - l1_north_init_eNB(); + l1_north_init_gNB(); NFAPI_TRACE(NFAPI_TRACE_INFO, "[PNF] DJP - HACK - Set p7_config global ready for subframe ind%s\n", __FUNCTION__); p7_config_g = p7_config; @@ -1321,6 +1321,7 @@ int start_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap nfapi_send_pnf_start_resp(config, p7_config->phy_id); printf("[PNF] Sending first P7 subframe ind\n"); nfapi_pnf_p7_subframe_ind(p7_config, p7_config->phy_id, 0); // DJP - SFN_SF set to zero - correct??? + //TODO: Change to nfapi_pnf_p7_slot_ind printf("[PNF] Sent first P7 subframe ind\n"); return 0; } diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h index e8aca7e447..72f7ff91ec 100644 --- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h +++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h @@ -607,7 +607,7 @@ typedef struct { uint16_t sfn; //0->1023 uint16_t slot;//0->319 -} nfapi_nr_slot_indication_t; +} nfapi_nr_slot_indication_scf_t; // 3.4.2 diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf index b74bd2c69a..a6dfe4c74f 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf @@ -41,5 +41,6 @@ RUs = ( bands = [7]; max_pdschReferenceSignalPower = -27; max_rxgain = 114; + sdr_addrs = "type=x300"; // USRP type } );