maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dccbd9279a9c2f41a6b552a02027ec91b1ff855e
openairinterface5g/targets/ARCH/USRP
T
History
Eurecom f83c02d981 Merge branch 'NR_2port_CSIRS' into CSI-SA 
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.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_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-10-17 02:13:11 +02:00
..
USERSPACE/LIB
Merge branch 'NR_2port_CSIRS' into CSI-SA
2021-10-17 02:13:11 +02:00