rmagueta
|
160cb0b930
|
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_NGAP.c
# openair2/RRC/NR_UE/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
|
2021-06-30 17:00:30 +01:00 |
|
Laurent THOMAS
|
aef67d0310
|
fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp)
|
2021-06-21 21:01:59 +02:00 |
|
Laurent THOMAS
|
5d11b7444e
|
fix array overflow and wrong LCID
|
2021-06-21 16:48:44 +01:00 |
|
Laurent THOMAS
|
a88c33b148
|
fix array overflow and wrong LCID
|
2021-06-21 12:56:57 +02:00 |
|
rmagueta
|
e72a6798c1
|
Change some LOG levels
|
2021-06-05 14:20:39 +01:00 |
|
Eurecom
|
ac4670990c
|
handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310.
|
2021-05-30 23:14:12 +02:00 |
|
Laurent THOMAS
|
96e3d00ac7
|
fix again RU compilation case
|
2021-05-19 15:25:42 +01:00 |
|
Laurent THOMAS
|
3b560229c4
|
fix constant in weird case 'NO_RRC', linked to 'RU' compilation case
|
2021-05-19 15:25:32 +01:00 |
|
rmagueta
|
8c5725ed46
|
Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair2/RRC/NR_UE/rrc_UE.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
|
2021-05-19 12:09:27 +01:00 |
|
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
|
b5bbfdade3
|
after merge, remain compile errors
|
2021-05-16 23:57:35 +02:00 |
|
Laurent THOMAS
|
04b28b4518
|
fixes from testing
|
2021-04-30 16:47:40 +02:00 |
|
Raymond Knopp
|
d88ce5b9bf
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-04-27 11:58:31 +02:00 |
|
Raymond Knopp
|
2be602e938
|
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS
|
2021-04-26 10:51:18 +02:00 |
|
Raymond Knopp
|
7ed637a954
|
added n1L1_stats.log. improvements to noise level (PUCCH/PUSCH) and signal level (PUCCH) computations. added DTX detection parameters for PUCCH/PUSCH/PRACH in L1 section of configuration file. hotfix from C. Roux for SRB PDCP integrity. extra logging to debug missing PUSCH/DCI at UE.
|
2021-04-22 09:32:06 +02:00 |
|
Laurent Thomas
|
307098da4a
|
merge develop
|
2021-04-09 12:39:33 +02:00 |
|
Raymond Knopp
|
0b59ce4faf
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-04-07 15:50:46 +02:00 |
|
Raymond Knopp
|
df05672a4c
|
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_nsa.c
|
2021-03-30 04:48:51 +02:00 |
|
Raymond Knopp
|
4d0d4fcb29
|
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_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_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
|
2021-03-27 15:31:22 +01:00 |
|
Raymond Knopp
|
08b781ebfe
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-03-25 06:44:11 +01:00 |
|
Raymond Knopp
|
f6d53094c4
|
added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.
Tested until transmission of RRCSetupComplete from UE
|
2021-03-23 21:52:57 +01:00 |
|
Thomas Schlichter
|
dade64ea43
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-03-19 11:18:02 +01:00 |
|
Raymond Knopp
|
9dd6e3bb82
|
Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
Conflicts:
executables/nr-uesoftmodem.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/RRC/NR/L2_nr_interface.c
|
2021-03-18 07:50:08 +01:00 |
|
Thomas Schlichter
|
8768deaf74
|
Merge remote-tracking branch 'develop' into ptrs_rrc_config
|
2021-03-16 14:01:32 +01:00 |
|
Thomas Schlichter
|
3152df445e
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-03-16 13:37:07 +01:00 |
|
Raymond Knopp
|
94085a41cd
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-03-16 08:07:16 +01:00 |
|
He Shanyun
|
8965dd782b
|
Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
|
2021-03-11 14:39:36 +09:00 |
|
Shweta Shrivastava
|
7eec3e3bcc
|
Merge branch 'develop' into ptrs_rrc_config
|
2021-03-10 22:37:44 -06:00 |
|
Raymond Knopp
|
3700759aa2
|
fixed byte-endian of fiveGS-TAC IE in F1AP.
|
2021-03-09 12:32:22 +01:00 |
|
Raymond Knopp
|
666aee7fc2
|
addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure
|
2021-03-08 10:57:00 +01:00 |
|
masayuki.harada
|
ff994453a4
|
Merge remote-tracking branch 'remotes/oai/develop' into HEAD
# Conflicts:
# openair3/S1AP/s1ap_eNB.c
# openair3/S1AP/s1ap_eNB_handlers.c
|
2021-03-08 14:51:11 +09: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 |
|
Xue Song
|
b6febe214f
|
add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
|
2021-02-25 14:00:14 +09:00 |
|
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 |
|
Raymond Knopp
|
11c3a26414
|
Merge remote-tracking branch 'origin/develop' into oairu
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
|
2021-02-24 21:52:14 +01:00 |
|
Raymond Knopp
|
d77f9ad096
|
build oairu ok
|
2021-02-15 08:13:15 +01:00 |
|
Raymond Knopp
|
a135f261b2
|
adjust includes for oairu target. Now test X-Ysoftmodem on another machine
|
2021-02-14 17:59:28 +01:00 |
|
Cedric Roux
|
0b4335accc
|
NSA: some work on security (for PDCP)
- compute correct kgNB
- propagate properly NR security capabilities of an UE
(involves: rrc, s1ap, x2ap)
|
2021-02-12 16:01:37 +01:00 |
|
Thomas Schlichter
|
14e84f8782
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-02-09 10:02:54 +01:00 |
|
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 |
|
Xue Song
|
52edf0c123
|
Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_task.c
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_task.c
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/L2_interface_ue.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
|
2021-02-04 18:16:37 +09:00 |
|
Xue Song
|
6a3b7b40a5
|
Merge branch 'master' into develop_SA_L3
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
|
2021-02-03 14:58:07 +09:00 |
|
Raymond Knopp
|
4e9afb30b0
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-02-02 12:09:56 +01:00 |
|
Khodr Saaifan
|
283a060497
|
Allow gNB to read pusch_AntennPorts from config file
|
2021-02-02 09:02:19 +01:00 |
|
Laurent Thomas
|
6b37681854
|
merge develop, minor code addition
|
2021-02-01 09:02:57 +01:00 |
|
hardy
|
9c810b311d
|
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
|
2021-01-29 07:40:07 +01:00 |
|
Laurent Thomas
|
954b0f559d
|
new gtp before tests
|
2021-01-25 12:59:38 +01:00 |
|
Raymond Knopp
|
ef1fb827b5
|
Merge remote-tracking branch 'origin/develop' into oairu
|
2021-01-23 09:17:37 +01:00 |
|
He Shanyun
|
e4ff0d5b31
|
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
|
2021-01-20 01:51:32 +00:00 |
|