maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a47861628b675d8b922a5af071588378455ffa11
openairinterface5g/openair2
T
History
rmagueta a47861628b Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
..
COMMON
Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09
2022-03-03 18:05:27 +01:00
DOCS
…
ENB_APP
SR/CSI multiplexing fix. default sl_head=6 instead of 4 to check if RF simulator behaves better
2022-03-07 00:08:12 +01:00
F1AP
Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08
2022-02-19 19:43:11 +01:00
GNB_APP
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-03-22 07:03:40 +01:00
LAYER2
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
2022-03-22 17:18:22 +00:00
M2AP
Remove MSC library, it is not used anywhere
2022-01-27 10:53:07 +01:00
MCE_APP
remove F1-U protobuf implementation
2022-01-27 11:57:19 +01:00
NETWORK_DRIVER
code cleanup, no feature
2021-10-24 14:47:24 +02:00
NR_PHY_INTERFACE
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-03-05 21:12:32 +01:00
NR_UE_PHY_INTERFACE
rebase on develop
2022-03-02 11:26:16 +01:00
PHY_INTERFACE
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
RRC
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
2022-03-22 17:18:22 +00:00
SDAP/nr_sdap
NR SDAP gNB - Transparent Mode
2021-09-27 16:26:49 +02:00
SIMULATION/NR_RRC
Remove MSC library, it is not used anywhere
2022-01-27 10:53:07 +01:00
UTIL
Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10
2022-03-07 23:12:49 +01:00
X2AP
Drop an sgNB release request if no SCTP endpoint available
2022-02-24 12:54:04 +01:00