Commit f61bc19a authored by Robert Schmidt's avatar Robert Schmidt

The VNF has no business in L1

parent cf4fa53f
...@@ -242,6 +242,7 @@ void oai_enb_init(void) { ...@@ -242,6 +242,7 @@ void oai_enb_init(void) {
void oai_create_gnb(void) { void oai_create_gnb(void) {
int bodge_counter=0; int bodge_counter=0;
/*
if (RC.gNB == NULL) { if (RC.gNB == NULL) {
RC.gNB = (PHY_VARS_gNB **) calloc(1, sizeof(PHY_VARS_gNB *)); RC.gNB = (PHY_VARS_gNB **) calloc(1, sizeof(PHY_VARS_gNB *));
LOG_D(PHY,"gNB L1 structure RC.gNB allocated @ %p\n",RC.gNB); LOG_D(PHY,"gNB L1 structure RC.gNB allocated @ %p\n",RC.gNB);
...@@ -279,6 +280,7 @@ void oai_create_gnb(void) { ...@@ -279,6 +280,7 @@ void oai_create_gnb(void) {
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() Waiting for gNB to become configured (by RRC/PHY) - need to wait otherwise NFAPI messages won't contain correct values\n", __FUNCTION__); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() Waiting for gNB to become configured (by RRC/PHY) - need to wait otherwise NFAPI messages won't contain correct values\n", __FUNCTION__);
usleep(50000); usleep(50000);
} while(gNB->configured != 1); } while(gNB->configured != 1);
*/
NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() gNB is now configured\n", __FUNCTION__); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() gNB is now configured\n", __FUNCTION__);
} }
......
...@@ -783,7 +783,7 @@ void nr_mac_config_scc(gNB_MAC_INST *nrmac, NR_ServingCellConfigCommon_t *scc, c ...@@ -783,7 +783,7 @@ void nr_mac_config_scc(gNB_MAC_INST *nrmac, NR_ServingCellConfigCommon_t *scc, c
if (NFAPI_MODE == NFAPI_MODE_PNF || NFAPI_MODE == NFAPI_MODE_VNF) { if (NFAPI_MODE == NFAPI_MODE_PNF || NFAPI_MODE == NFAPI_MODE_VNF) {
// fake that the gNB is configured in nFAPI mode, which would normally be // fake that the gNB is configured in nFAPI mode, which would normally be
// done in a NR_PHY_config_req, but in this mode, there is no PHY // done in a NR_PHY_config_req, but in this mode, there is no PHY
RC.gNB[0]->configured = 1; //RC.gNB[0]->configured = 1;
} else { } else {
NR_PHY_Config_t phycfg = {.Mod_id = 0, .CC_id = 0, .cfg = &nrmac->config[0]}; NR_PHY_Config_t phycfg = {.Mod_id = 0, .CC_id = 0, .cfg = &nrmac->config[0]};
DevAssert(nrmac->if_inst->NR_PHY_config_req); DevAssert(nrmac->if_inst->NR_PHY_config_req);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment