maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4d9ebf0ac08fcc731b331070ee381f86c4a29de8
openairinterface5g/openair2
T
History
Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2 
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_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/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/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-24 23:00:04 +01:00
..
COMMON
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
2021-02-24 23:00:04 +01:00
DOCS
Fixing errored/missing circular dependency protection
2020-05-15 15:39:11 +02:00
ENB_APP
Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b
2021-01-29 07:41:47 +01:00
F1AP
Merge branch 'master' into develop_SA_rfsim_for_F1
2021-02-04 18:16:37 +09:00
GNB_APP
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
2021-02-24 23:00:04 +01:00
LAYER2
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
2021-02-24 23:00:04 +01:00
M2AP
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
MCE_APP
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
NETWORK_DRIVER
trivial merge with develop"
2021-02-11 13:27:00 +01:00
NR_PHY_INTERFACE
merge MR978 (5G nFAPI) into develop
2021-02-12 16:26:22 +05:30
NR_UE_PHY_INTERFACE
move unreachable LOG_D() in NR_IF_Module.c
2021-01-27 12:05:34 +01:00
PHY_INTERFACE
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
RRC
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
2021-02-24 23:00:04 +01:00
SDAP/nr_sdap
Create asn1 file
2020-09-03 17:17:47 +09:00
SIMULATION/NR_RRC
Merge branch 'master' into develop_SA_rfsim_for_F1
2021-02-04 18:16:37 +09:00
UTIL
NSA: some work on security (for PDCP)
2021-02-12 16:01:37 +01:00
X2AP
lte/nr x2ap: fix content of SgNBAdditionRequest
2021-02-01 11:48:44 +01:00