From e6e6fdedf95a021510b1068878d958400db525f4 Mon Sep 17 00:00:00 2001
From: Roberto Louro Magueta <rmagueta@allbesmart.pt>
Date: Tue, 17 May 2022 18:53:05 +0100
Subject: [PATCH] Free allocated variables for SRS

---
 openair1/PHY/INIT/nr_init.c    | 12 +++++++++---
 openair1/PHY/INIT/nr_init_ue.c | 14 ++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 3454b5e74f..223c6b9db3 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -799,15 +799,21 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
 
   for (int id = 0; id < NUMBER_OF_NR_SRS_MAX; id++) {
     for (int i = 0; i < Prx; i++) {
+      free_and_zero(gNB->nr_srs_info[id]->k_0_p[i]);
+      free_and_zero(gNB->nr_srs_info[id]->srs_generated_signal[i]);
       free_and_zero(gNB->nr_srs_info[id]->srs_received_signal[i]);
+      for (int j = 0; j < Prx; j++) {
+        free_and_zero(gNB->nr_srs_info[id]->srs_ls_estimated_channel[i][j]);
+        free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_freq[i][j]);
+        free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time[i][j]);
+        free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time_shifted[i][j]);
+      }
       free_and_zero(gNB->nr_srs_info[id]->srs_ls_estimated_channel[i]);
       free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_freq[i]);
       free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time[i]);
       free_and_zero(gNB->nr_srs_info[id]->srs_estimated_channel_time_shifted[i]);
     }
-    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]->k_0_p);
     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);
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index 5353d79734..63b211eb71 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -444,23 +444,13 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
   for (int gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
 
     for (int th_id = 0; th_id < RX_NB_TH_MAX; th_id++) {
-
       free_and_zero(ue->pdcch_vars[th_id][gNB_id]);
     }
 
     for (int i = 0; i < fp->nb_antennas_rx; i++) {
-      free_and_zero(ue->nr_srs_info->srs_received_signal[i]);
-      free_and_zero(ue->nr_srs_info->srs_ls_estimated_channel[i]);
-      free_and_zero(ue->nr_srs_info->srs_estimated_channel_freq[i]);
-      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->k_0_p[i]);
     }
-    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);
-    free_and_zero(ue->nr_srs_info->srs_estimated_channel_freq);
-    free_and_zero(ue->nr_srs_info->srs_estimated_channel_time);
-    free_and_zero(ue->nr_srs_info->srs_estimated_channel_time_shifted);
+    free_and_zero(ue->nr_srs_info->k_0_p);
     free_and_zero(ue->nr_srs_info);
 
     free_and_zero(ue->srs_vars[gNB_id]);