Commit Graph
4341 Commits
Author SHA1 Message Date
Melissa Elkadi 4398630da7 Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-23 08:55:10 -08:00
rmagueta 5bae6dd6f3 Add missing fiels in fapi_nr_dl_config_csirs_pdu_rel15_t 2022-02-23 16:11:13 +00:00
francescomani 74a01ca46a Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization 2022-02-23 16:03:54 +01:00
rmagueta 4d17364142 Fix build warnings 2022-02-23 14:16:58 +00:00
francescomani 5c56bb21ce Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-23 15:08:52 +01:00
francescomani ddfb131f68 Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling 2022-02-23 14:55:33 +01:00
rmagueta 0e0526e367 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.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/RRC/NR/rrc_gNB_nsa.c
2022-02-23 13:51:31 +00:00
francescomani faf38c7e56 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-02-23 14:20:39 +01:00
francescomani 4c8c11d9db Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-23 13:53:11 +01:00
luis_pereira87 dc4a82934d Fixes after merge 2022-02-23 11:53:57 +00:00
luis_pereira87 47fc4750e1 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.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
2022-02-23 11:34:37 +00:00
luis_pereira87 08e97aa9c8 Fix warnings after merge 2022-02-23 11:09:55 +00:00
luis_pereira87 8238c40ce9 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	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_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-23 10:48:49 +00:00
francescomani c61a0dd223 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-23 10:11:04 +01:00
Raymond Knopp 963ffe67c1 Merge remote-tracking branch 'origin/bugfix-nr-rlc-2022-w08' into tdd2_5period_withRLCupdate
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-02-22 22:23:23 +01:00
rmagueta bb82697819 Fix segmentation fault at UE in nr_schedule_csi_for_im and nr_schedule_csirs_reception 2022-02-22 19:14:17 +00:00
rmagueta cf284d76f0 Fix build after merge 2022-02-22 17:49:59 +00:00
Melissa Elkadi abbcbe6aa5 Adding fixes for MR from review
These include:
- Simplifying VNF code.
- Adding comments to several areas of the code.
- Using free_and_zero macros
- Fixing spelling errors
2022-02-22 09:16:59 -08:00
rmagueta 6f19524e95 Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	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_primitives.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-22 15:10:20 +00:00
rmagueta 4f58d66972 Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-22 13:14:12 +00:00
francescomani edb32cad99 fix in config_csirs 2022-02-22 13:37:39 +01:00
rmagueta 2b108cdded Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into develop-CSI 2022-02-22 10:09:51 +00:00
rmagueta 580f56c869 Revert "Implementation of fill_default_csi_MeasConfig"
This reverts commit 777074ff79.
2022-02-22 10:08:39 +00:00
rmagueta 777074ff79 Implementation of fill_default_csi_MeasConfig 2022-02-21 20:23:27 +00:00
Melissa Elkadi 7fb509511d Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-21 06:19:54 -08:00
francescomani 30f6210932 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-21 15:16:39 +01:00
luis_pereira87 fb6936fe27 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
#	openair2/RRC/NR/rrc_gNB.c
2022-02-21 11:00:27 +00:00
luis_pereira87 5b1dfb8bc9 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-21 10:20:42 +00:00
francescomani ec539fc6a5 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-02-21 10:02:30 +01:00
francescomani 7bb7c4d290 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-21 09:24:07 +01:00
francescomani 3b7430a745 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-21 09:12:21 +01:00
Robert Schmidt 86c4882245 Merge remote-tracking branch 'origin/NR_2port_CSIRS' into integration_2022_wk08 2022-02-20 19:48:34 +01:00
Robert Schmidt 72a4ed80da Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08 2022-02-19 19:43:11 +01:00
Robert Schmidt 21f862641c Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08 2022-02-19 19:34:01 +01:00
Raymond Knopp 6d9d1f0b94 changes for 2.5ms TDD period 2022-02-19 13:07:20 +01:00
francescomani c4547c7afd fixing wrong interpretation of support for 256qam table 2022-02-18 18:38:51 +01:00
rmagueta 35d6c4af98 Fix ra_SearchSpace for NSA 2022-02-18 02:09:59 +00:00
rmagueta da251e00b3 Fix firstActiveBWP and defaultBWP for NSA 2022-02-18 01:59:33 +00:00
rmagueta cce425baf7 Fix searchSpaceId and controlResourceSetId for NSA 2022-02-18 01:43:09 +00:00
rmagueta 87c69d2fe4 To use initialBWP when there are no dedicated BWPs in config file 2022-02-18 01:22:26 +00:00
rmagueta 99d1588670 Fix phy-test 2022-02-18 00:28:44 +00:00
rmagueta 0789759b85 Fix dedicated BWPs configuration for NSA 2022-02-17 20:09:39 +00:00
francescomani 9f02206b8a error message if no uecap in fill_default_secondaryCellGroup 2022-02-17 17:43:24 +01:00
rmagueta 95a0271779 Fix warning 2022-02-17 10:22:28 +00:00
Robert Schmidt ff0fb53056 Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c 2022-02-17 09:32:44 +01:00
luis_pereira87 bddcfc512f Implementation of functions required for the BWP switching based on RRC method 2022-02-16 19:23:53 +00:00
matzakos fb153cc792 Merge remote-tracking branch 'origin/NR_SA_UID' into F1C_extensions_develop 2022-02-16 16:08:58 +01:00
matzakos d3d9325081 Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop 2022-02-16 16:08:34 +01:00
luis_pereira87 405edc8bd3 Fix RRC state and sub-state 2022-02-16 12:43:04 +00:00
luis_pereira87 1cd71d1742 Change LOG level 2022-02-16 11:51:20 +00:00