Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42

Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c
This commit is contained in:
Florian Kaltenberger
2019-10-14 13:40:03 +02:00
32 changed files with 1146 additions and 232 deletions
+2
View File
@@ -98,6 +98,8 @@
#define CONFIG_HLP_TELN "Start embedded telnet server \n"
#define CONFIG_HLP_MSC "Enable the MSC tracing utility \n"
#define CONFIG_HLP_SNR "Set average SNR in dB (for --siml1 option)\n"
#define CONFIG_HLP_NOS1 "Disable s1 interface\n"
#define CONFIG_HLP_NOKRNMOD "(noS1 only): Use tun instead of namesh module \n"
/*--------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters for LOG utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */