Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts: # openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/RRC/NR/rrc_gNB_reconfig.c
This commit is contained in:
@@ -717,12 +717,11 @@ if(!IS_SOFTMODEM_NOS1)
|
||||
if(IS_SOFTMODEM_NOS1)
|
||||
init_pdcp();
|
||||
|
||||
if (RC.nb_nr_L1_inst > 0)
|
||||
RCconfig_NR_L1();
|
||||
if (RC.nb_nr_inst > 0) {
|
||||
// don't create if node doesn't connect to RRC/S1/GTP
|
||||
AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n");
|
||||
} else {
|
||||
printf("No ITTI, Initializing L1\n");
|
||||
RCconfig_NR_L1();
|
||||
}
|
||||
|
||||
/* Start the agent. If it is turned off in the configuration, it won't start */
|
||||
|
||||
Reference in New Issue
Block a user