Place NFAPI waiting after RU init; don't wait for F1 if in PNF
harmonize with monolithic
This commit is contained in:
+11
-10
@@ -678,21 +678,22 @@ int main( int argc, char **argv ) {
|
|||||||
|
|
||||||
#endif // E2_AGENT
|
#endif // E2_AGENT
|
||||||
|
|
||||||
|
// wait for F1 Setup Response before starting L1 for real
|
||||||
|
if (NFAPI_MODE != NFAPI_MODE_PNF && (NODE_IS_DU(node_type) || NODE_IS_MONOLITHIC(node_type)))
|
||||||
|
wait_f1_setup_response();
|
||||||
|
|
||||||
|
if (RC.nb_RU > 0)
|
||||||
|
start_NR_RU();
|
||||||
|
|
||||||
|
#ifdef ENABLE_AERIAL
|
||||||
|
gNB_MAC_INST *nrmac = RC.nrmac[0];
|
||||||
|
nvIPC_Init(nrmac->nvipc_params_s);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (NFAPI_MODE==NFAPI_MODE_PNF) {
|
if (NFAPI_MODE==NFAPI_MODE_PNF) {
|
||||||
wait_nfapi_init("main?");
|
wait_nfapi_init("main?");
|
||||||
}
|
}
|
||||||
|
|
||||||
// wait for F1 Setup Response before starting L1 for real
|
|
||||||
if (NODE_IS_DU(node_type) || NODE_IS_MONOLITHIC(node_type))
|
|
||||||
wait_f1_setup_response();
|
|
||||||
|
|
||||||
if (RC.nb_RU > 0)
|
|
||||||
start_NR_RU();
|
|
||||||
#ifdef ENABLE_AERIAL
|
|
||||||
gNB_MAC_INST *nrmac = RC.nrmac[0];
|
|
||||||
nvIPC_Init(nrmac->nvipc_params_s);
|
|
||||||
#endif
|
|
||||||
if (RC.nb_nr_L1_inst > 0) {
|
if (RC.nb_nr_L1_inst > 0) {
|
||||||
wait_RUs();
|
wait_RUs();
|
||||||
// once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
|
// once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
|
||||||
|
|||||||
Reference in New Issue
Block a user