maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_SA_SIM' into develop_SA_L3

Browse Source 
Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
This commit is contained in:
Wu.Jing
2020-12-18 17:38:07 +09:00
parent 19118c13d1 a53d6795c8
commit 37d52bdf60
22 changed files with 1907 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/SIMULATION/NR_RRC/itti_sim.c
+2 -2
View File
@@ -104,7 +104,7 @@ int config_sync_var=-1;
openair0_config_t openair0_cfg[MAX_CARDS];
volatile int start_gNB = 0;
//volatile int start_gNB = 0;
volatile int oai_exit = 0;
//static int wait_for_sync = 0;
@@ -543,7 +543,7 @@ int main( int argc, char **argv )
}
AMF_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
// AMF_MODE_ENABLED = 0;
// AMF_MODE_ENABLED = 0;
NGAP_CONF_MODE = !IS_SOFTMODEM_NOS1; //!get_softmodem_params()->phy_test;
#if T_TRACER