Fix build after merge

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -1000,10 +1000,7 @@ int nr_srs_channel_estimation(const PHY_VARS_gNB *gNB,
 
   int16_t ls_estimated[2];
 
-  uint8_t mem_offset = 0;
-  while(((long)&srs_estimated_channel_freq[0][nr_srs_info->sc_list[0] + mem_offset] & 0xF) != 0) {
-    mem_offset++;
-  }
+  uint8_t mem_offset = ((long)&srs_estimated_channel_freq[0][0][subcarrier_offset + nr_srs_info->k_0_p[0][0]]) & 0xF;
   int32_t srs_est[frame_parms->ofdm_symbol_size*(1<<srs_pdu->num_symbols) + mem_offset] __attribute__ ((aligned(32)));
 
   for (int ant = 0; ant < frame_parms->nb_antennas_rx; ant++) {

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1092,7 +1092,7 @@ void fill_initial_SpCellConfig(int uid,
 
   // We are using do_srs = 0 here because the periodic SRS will only be enabled in update_cellGroupConfig() if do_srs == 1
   initialUplinkBWP->srs_Config = calloc(1,sizeof(*initialUplinkBWP->srs_Config));
-  config_srs(initialUplinkBWP->srs_Config, curr_bwp, NULL, uid, 0, 0);
+  config_srs(initialUplinkBWP->srs_Config, NULL, curr_bwp, uid, 0, 0);
 
   scheduling_request_config(scc, pucch_Config);
 
@@ -1596,8 +1596,8 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
             calloc(1,sizeof(*SpCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->srs_Config));
       }
       config_srs(SpCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->srs_Config,
-                 curr_bwp,
                  uecap,
+                 curr_bwp,
                  uid,
                  0,
                  configuration->do_SRS);
@@ -1621,6 +1621,7 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
         NR_BWP_Uplink_t *ul_bwp = UL_BWP_list->list.array[i];
         int bwp_size = NRRIV2BW(ul_bwp->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
         config_srs(ul_bwp->bwp_Dedicated->srs_Config,
+                   uecap,
                    bwp_size,
                    uid,
                    i+1,

openair2/RRC/NR/nr_rrc_config.c

@@ -352,8 +352,8 @@ long rrc_get_max_nr_csrs(const uint8_t max_rbs, const long b_SRS) {
 }
 
 void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
-                const int curr_bwp,
                 const NR_UE_NR_Capability_t *uecap,
+                const int curr_bwp,
                 const int uid,
                 const int res_id,
                 const int do_srs) {
@@ -1137,6 +1137,7 @@ void config_uplinkBWP(NR_BWP_Uplink_t *ubwp,
 
   ubwp->bwp_Dedicated->srs_Config = calloc(1,sizeof(*ubwp->bwp_Dedicated->srs_Config));
   config_srs(ubwp->bwp_Dedicated->srs_Config,
+             NULL,
              curr_bwp,
              uid,
              bwp_loop+1,

openair2/RRC/NR/nr_rrc_config.h

@@ -145,8 +145,8 @@ void config_csirs(const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
 void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp,
                   NR_CSI_MeasConfig_t *csi_MeasConfig, int id);
 void config_srs(NR_SetupRelease_SRS_Config_t *setup_release_srs_Config,
-                const int curr_bwp,
                 const NR_UE_NR_Capability_t *uecap,
+                const int curr_bwp,
                 const int uid,
                 const int res_id,
                 const int do_srs);

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -489,7 +489,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
 
   int curr_bwp = NRRIV2BW(servingcellconfigcommon->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
   initialUplinkBWP->srs_Config = calloc(1,sizeof(*initialUplinkBWP->srs_Config));
-  config_srs(initialUplinkBWP->srs_Config, curr_bwp, uid, 0, configuration->do_SRS);
+  config_srs(initialUplinkBWP->srs_Config, NULL, curr_bwp, uid, 0, configuration->do_SRS);
 
   // Downlink BWPs
   int n_dl_bwp = 1;