maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,004 Commits 5 Branches 0 Tags
3e8bc05bdf7bd5eb7af12b60f300eab9c40b950a
Commit Graph
1963 Commits
Author SHA1 Message Date
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
Laurent THOMAS 7d3c60ed37 small fixes, make all compile is same tree 2021-05-11 14:34:27 +02:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +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
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
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Laurent THOMAS fbf39eecc1 cppcheck fixes 2021-03-26 16:32:20 +01:00
Laurent THOMAS 818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
Raymond Knopp 91168581a5 small fix for basic simulator in TDD 2021-03-18 20:35:17 +01:00
Raymond Knopp a3f6fe4260 L2 emulator seems ok now 2021-03-15 22:45:54 +01: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 7f5dc92265 testing with multi-RU 2021-03-13 21:43:00 +01:00
Raymond Knopp 74a44d686d minor changes 2021-03-13 21:27:39 +01:00
Raymond Knopp e5226adcb0 Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu 2021-03-13 21:26:47 +01:00
magounak a4666ba7e5 OTA synch changes for slave RRU 2021-03-13 21:25:54 +01:00
Raymond Knopp d72b9c4e71 Merge remote-tracking branch 'origin/develop' into oairu 2021-03-08 13:41:14 +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 3b1b74cfd2 starting 2021-03-04 13:22:14 +01:00
rmagueta ce5b59c938 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2021-03-02 12:58:32 +00:00
Laurent Thomas 9ce7f94518 record/replay for 5G, nrscope bug fix 2021-02-28 21:39:53 +01:00
hardy 8d05695722 Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b 2021-02-26 16:09:05 +01:00
Raymond Knopp a6e16e7c8a Merge remote-tracking branch 'origin/develop' into oairu 2021-02-23 11:51:29 +01:00
Raymond Knopp 9f35010ea3 changes for multi-RRU OTA synch 2021-02-23 10:19:05 +01:00
Raymond Knopp 5b865df202 fixed for oairu target after merge with develop 2021-02-14 14:05:16 +01:00
Raymond Knopp a30eabbe21 OTA testing 4G, configuration parameters for fairRR scheduler and common parameters for both fairRR and default 2021-02-11 13:43:25 +01:00
Raymond Knopp 37ef411c2e traces for fairRR scheduler 2021-02-10 14:14:29 +01:00
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2021-02-10 15:56:50 +09:00
He Shanyun 01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Florian Kaltenberger 04a4a6f451 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-09 11:13:01 +01:00
Raymond Knopp 4d47e3da96 IF4p5 testing. seems to work again with fixes after merge with develop 2021-02-08 15:27:37 +01:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Laurent Thomas fa63d9a4e6 merge develop 2021-02-08 11:56:42 +01:00
Raymond Knopp 846c67b9bd Merge remote-tracking branch 'origin/develop' into oairu 
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
 2021-02-07 18:23:46 +01:00
Raymond Knopp d06018d1e3 Merge branch 'four_antenna_eNB' into oairu 2021-02-07 17:46:23 +01:00
Raymond Knopp 4e9afb30b0 Merge remote-tracking branch 'origin/develop' into oairu 2021-02-02 12:09:56 +01:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
Florian Kaltenberger 0f57529b48 fixing benetel4g driver by setting ru->has_ctrl_prt =1 and thus starting the RU control thread, which is required for the 4G RRU. In the future we should revisit this and harmonize with the 5G version. 2021-02-01 10:24:22 +01:00
Laurent Thomas 6b37681854 merge develop, minor code addition 2021-02-01 09:02:57 +01:00
Thomas Schlichter bca9f74e66 Merge remote-tracking branch 'develop' into NR_RA_cleanup 2021-01-29 18:52:37 +01:00
Raymond Knopp 78f14bc9a4 fixed build for oairu executable. tested with sirius/phoenix 2021-01-28 21:53:24 +01:00
Raymond Knopp 89657f20e6 testing with N310 4x4 eNB 20 MHz 2021-01-27 21:03:47 +01:00
Raymond Knopp 184f095384 bugfix in EN-DC measurement reporting trace collection 2021-01-27 11:56:11 +01:00
Thomas Schlichter f32297fefa fix cppcheck warnings 2021-01-25 14:32:32 +01:00
Raymond Knopp 9f52fd4ae7 removed warnings on lte-softmodem compilation 2021-01-25 10:02:15 +01:00
Raymond Knopp 86cab23b74 fixed build with --mu 2021-01-24 22:23:33 +01:00
Raymond Knopp e82ef88e72 builds are succesful (eNB,UE,gNB,nrUE,physim) 2021-01-24 13:27:10 +01:00
Raymond Knopp 5294bc4fe3 warnings and unitary simulation bulding 2021-01-23 15:04:11 +01:00