Commit Graph
2569 Commits
Author SHA1 Message Date
rmagueta e834acfaf2 Temporary commit to test CSI-RS without core 2022-03-22 18:25:29 +00:00
rmagueta 17504695f8 Fix updated configurations that was reverted in merge 2022-03-22 18:02:12 +00:00
rmagueta a47861628b Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
Raymond Knopp d840ca0dee Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-22 07:03:40 +01:00
rmagueta 190eaa1e42 Move CSI-RS configuration from fill_initial_SpCellConfig() to update_cellGroupConfig() 2022-03-17 16:36:50 +00:00
rmagueta 8704f81025 Remove duplicated code 2022-03-17 16:35:06 +00:00
rmagueta b59b84e904 Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-17 01:03:35 +00:00
rmagueta 2f2bc2a5e8 Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-16 17:45:39 +00:00
rmagueta 3f88cc1fb1 Intermediate commit: move CSI configuration to a separate function 2022-03-16 17:19:36 +00:00
francescomani 1ab1fde7b8 fix for fdd and other warnings 2022-03-11 14:00:30 +01:00
Raymond Knopp d24068a33b some bugfixes for CSI reporting with PUCCH2. Configuration of cqi_Table 2 for CSI reporting when 256-QAM is enabled. 2022-03-11 01:23:39 +01:00
Robert Schmidt d8209228e7 Hide warning of unused variable
From the comment above the line with the warning:
> This asn1cCalloc leaks memory but also masks a bug.
> If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
> Please don't delete the following line unless the bug has been found
2022-03-07 23:24:50 +01:00
Robert Schmidt 9714877ee0 Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10 2022-03-07 23:12:49 +01:00
rmagueta bbe806a870 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
2022-03-07 13:10:40 +00:00
francescomani 4e76491f79 Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization 2022-03-07 09:09:17 +01:00
Raymond Knopp 2bd90d5b49 Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-03-07 07:38:03 +01:00
Raymond Knopp fcd88de2ab SR/CSI multiplexing fix. default sl_head=6 instead of 4 to check if RF simulator behaves better 2022-03-07 00:08:12 +01:00
Laurent Thomas 939b249ba8 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into remove-NR_UE_PBCH 2022-03-06 15:53:09 +01:00
Laurent Thomas aa910f52b6 debug after develop merge 2022-03-06 15:52:42 +01:00
Raymond Knopp 3402ea00cc build for NR UE 2022-03-06 09:40:36 +01:00
Raymond Knopp f99754a5ea Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/GNB_APP/gnb_config.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/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
Robert Schmidt 0220f4a6e9 Merge remote-tracking branch 'origin/NR_RRC_256QAM_DL' into integration_2022_wk09_b 2022-03-05 13:33:18 +01:00
rmagueta a77769d45b Fix build after merge 2022-03-05 02:32:34 +00:00
rmagueta a634f14f74 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-05 01:58:51 +00:00
luis_pereira87 bb89ae3aca Delete duplicated prototype function (update to develop implementation) 2022-03-05 01:42:26 +00:00
francescomani 4fcbdc24a3 Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization 2022-03-04 17:50:43 +01:00
Robert Schmidt bc2246a566 Remove usage of MSC library after last merge 2022-03-04 09:21:02 +01:00
Robert Schmidt 807e5dd71c Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09 2022-03-03 18:05:27 +01:00
rmagueta 7fdd7547be Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-02 13:14:09 +00:00
Robert Schmidt d6dc279439 Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into integration_2022_wk09 2022-03-01 18:52:33 +01:00
Robert Schmidt 37e09d1ca8 Merge remote-tracking branch 'origin/NR_SA_10MHz' into integration_2022_wk09 2022-02-28 23:43:10 +01:00
Robert Schmidt 6d165912f5 Merge remote-tracking branch 'origin/episys-ul-info-cleanup' into integration_2022_wk08_b 2022-02-26 16:10:03 +01:00
francescomani 5846a9b832 checking if csi_MeasConfig was already allocated 2022-02-24 18:51:07 +01:00
rmagueta 3eaebbca93 CSI PDU received at PHY layer in new function nr_ue_csi_rs_procedures at UE 2022-02-23 20:23:34 +00:00
Laurent THOMAS 22d2e9a38f fix warnings and race cond in polar codec 2022-02-23 18:02:55 +01:00
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 c61a0dd223 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-23 10:11:04 +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