Commit Graph
1986 Commits
Author SHA1 Message Date
luis_pereira87 a7cb146dce Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	ci-scripts/cls_oaicitest.py
2021-05-21 10:41:34 +01:00
luis_pereira87 c1a8c3fd15 Fix all RRC status to StatusRrc 2021-05-20 15:27:31 +01:00
rmagueta 49ea1197bb Fix CI UE status "oaitun_ue1 interface is either NOT mounted or NOT configured" 2021-05-19 16:04:54 +01:00
rmagueta a7a3bf5d90 Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.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/mac_proto.h
2021-05-19 15:00:52 +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
hardy ca60a69fc6 Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into integration_2021_wk20_a 2021-05-17 10:13:39 +02:00
hardy 568af88807 Merge remote-tracking branch 'origin/fix-compile' into integration_2021_wk20_a 2021-05-17 10:12:27 +02: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
hardy a362493cce Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a 2021-05-16 21:24:38 +02:00
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
rmagueta 5919b891bb Fix new cppcheck errors/warnings 2021-05-11 15:00:39 +01:00
Laurent THOMAS 2508a020ec fix random crash (uninitialized memory) 2021-05-10 11:31:54 +01:00
Raymond Knopp 83ccc50f18 Merge remote-tracking branch 'origin/develop' into oairu 2021-05-10 00:39:55 +02:00
rmagueta 5916450327 Fix SRB2 warning for NSA 2021-05-04 18:45:05 +01:00
rmagueta 33ba50fd66 Fix SRB2 warning for SA 2021-05-04 16:19:42 +01:00
rmagueta 102a76fd56 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2021-05-04 11:23:21 +01:00
francescomani 13acbd1d82 Merge remote-tracking branch 'origin/develop' into NR_cleanup_PUCCH_resources 2021-05-04 12:00:19 +02:00
francescomani 64e42cacf2 implementation of handling csi and harq in the same pucch2 2021-05-04 11:47:48 +02:00
rmagueta 48305fd14d Fix warning after merge 2021-05-03 19:13:32 +01:00
rmagueta 4b5cef595a Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.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
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-05-03 18:44:54 +01:00
francescomani ad10ef0dfe to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols 2021-05-03 17:59:08 +02:00
Laurent THOMAS 6882ea7a7b functional new gtpu, to be tested 2021-05-02 16:06:45 +02:00
Raymond Knopp 85aab6e826 changes in gtpu interface for testing, small changes in L1 for PUSCH signal/noise measurements. SRB2 interfaces. 2021-05-02 09:50:40 +02:00
rmagueta ed0fedc1b6 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-05-01 18:42:28 +01:00
rmagueta e924caa677 Fix phy-simulators 2021-05-01 18:39:30 +01:00
Raymond Knopp ab0e14ce8d logging for debugging DRB/SRB2 establishment at gNodeB 2021-05-01 09:55:00 +02:00
Raymond Knopp fd2ea253be masterCellGroup in RRCReconfiguration 2021-04-30 22:30:46 +02:00
rmagueta 655c5481e3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/nr-uesoftmodem.h
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
Laurent THOMAS 04b28b4518 fixes from testing 2021-04-30 16:47:40 +02:00
rmagueta fece683445 Fix issues after merge 2021-04-30 12:14:37 +01:00
rmagueta cb0bb5f8b9 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-30 11:12:15 +01:00
Raymond Knopp a9603c8a48 Include second RRC Reconfiguration message to carry DRB, SRB2 configuration and NAS PDU Session Establishment Accept message
-Remove DRB and SRB configuration from the first RRC Reconfiguration message. Missing radio configuration to be filled in first RRC Reconfiguration message.
2021-04-29 16:44:10 +02:00
Raymond Knopp 3caa78ea9a adding band info to UE capabilty enquiry 2021-04-29 15:06:47 +02:00
Raymond Knopp 439ceafa62 applied extra MAC config IE to RRCSetup 2021-04-29 10:39:18 +02:00
rmagueta 0a3f128e27 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	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_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
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
rmagueta edb790ab04 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-27 12:36:31 +01:00
rmagueta 987455b9e6 Fix warnings after merge 2021-04-27 12:35:35 +01:00
matzakos 9f0c10617a Include rlc bearer configuration list for the configuration of RLC and PDCP RBs 2021-04-27 13:28:59 +02:00
rmagueta 9372be0466 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-04-27 12:12:59 +01:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Cedric Roux a8adcf862c sa: nr pdcp: we don't use the hash table anymore 2021-04-27 10:00:24 +02:00
Robert Schmidt 821a5e5dfe Correct T310 & N310 to avoid RA 2021-04-27 08:30:33 +02:00
imad 27bfe23c9b Add schedulingRequestResourceConfig 2021-04-27 08:30:33 +02:00
imad 50ac9ef252 Add schedulingRequestConfig 2021-04-27 08:30:33 +02:00
Robert Schmidt c2d16eb8d5 Configure secondaryCellGroup: dedicated PUCCH, CSI, Preamble
- Configure PUCCH Format 0 to be in separate RBs (each UE has dedicated
  resources)
- Configure RA preamble to be different per UE
- Configure CSI offset such that no two UEs have their report in the
  same frame
2021-04-27 08:30:31 +02:00
Robert Schmidt 84e57113c8 initial_csi_index depends on local_uid
Nb_ue is not unique among UEs: consider 2 UEs present. The last UE has
CSI idx "2". Now the first UE disconnects, and a new UE connects. It
will also get CSI idx "2", and I assume this is not what we want.
2021-04-27 08:29:55 +02:00
rmagueta e1ef4e2d3b Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/L1_nr_paramdef.h
#	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_ulsch.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-26 15:11:00 +01:00
Raymond Knopp 458f199dce Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 2021-04-26 12:06:43 +02:00
Cedric Roux 9135d4200f sa: nr pdcp: improve security
This commit implements integrity and security settings for nr pdcp. It will
only work for SRBs.

This commit has not been tested. It may fail to work completely. To be checked.
2021-04-26 11:43:44 +02:00