From 8759eae05e2f02827ac218ed7fb078a5b977fde6 Mon Sep 17 00:00:00 2001 From: Roberto Louro Magueta Date: Tue, 31 May 2022 17:44:18 +0100 Subject: [PATCH] Fix in get_pusch_nb_antenna_ports --- openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c index da38543f14..b51bddfe21 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c @@ -2639,11 +2639,12 @@ uint8_t get_pusch_nb_antenna_ports(NR_PUSCH_Config_t *pusch_Config, n_antenna_port = *pusch_Config->maxRank; } else { - if(srs_config != NULL && srs_resource_indicator.nbits > 0) { + uint8_t sri = srs_resource_indicator.nbits > 0 ? srs_resource_indicator.val : 0; + if(srs_config != NULL) { for(int rs = 0; rs < srs_config->srs_ResourceSetToAddModList->list.count; rs++) { NR_SRS_ResourceSet_t *srs_resource_set = srs_config->srs_ResourceSetToAddModList->list.array[rs]; if(srs_resource_set->usage == NR_SRS_ResourceSet__usage_codebook) { - NR_SRS_Resource_t *srs_resource = srs_config->srs_ResourceToAddModList->list.array[srs_resource_indicator.val]; + NR_SRS_Resource_t *srs_resource = srs_config->srs_ResourceToAddModList->list.array[sri]; AssertFatal(srs_resource != NULL,"SRS resource indicated by DCI does not exist\n"); n_antenna_port = 1<nrofSRS_Ports; }