use intermediate variables to improve readability and avoid additional computations

openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h

@@ -70,19 +70,19 @@ void nr_pusch_ptrs_processing(PHY_VARS_gNB *gNB,
                               unsigned char symbol,
                               uint32_t nb_re_pusch);
 
-int nr_srs_channel_estimation(const PHY_VARS_gNB *gNB,
-                              const int frame,
-                              const int slot,
-                              const int ant,
-                              const int p_index,
+int nr_srs_channel_estimation(int ant,
+                              int p_index,
+                              uint16_t ofdm_symbol_size,
+                              uint16_t first_carrier_offset,
+                              uint8_t N_symb_SRS,
                               const nfapi_nr_srs_pdu_t *srs_pdu,
                               const nr_srs_info_t *nr_srs_info,
                               const c16_t *srs_generated_signal,
-                              c16_t srs_received_signal[gNB->frame_parms.ofdm_symbol_size * (1 << srs_pdu->num_symbols)],
-                              c16_t srs_received_noise[gNB->frame_parms.ofdm_symbol_size * (1 << srs_pdu->num_symbols)],
-                              c16_t srs_estimated_channel_freq[gNB->frame_parms.ofdm_symbol_size * (1 << srs_pdu->num_symbols)],
-                              c16_t srs_estimated_channel_time[gNB->frame_parms.ofdm_symbol_size],
-                              c16_t srs_estimated_channel_time_shifted[gNB->frame_parms.ofdm_symbol_size],
+                              c16_t srs_received_signal[ofdm_symbol_size * N_symb_SRS],
+                              c16_t srs_received_noise[ofdm_symbol_size * N_symb_SRS],
+                              c16_t srs_estimated_channel_freq[ofdm_symbol_size * N_symb_SRS],
+                              c16_t srs_estimated_channel_time[ofdm_symbol_size],
+                              c16_t srs_estimated_channel_time_shifted[ofdm_symbol_size],
                               uint32_t *signal_power,
                               uint32_t *noise_power,
                               int16_t *noise_power_per_rb);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -900,11 +900,11 @@ void nr_srs_rx_procedures(PHY_VARS_gNB *gNB,
       uint32_t noise_power = 0;
       for (int p_ind = 0; p_ind < N_ap; p_ind++) {
         uint32_t signal_power = 0;
-        nr_srs_channel_estimation(gNB,
-                                  frame_rx,
-                                  slot_rx,
-                                  ant_rx_ind,
+        nr_srs_channel_estimation(ant_rx_ind,
                                   p_ind,
+                                  ofdm_symbol_size,
+                                  frame_parms->first_carrier_offset,
+                                  N_symb_SRS,
                                   srs_pdu,
                                   nr_srs_info,
                                   nr_srs_info->srs_generated_signal[p_ind],
@@ -1247,10 +1247,10 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, N
         start_meas(&gNB->srs_beam_report_stats);
         nfapi_nr_srs_beamforming_report_t nr_srs_bf_report;
         nr_srs_bf_report.prg_size = srs_pdu->beamforming.prg_size;
-        nr_srs_bf_report.num_symbols = 1 << srs_pdu->num_symbols;
+        nr_srs_bf_report.num_symbols = N_symb_SRS;
         nr_srs_bf_report.wide_band_snr =
             srs_est >= 0 ? (gNB->srs->snr + 64) << 1 : 0xFF; // 0xFF will be set if this field is invalid
-        nr_srs_bf_report.num_reported_symbols = 1 << srs_pdu->num_symbols;
+        nr_srs_bf_report.num_reported_symbols = N_symb_SRS;
         AssertFatal(nr_srs_bf_report.num_reported_symbols == 1,
                     "nr_srs_bf_report.num_reported_symbols %i not handled yet!\n",
                     nr_srs_bf_report.num_reported_symbols);