Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42

Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	targets/COMMON/create_nr_tasks.c
This commit is contained in:
matzakos
2020-11-09 15:52:52 +01:00
101 changed files with 6634 additions and 2623 deletions
+1 -1
View File
@@ -981,7 +981,7 @@ if(!IS_SOFTMODEM_NOS1)
// once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
printf("ALL RUs ready - init gNBs\n");
if(IS_SOFTMODEM_DOFORMS) {
sleep(1);
scopeParms_t p;
p.argc=&argc;
p.argv=argv;