From 8303ddcf6fbc5f1316e2bf570a69908740dfbd70 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 24 Nov 2022 15:23:41 +0100 Subject: [PATCH] fixes --- openair2/RRC/NR/MESSAGES/asn1_msg.c | 12 ++++++------ openair2/RRC/NR/nr_rrc_config.c | 18 ++++++++++-------- openair2/RRC/NR/nr_rrc_config.h | 12 ++++++------ openair2/RRC/NR/rrc_gNB_reconfig.c | 12 ++++++------ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c index 5e64a071d8..cbbc81e52b 100755 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.c +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c @@ -1021,12 +1021,12 @@ void fill_initial_SpCellConfig(int uid, bwp_id, uid); } - conig_rsrp_meas_report(csi_MeasConfig, - scc, - pucchcsires1, - configuration->do_CSIRS, - bwp_id+10, - uid); + config_rsrp_meas_report(csi_MeasConfig, + scc, + pucchcsires1, + configuration->do_CSIRS, + bwp_id+10, + uid); } pdsch_servingcellconfig->codeBlockGroupTransmission = NULL; pdsch_servingcellconfig->xOverhead = NULL; diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c index 3f6a0c3374..c7036448f0 100644 --- a/openair2/RRC/NR/nr_rrc_config.c +++ b/openair2/RRC/NR/nr_rrc_config.c @@ -283,7 +283,8 @@ void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp, NR_CSI_MeasConfig_t *csi_MeasConfig, int id) { if (do_csirs && dl_antenna_ports > 1) { - csi_MeasConfig->csi_IM_ResourceToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceToAddModList)); + if(!csi_MeasConfig->csi_IM_ResourceToAddModList) + csi_MeasConfig->csi_IM_ResourceToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceToAddModList)); NR_CSI_IM_Resource_t *imres = calloc(1,sizeof(*imres)); imres->csi_IM_ResourceId = id; NR_NZP_CSI_RS_Resource_t *nzpcsi = NULL; @@ -309,7 +310,8 @@ void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp, imres->periodicityAndOffset->present = nzpcsi->periodicityAndOffset->present; set_csiim_offset(imres->periodicityAndOffset, nzpcsi->periodicityAndOffset); ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_IM_ResourceToAddModList->list,imres); - csi_MeasConfig->csi_IM_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceSetToAddModList)); + if(!csi_MeasConfig->csi_IM_ResourceSetToAddModList) + csi_MeasConfig->csi_IM_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceSetToAddModList)); NR_CSI_IM_ResourceSet_t *imset = calloc(1,sizeof(*imset)); imset->csi_IM_ResourceSetId = id; NR_CSI_IM_ResourceId_t *res = calloc(1,sizeof(*res)); @@ -1450,12 +1452,12 @@ void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ReportConfigToAddModList->list,csirep); } -void conig_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, - const NR_ServingCellConfigCommon_t *servingcellconfigcommon, - NR_PUCCH_CSI_Resource_t *pucchcsires, - int do_csi, // if rsrp is based on CSI or SSB - int rep_id, - int uid) +void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, + const NR_ServingCellConfigCommon_t *servingcellconfigcommon, + NR_PUCCH_CSI_Resource_t *pucchcsires, + int do_csi, // if rsrp is based on CSI or SSB + int rep_id, + int uid) { NR_CSI_ReportConfig_t *csirep = calloc(1,sizeof(*csirep)); diff --git a/openair2/RRC/NR/nr_rrc_config.h b/openair2/RRC/NR/nr_rrc_config.h index 89bda83680..ada634d50f 100644 --- a/openair2/RRC/NR/nr_rrc_config.h +++ b/openair2/RRC/NR/nr_rrc_config.h @@ -58,12 +58,12 @@ void set_dl_DataToUL_ACK(NR_PUCCH_Config_t *pucch_Config, int min_feedback_time) void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs); void scheduling_request_config(const NR_ServingCellConfigCommon_t *scc, NR_PUCCH_Config_t *pucch_Config); -void conig_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, - const NR_ServingCellConfigCommon_t *servingcellconfigcommon, - NR_PUCCH_CSI_Resource_t *pucchcsires, - int do_csi, - int rep_id, - int uid); +void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, + const NR_ServingCellConfigCommon_t *servingcellconfigcommon, + NR_PUCCH_CSI_Resource_t *pucchcsires, + int do_csi, + int rep_id, + int uid); void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, const NR_ServingCellConfigCommon_t *servingcellconfigcommon, NR_PUCCH_CSI_Resource_t *pucchcsires, diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c index 37f7b14684..7764185d9c 100644 --- a/openair2/RRC/NR/rrc_gNB_reconfig.c +++ b/openair2/RRC/NR/rrc_gNB_reconfig.c @@ -419,12 +419,12 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco NR_MAX_SUPPORTED_DL_LAYERS, bwp->bwp_Id, uid); - conig_rsrp_meas_report(csi_MeasConfig, - servingcellconfigcommon, - pucchcsires1, - do_csirs, - bwp->bwp_Id+10, - uid); + config_rsrp_meas_report(csi_MeasConfig, + servingcellconfigcommon, + pucchcsires1, + do_csirs, + bwp->bwp_Id+10, + uid); } secondaryCellGroup->spCellConfig->spCellConfigDedicated->sCellDeactivationTimer=NULL;