maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,948 Commits 5 Branches 0 Tags
0e0526e36729d8107c3f7fd98a0d2ebd9da201ad
Commit Graph
2491 Commits
Author SHA1 Message Date
rmagueta 0e0526e367 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.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_primitives.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-02-23 13:51:31 +00:00
rmagueta 628726caae Fix build after merge 2022-02-22 13:33:36 +00:00
Robert Schmidt 72a4ed80da Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08 2022-02-19 19:43:11 +01:00
Robert Schmidt 21f862641c Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08 2022-02-19 19:34:01 +01:00
luis_pereira87 bfc34f329e Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
 2022-02-14 09:50:58 +00:00
luis_pereira87 fc783110da Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 
# Conflicts:
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
 2022-02-10 23:19:52 +00:00
Robert Schmidt 7e92d44fc2 Merge remote-tracking branch 'origin/oai-ue-time-meas' into integration_2022_wk06_a 2022-02-10 18:57:28 +01:00
rmagueta e8657ec854 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
 2022-02-08 09:31:32 +00:00
Robert Schmidt 66137d2bf9 Merge remote-tracking branch 'origin/bler_txoptim' into integration_2022_wk05_b 2022-02-04 19:11:33 +01:00
hardy 5b87e319fd Merge remote-tracking branch 'origin/fix_building_with_address_sanitizer' into integration_2022_wk05 2022-01-31 10:29:29 +01:00
Robert Schmidt b01b20129b Harmonize DLSCH/ULSCH unscrambling in gNB/nrUE 2022-01-28 16:10:50 +01:00
Laurent THOMAS aa47fa4c41 remove F1-U protobuf implementation 2022-01-27 11:57:19 +01:00
Robert Schmidt 8c5059214e Remove log verbosity level from all conf files: it is not used 2022-01-27 10:53:07 +01:00
Robert Schmidt 00e058537d Remove MSC library, it is not used anywhere 2022-01-27 10:53:07 +01:00
Laurent THOMAS 3e7c22e7c6 gtp-u old code delete 2022-01-26 11:27:02 +01:00
luis_pereira87 0e159f8b6b Merge remote-tracking branch 'origin/develop' into bler_txoptim 
# Conflicts:
#	openair1/SCHED_NR/fapi_nr_l1.c
 2022-01-25 08:49:16 +00:00
Laurent THOMAS 504c529c20 small optimisation in build_oai script 2022-01-24 15:27:08 +01:00
Laurent THOMAS 13a16bc29f remove separate dir from phy_simulators binaries and compile options 2022-01-24 14:59:12 +01:00
hardy 08c9d4ae4c Merge remote-tracking branch 'origin/tx-thread-update' into integration_2022_wk04_a 2022-01-21 16:39:24 +01:00
Sofia Pison 4fb330e4cc Modified CMakeLists to enable the run with address sanitizer without specifying LD_LIBRARY_PATH 2022-01-21 15:13:53 +01:00
luis_pereira87 b4e34d5e6b Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 2022-01-21 10:53:05 +00:00
luis_pereira87 7355cb454f Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
 2022-01-20 11:43:24 +00:00
Laurent Thomas 1eb1c17f0c merge develo 2022-01-19 16:46:46 +01:00
hardy 5c74bca5b5 Merge remote-tracking branch 'origin/ci-improvements' into integration_2022_wk03_b 2022-01-19 15:42:09 +01:00
luis_pereira87 978b4a1728 Merge remote-tracking branch 'origin/develop' into bler_txoptim 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
 2022-01-18 17:44:30 +00:00
rmagueta ef021c23e0 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
 2022-01-17 15:46:27 +00:00
rmagueta 62c2775017 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
 2022-01-15 17:29:13 +00:00
Laurent THOMAS a5c5264ef3 merge develop 2022-01-14 21:09:02 +01:00
Robert Schmidt 63a5a09732 Complete build_oai -t options 2022-01-14 18:34:40 +01:00
Robert Schmidt 2a4d4d9cbd Add readline library: telnetsrv depends on it 2022-01-14 18:34:00 +01:00
Robert Schmidt 9240d51774 Complete build_oai usage 2022-01-14 18:34:00 +01:00
luis_pereira87 a2755610fa Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
 2022-01-14 13:49:16 +00:00
Laurent THOMAS 3f2dd17191 code review comments + re-test 2022-01-13 16:04:16 +01:00
Laurent THOMAS 2ccc7188e5 fix regression in merge develop and some warnings 2022-01-13 14:39:56 +01:00
hardy ec286386dc Merge remote-tracking branch 'origin/NR-LogsSanAddrFix' into integration_2022_wk02 2022-01-12 14:27:00 +01:00
luis_pereira87 015e360d42 Merge remote-tracking branch 'origin/develop' into bler_txoptim 
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair1/SCHED_NR/fapi_nr_l1.c
 2022-01-10 14:03:55 +00:00
Laurent THOMAS bc05bd882d cleaning after big merge 2022-01-10 11:44:45 +01:00
luis_pereira87 46d629aede Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
 2022-01-10 10:21:07 +00:00
rmagueta cf8f6fdeed Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/L2_nr_interface.c
 2022-01-08 12:11:56 +00:00
luis_pereira87 395c211e6d Fix indentation 2022-01-06 16:18:55 +00:00
luis_pereira87 b8daf747bd Increase nr_pbchsim test requirements to pass in CI 2022-01-06 14:39:31 +00:00
luis_pereira87 d4f4080626 Revert "Revert "Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements"" 
This reverts commit 29268d0a66.
 2022-01-05 14:00:09 +00:00
frtabu a7b6c4bcb0 fix a warning. fix openCL regression after rebase 2022-01-04 19:06:38 +01:00
frtabu e4d3bf9f41 Fixes after MR 1257 1225: sanitize address error introduced in ldpctest when using alternatives ldpc libraries and LOG flooding introduced in nrUE. Also improved openCL ldpc library build 2022-01-04 15:15:09 +01:00
luis_pereira87 366e7bdb51 Merge remote-tracking branch 'origin/develop' into bler_txoptim 
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/PHY/CODING/crc_byte.c
#	openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
#	openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/SIMULATION/NR_PHY/dlschsim.c
 2021-12-24 17:07:40 +00:00
Luis Pereira 29268d0a66 Revert "Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements" 
This reverts commit 96554bef51
 2021-12-24 13:12:30 +00:00
rmagueta 97962f4635 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	common/utils/nr/nr_common.h
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2021-12-24 11:53:25 +00:00
Robert Schmidt 6c823168fe Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d 2021-12-24 10:13:27 +01:00
Laurent THOMAS 792b6b4e0b merge develop 2021-12-23 22:52:36 +01:00
Melissa Elkadi e7ef264226 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-21 06:02:40 -08:00