From 2d0a21f779ee70a47101e69d86c119aa8ae963ee Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Tue, 1 Jun 2021 09:29:28 +0200
Subject: [PATCH] Move radio frequency mapping out of the PHY common into the
 PHY reset method

---
 srsue/src/phy/phy.cc        | 7 +++++++
 srsue/src/phy/phy_common.cc | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srsue/src/phy/phy.cc b/srsue/src/phy/phy.cc
index e8df18a33..ada8d8083 100644
--- a/srsue/src/phy/phy.cc
+++ b/srsue/src/phy/phy.cc
@@ -389,6 +389,13 @@ void phy::reset()
   Info("Resetting PHY...");
   common.ta.set_base_sec(0);
   common.reset();
+
+  // Release mapping of secondary cells
+  if (radio != nullptr) {
+    for (uint32_t i = 1; i < args.nof_lte_carriers; i++) {
+      radio->release_freq(i);
+    }
+  }
 }
 
 uint32_t phy::get_current_tti()
diff --git a/srsue/src/phy/phy_common.cc b/srsue/src/phy/phy_common.cc
index 6e0c350fe..836c7859d 100644
--- a/srsue/src/phy/phy_common.cc
+++ b/srsue/src/phy/phy_common.cc
@@ -906,13 +906,6 @@ void phy_common::reset()
       i = {};
     }
   }
-
-  // Release mapping of secondary cells
-  if (args != nullptr && radio_h != nullptr) {
-    for (uint32_t i = 1; i < args->nof_lte_carriers; i++) {
-      radio_h->release_freq(i);
-    }
-  }
 }
 
 /*  Convert 6-bit maps to 10-element subframe tables