aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mpm/python/usrp_mpm/periph_manager/x4xx.py2
-rw-r--r--mpm/python/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py6
2 files changed, 5 insertions, 3 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/x4xx.py b/mpm/python/usrp_mpm/periph_manager/x4xx.py
index a9db6f510..30938a6b2 100644
--- a/mpm/python/usrp_mpm/periph_manager/x4xx.py
+++ b/mpm/python/usrp_mpm/periph_manager/x4xx.py
@@ -696,7 +696,7 @@ class x4xx(ZynqComponents, PeriphManagerBase):
super(x4xx, self).tear_down()
if self.dio_control is not None:
self.dio_control.tear_down()
- self.rfdc.unset_cbs()
+ self.rfdc.tear_down()
self._clk_mgr.unset_cbs()
# remove x4xx overlay
active_overlays = self.list_active_overlays()
diff --git a/mpm/python/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py b/mpm/python/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py
index be93a495e..6dca79b2a 100644
--- a/mpm/python/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py
+++ b/mpm/python/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py
@@ -88,11 +88,13 @@ class X4xxRfdcCtrl:
self._cal_freeze_cache = {}
@no_rpc
- def unset_cbs(self):
+ def tear_down(self):
"""
- Removes any stored references to our owning X4xx class instance
+ Removes any stored references to our owning X4xx class instance and
+ destructs anything that must happen at teardown
"""
self._get_spll_freq = None
+ del self._rfdc_ctrl
###########################################################################
# Public APIs (not available as MPM RPC calls)