Commit Graph
19 Commits
Author SHA1 Message Date
hardy c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy 246afc7ccb Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15 2021-04-14 14:37:09 +02:00
Laurent THOMAS 86f1c69f26 Fix code review remarks, merge develop, revert some merge errors 2021-04-13 22:28:02 +02:00
Laurent Thomas 307098da4a merge develop 2021-04-09 12:39:33 +02:00
frtabu 98c354fedd Set path for libconfig include directive, so that all config files could be located in the same directory. minor fixes in softmodem-common 2021-03-15 23:26:09 +01:00
frtabu 8ad4895f55 Add common option telnetclt 2021-03-15 12:51:49 +01:00
Mahesh 7f4ffe29c8 Fix whitespaces 2021-02-12 01:25:09 +05:30
Laurent Thomas 75ad3da9d9 start new gtpu 2021-01-21 15:51:30 +01:00
Mahesh d7ccdbe6b0 Resolved build warnings(25+) and 5G nFAPI downlink errors(future_ul_tti_request) 2021-01-14 12:28:45 +05:30
laurent 861caa735d merge develop 2020-04-13 18:04:18 +02:00
Raymond Knopp 6dff674302 testing after merge with develo 2020-03-15 18:03:42 +01:00
Raymond Knopp 9cf9ea7c99 remainder of merge 2020-03-14 13:50:07 +01:00
Raymond Knopp 914e17b57b Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	executables/softmodem-common.c
	openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_UE/mac_proto.h
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_config.c
	openair2/RRC/NR/nr_rrc_defs.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
laurent 756ac05e4d merge develop,fix basic sim and warnings 2020-03-04 13:32:03 +01:00
laurent 53db39b8a0 split 7.3 ready for merge 2020-03-02 15:41:21 +01:00
laurent 3d15918c14 merge again with develop, compiles only 2020-02-22 14:19:18 +01:00
frtabu b3334dbc2e A fix proposal for phy simulators compilation Pb. 2020-02-13 15:53:54 +01:00
frtabu 6014ca42ac ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device 2020-02-12 19:05:44 +01:00
frtabu 64e4826c81 add softmodem-common.c and common error handler 2020-02-04 17:39:36 +01:00