maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,139 Commits 5 Branches 0 Tags
c2fbcbcabc2fedbf8aec6d331d681a019ab8d4f3
Commit Graph
71 Commits
Author SHA1 Message Date
rmagueta 160cb0b930 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2 
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	cmake_targets/tools/build_helper
#	executables/nr-gnb.c
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.h
#	openair2/F1AP/f1ap_du_task.c
#	openair2/GNB_APP/gnb_app.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_NGAP.c
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair3/NAS/NR_UE/nr_nas_msg_sim.c
#	openair3/ocp-gtpu/gtp_itf.cpp
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
 2021-06-30 17:00:30 +01:00
Laurent THOMAS 16d9d33d04 Fix minor bugs and wrong reported trace 2021-05-19 09:58:48 +02:00
rmagueta cf605f4c77 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/COMMON/platform_constants.h
#	openair2/ENB_APP/enb_config.c
#	openair2/F1AP/f1ap_cu_interface_management.c
#	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
#	openair2/F1AP/f1ap_cu_ue_context_management.c
#	openair2/F1AP/f1ap_du_interface_management.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/LTE/rrc_eNB.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR_UE/rrc_UE.c
 2021-05-17 01:36:39 +01:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Raymond Knopp 2be602e938 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS 2021-04-26 10:51:18 +02:00
rmagueta 4301582f88 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
 2021-04-15 15:29:03 +01:00
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
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
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
luis_pereira87 5ab73a228f Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU 
# Conflicts:
#	executables/nr-softmodem.c
#	executables/nr-uesoftmodem.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/rrc_UE.c
 2021-03-15 12:44:16 +00:00
Raymond Knopp f5fcd5687d small changes in main-ocp to reflect initialization differences int phy_init_lte_eNB(). 2021-03-14 09:28:06 +01:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo 
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
 2021-03-05 19:07:43 +09:00
Laurent Thomas 9ce7f94518 record/replay for 5G, nrscope bug fix 2021-02-28 21:39:53 +01:00
He Shanyun 01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
Laurent Thomas 6b37681854 merge develop, minor code addition 2021-02-01 09:02:57 +01:00
Mahesh ca74163cdd OCP build errors resolved. 2021-01-27 11:34:52 +05:30
Laurent Thomas 75ad3da9d9 start new gtpu 2021-01-21 15:51:30 +01:00
Laurent Thomas eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Mahesh 56db8f4915 RESOLVED build errors 2020-11-24 18:49:41 +05:30
Mahesh 87105d77cf Merged latest develop to nfapi 2020-11-19 22:33:39 +05:30
Laurent c8111292e9 fix warnings from merge 2020-10-22 21:06:35 +02:00
Laurent 5c69510f17 merge develop, improve doc 2020-10-21 14:38:17 +02:00
Mahesh K 66a6d550a6 benetel: driver for Benetel's 4G and 5G RRUs 
This commit contains work done by Eurecom and by Benetel.
 2020-10-12 18:56:41 +02:00
Florian Kaltenberger 39615e8210 fixing ocp targets as well 2020-10-04 20:54:27 +02:00
Laurent 038a80b2ff fixes after merge 2020-08-21 15:50:27 +02:00
Laurent 38f01abd77 merge develop, compile ok, no test 2020-08-21 14:26:06 +02:00
Raphael Defosseux 140c70373e Merge remote-tracking branch 'origin/hotfix-ocp-executable' into develop_integration_2020_w33 2020-08-13 22:08:07 +02:00
Raphael Defosseux 4c6c4954e2 Merge remote-tracking branch 'origin/fix-softmodem-restart' into develop_integration_2020_w33 2020-08-13 22:07:02 +02:00
Raphael Defosseux 4e67434570 BUILD: fix for new API on load_softscope 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2020-08-12 14:55:59 +02:00
laurent 5729f15363 merge develop 2020-08-12 11:43:33 +02:00
Robert Schmidt e761819e28 Fix in other functions 2020-08-05 10:10:50 +02:00
laurent 381fa7234a remove need to set /data/opencells-ran/../oaiCloneFapi before calling cmake 2020-08-03 09:20:25 +02:00
laurent b829d3c9f7 add exit trace and fix a gcc warning 2020-07-31 16:04:24 +02:00
laurent 3772d7e56a merge develop, other modifs, not working 2020-07-17 13:57:56 +02:00
MaheshK1995 553844204c slot indication changes 2020-07-06 20:42:42 +05:30
laurent cabff5b73b fix itti issue in memory management 2020-07-03 14:57:27 +02:00
laurent 35bf936351 merge develop, phy-test mode in 5G testing ok 2020-07-02 12:02:21 +02:00
laurent 64e3e97158 more cleanup, start scope vizualisation rework 2020-06-09 09:00:03 +02:00
laurent 9ac5f6015d update license text 2020-04-29 11:31:00 +02:00
laurent dfafa90037 big merge with develop 2020-04-14 18:02:45 +02:00
laurent 861caa735d merge develop 2020-04-13 18:04:18 +02:00
laurent 756ac05e4d merge develop,fix basic sim and warnings 2020-03-04 13:32:03 +01:00
laurent 7ad4efb37a fix warnings, reduce formating differences with develop branch 2020-03-02 17:39:44 +01:00
laurent 53db39b8a0 split 7.3 ready for merge 2020-03-02 15:41:21 +01:00
laurent 8d9d80ee37 very big merge with merged develop, basic test done 2020-01-30 17:10:36 +01:00
laurent 8dedd093fb remove a forgotten test trace, re-indentation of modified source files 2019-12-06 18:41:30 +01:00
laurent 47abf562db add FS6 transport time measurement 2019-12-06 16:24:47 +01:00