From 5effa740675d4b4547b31dca8c0c65cfafe1e59f Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 18 Jul 2024 18:44:52 +0200 Subject: [PATCH] set FAPI CSI type as TRS when necessary in UE MAC --- openair1/PHY/NR_UE_TRANSPORT/csi_rx.c | 2 +- openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c index 180c91f06f..e75f22cab7 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c +++ b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c @@ -877,7 +877,7 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, LOG_I(NR_PHY, "csirs_config_pdu->power_control_offset_ss = %i\n", csirs_config_pdu->power_control_offset_ss); #endif - if(csirs_config_pdu->measurement_bitmap == 0) { + if(csirs_config_pdu->csi_type == 0) { LOG_E(NR_PHY, "Handling of CSI-RS for tracking not handled yet at PHY\n"); return; } diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c index 6646e607bc..557a393ce2 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c +++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c @@ -2628,7 +2628,7 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) uint16_t bwp_size = current_DL_BWP->BWPSize; uint16_t bwp_start = current_DL_BWP->BWPStart; - for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){ + for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++) { NR_NZP_CSI_RS_Resource_t *nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id]; int period, offset; csi_period_offset(NULL, nzpcsi->periodicityAndOffset, &period, &offset); @@ -2644,7 +2644,10 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) csirs_config_pdu->subcarrier_spacing = mu; csirs_config_pdu->cyclic_prefix = current_DL_BWP->cyclicprefix ? *current_DL_BWP->cyclicprefix : 0; - csirs_config_pdu->csi_type = 1; // NZP-CSI-RS + if (csi_res_id > NR_maxNrofCSI_ResourceConfigurations) + csirs_config_pdu->csi_type = 0; // TRS + else + csirs_config_pdu->csi_type = 1; // NZP-CSI-RS csirs_config_pdu->scramb_id = nzpcsi->scramblingID; csirs_config_pdu->power_control_offset = nzpcsi->powerControlOffset + 8;