Fixes and improvements in generate_srs_nr function

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -1144,7 +1144,7 @@ int nr_srs_channel_estimation(PHY_VARS_gNB *gNB,
   *snr = dB_fixed((int32_t)((*signal_power<<factor_bits)/(*noise_power))) - factor_dB;
 
 #ifdef SRS_DEBUG
-  uint64_t subcarrier_offset = frame_parms->first_carrier_offset + srs_pdu->bwp_start*12;
+  subcarrier_offset = frame_parms->first_carrier_offset + srs_pdu->bwp_start*12;
   uint8_t R = srs_pdu->comb_size == 0 ? 2 : 4;
   for (int ant = 0; ant < frame_parms->nb_antennas_rx; ant++) {
     for(int sc_idx = 0; sc_idx < nr_srs_info->sc_list_length; sc_idx++) {

openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.h

@@ -131,6 +131,13 @@ EXTERN const uint16_t srs_periodicity[SRS_PERIODICITY]
 #endif
 ;
 
+// TS 38.211 - Table 6.4.1.4.2-1
+EXTERN const uint16_t srs_max_number_cs[3]
+#ifdef INIT_VARIABLES_SRS_MODULATION_NR_H
+    = {8, 12, 6}
+#endif
+;
+
 /*************** FUNCTIONS *****************************************/
 
 /** \brief This function generates the sounding reference symbol (SRS) for the uplink according to 38.211 6.4.1.4 Sounding reference signal