Commit Graph
234 Commits
Author SHA1 Message Date
rmagueta 282fe1063e Fix build 2021-06-30 18:48:45 +01:00
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
rmagueta 6cefe15467 Fix issues after cherry-pick 2021-06-21 17:48:47 +01: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 c7f0a287b0 Update dummy_enb.c 2021-06-06 18:59:28 +01:00
rmagueta e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
rmagueta af8d115dae Revert more pieces of code for LTE 2021-06-03 16:01:51 +01:00
rmagueta c9a9c619c7 Add some LOGs 2021-06-03 13:47:38 +01:00
Roberto Louro Magueta 1145a5516c Revert "Change hardcoded task id to TASK_VARIABLE"
This reverts commit 64aa42d646
2021-05-31 02:05:38 +02: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
rmagueta 64aa42d646 Change hardcoded task id to TASK_VARIABLE 2021-05-30 20:16:55 +01:00
rmagueta 769da284fb Change some hardcode values 2021-05-30 12:33:21 +01:00
rmagueta 024808e6fa Revert more pieces of code to LTE 2021-05-29 20:35:53 +01:00
luis_pereira87 ef509a9810 Uncomment fields in F1 gNB-CU CONFIGURATION UPDATE 2021-05-28 14:07:22 +01:00
luis_pereira87 9ae4d8639a Fix fiveGS_TAC byte order for LTE 2021-05-28 12:38:44 +01:00
Luis Pereira fa33b048b0 Revert "Add logs for cellId in F1"
This reverts commit ffb6fa7cc6
2021-05-28 07:02:42 +02:00
luis_pereira87 ffb6fa7cc6 Add logs for cellId in F1 2021-05-28 00:38:46 +01:00
luis_pereira87 6c494737f0 Revert LTE related code in DU_handle_UE_CONTEXT_SETUP_REQUEST 2021-05-28 00:20:33 +01:00
luis_pereira87 e78e296eb0 Avoid assertion in F1 for LTE 2021-05-27 16:52:00 +01:00
Raymond Knopp 8456908ef8 F1Setup procedure working for both LTE and NR 2021-05-27 15:49:30 +02:00
luis_pereira87 fb0b99af3e Fix another SI_container index for LTE 2021-05-27 11:56:17 +01:00
Roberto Louro Magueta a257024cf1 Revert "Add condition in CU_handle_F1_SETUP_REQUEST to LTE version"
This reverts commit 65d24ae205
2021-05-26 17:16:00 +02:00
rmagueta 65d24ae205 Add condition in CU_handle_F1_SETUP_REQUEST to LTE version 2021-05-26 11:37:21 +01:00
rmagueta 9bbfd60d2f Revert if in CU_send_UE_CONTEXT_SETUP_REQUEST to LTE version 2021-05-26 11:35:10 +01:00
Roberto Louro Magueta 35d6cb706f Revert "Temporary commit (will be reverted)"
This reverts commit f207446117
2021-05-26 12:14:39 +02:00
rmagueta f207446117 Temporary commit (will be reverted) 2021-05-26 02:50:06 +01:00
luis_pereira87 13990e614c Fix nRNRB for LTE 2021-05-25 15:08:51 +01:00
luis_pereira87 6d311e9e63 Avoid segmentation fault when RC.nrrrc is not present 2021-05-24 15:52:02 +01:00
luis_pereira87 08832facaa Fix setup parameters for F1U 2021-05-24 14:51:42 +01:00
luis_pereira87 c1a8c3fd15 Fix all RRC status to StatusRrc 2021-05-20 15:27:31 +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 081fbd3593 Make all compile in same tree 2021-05-18 18:45:11 +01:00
rmagueta fd3a45de82 Fix build issues 2021-05-17 12:01:32 +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
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
Laurent THOMAS f04008a423 add file 2021-05-11 16:14:39 +02:00
Laurent THOMAS 7d3c60ed37 small fixes, make all compile is same tree 2021-05-11 14:34:27 +02:00
Raymond Knopp e2b68a99a9 CU/DU support for most recent changes. UE continues as far as in monolithic mode. Still to apply masterCellGroupConfig in DU from RRCReconfiguration. This has to be detected in DU and applied after decoding the RRC message intended for UE. 2021-05-09 12:44:55 +02:00
rmagueta c0f3394048 Fix LTE build error 2021-05-03 18:07:07 +01:00
luis_pereira87 2fb267145e Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.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_ulsch.c
2021-04-19 12:12:44 +01:00
Raymond Knopp 7818958da0 Validated up to reception of first PUSCH after Msg4 (contains RRCSetupComplete) 2021-04-16 15:30:50 +02:00
rmagueta 131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
Raymond Knopp 2473a25ca1 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +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 a6b24211ac configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file. 2021-03-25 14:26:28 +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
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