fixes

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1021,7 +1021,7 @@ void fill_initial_SpCellConfig(int uid,
                              bwp_id,
                              uid);
     }
-    conig_rsrp_meas_report(csi_MeasConfig,
+    config_rsrp_meas_report(csi_MeasConfig,
                             scc,
                             pucchcsires1,
                             configuration->do_CSIRS,

openair2/RRC/NR/nr_rrc_config.c

@@ -283,6 +283,7 @@ 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) {
+   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;
@@ -309,6 +310,7 @@ 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);
+   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;
@@ -1450,7 +1452,7 @@ 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,
+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

openair2/RRC/NR/nr_rrc_config.h

@@ -58,7 +58,7 @@ 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,
+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,

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -419,7 +419,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
                           NR_MAX_SUPPORTED_DL_LAYERS,
                           bwp->bwp_Id,
                           uid);
-   conig_rsrp_meas_report(csi_MeasConfig,
+   config_rsrp_meas_report(csi_MeasConfig,
                            servingcellconfigcommon,
                            pucchcsires1,
                            do_csirs,