Remove sc_list_length and sc_list variables

openair1/PHY/INIT/nr_init.c

@@ -616,7 +616,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
 
   for (int id=0; id<NUMBER_OF_NR_SRS_MAX; id++) {
     gNB->nr_srs_info[id] = (nr_srs_info_t *)malloc16_clear(sizeof(nr_srs_info_t));
-    gNB->nr_srs_info[id]->sc_list = (uint16_t *) malloc16_clear(6*fp->N_RB_UL*sizeof(uint16_t));
     gNB->nr_srs_info[id]->k_0_p = (uint8_t**)malloc16_clear(Prx*sizeof(uint8_t*));
     gNB->nr_srs_info[id]->srs_generated_signal = (int32_t**)malloc16_clear(Prx*sizeof(int32_t*));
     gNB->nr_srs_info[id]->signal_power = (uint32_t*)malloc16_clear(sizeof(uint32_t));
@@ -809,7 +808,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
     for(int i=0; i<MAX_NUM_NR_SRS_AP;i++) {
       free_and_zero(gNB->nr_srs_info[id]->srs_generated_signal[i]);
     }
-    free_and_zero(gNB->nr_srs_info[id]->sc_list);
     free_and_zero(gNB->nr_srs_info[id]->srs_generated_signal);
     free_and_zero(gNB->nr_srs_info[id]->signal_power);
     free_and_zero(gNB->nr_srs_info[id]->noise_power_per_rb);

openair1/PHY/INIT/nr_init_ue.c

@@ -343,7 +343,6 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
 
     srs_vars[gNB_id]->active = false;
     ue->nr_srs_info = (nr_srs_info_t *)malloc16_clear(sizeof(nr_srs_info_t));
-    ue->nr_srs_info->sc_list = (uint16_t *) malloc16_clear(6*fp->N_RB_UL*sizeof(uint16_t));
     ue->nr_srs_info->k_0_p = (uint8_t**)malloc16_clear(fp->nb_antennas_rx*sizeof(uint8_t*));
     for (i=0; i<fp->nb_antennas_rx; i++) {
       ue->nr_srs_info->k_0_p[i] = (uint8_t*)malloc16_clear(MAX_NUM_NR_SRS_SYMBOLS*sizeof(uint8_t));
@@ -456,7 +455,6 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
       free_and_zero(ue->nr_srs_info->srs_estimated_channel_time[i]);
       free_and_zero(ue->nr_srs_info->srs_estimated_channel_time_shifted[i]);
     }
-    free_and_zero(ue->nr_srs_info->sc_list);
     free_and_zero(ue->nr_srs_info->noise_power);
     free_and_zero(ue->nr_srs_info->srs_received_signal);
     free_and_zero(ue->nr_srs_info->srs_ls_estimated_channel);

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -967,11 +967,6 @@ int nr_srs_channel_estimation(PHY_VARS_gNB *gNB,
   LOG_I(NR_PHY,"Calling %s function\n", __FUNCTION__);
 #endif
 
-  if(nr_srs_info->sc_list_length == 0) {
-    LOG_E(NR_PHY, "(%d.%d) nr_srs_info was not generated yet!\n", frame, slot);
-    return -1;
-  }
-
   NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
   int32_t ***srs_ls_estimated_channel = nr_srs_info->srs_ls_estimated_channel;
 

openair1/PHY/NR_TRANSPORT/srs_rx.c

@@ -106,11 +106,6 @@ int nr_get_srs_signal(PHY_VARS_gNB *gNB,
   LOG_I(NR_PHY,"Calling %s function\n", __FUNCTION__);
 #endif
 
-  if(nr_srs_info->sc_list_length == 0) {
-    LOG_E(NR_PHY, "(%d.%d) nr_srs_info was not generated yet!\n", frame, slot);
-    return -1;
-  }
-
   int32_t **rxdataF = gNB->common_vars.rxdataF;
   NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
 

openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c

@@ -273,7 +273,6 @@ int generate_srs_nr(nfapi_nr_srs_pdu_t *srs_config_pdu,
 
   // Variable initialization
   if(nr_srs_info) {
-    nr_srs_info->sc_list_length = 0;
     nr_srs_info->srs_generated_signal_bits = log2_approx(amp);
   }
   uint64_t subcarrier_offset = frame_parms->first_carrier_offset + srs_config_pdu->bwp_start*NR_NB_SC_PER_RB;
@@ -406,11 +405,6 @@ int generate_srs_nr(nfapi_nr_srs_pdu_t *srs_config_pdu,
 
         txdataF[p_index][symbol_offset+l_line_offset+subcarrier] = (r_real_amp & 0xFFFF) + ((r_imag_amp<<16)&0xFFFF0000);
 
-        if(nr_srs_info && p_index==0 && l_line==0) {
-          nr_srs_info->sc_list[nr_srs_info->sc_list_length] = subcarrier;
-          nr_srs_info->sc_list_length++;
-        }
-
         // Subcarrier increment
         subcarrier += K_TC;
         if (subcarrier >= frame_parms->ofdm_symbol_size) {

openair1/PHY/defs_nr_common.h

@@ -240,8 +240,6 @@ typedef struct {
 } NR_PRACH_RESOURCES_t;
 
 typedef struct {
-  uint16_t sc_list_length;
-  uint16_t *sc_list;
   uint8_t **k_0_p;
   uint8_t srs_generated_signal_bits;
   int32_t **srs_generated_signal;

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -854,7 +854,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
         nfapi_nr_srs_pdu_t *srs_pdu = &srs->srs_pdu;
 
         // At least currently, the configuration is constant, so it is enough to generate the sequence just once.
-        if(gNB->nr_srs_info[i]->sc_list_length == 0) {
+        if(gNB->nr_srs_info[i]->srs_generated_signal_bits == 0) {
           generate_srs_nr(srs_pdu, &gNB->frame_parms, gNB->nr_srs_info[i]->srs_generated_signal, 0, gNB->nr_srs_info[i], AMP, frame_rx, slot_rx);
         }