aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2019-01-30 15:45:07 -0800
committerAshish Chaudhari <ashish.chaudhari@ettus.com>2019-01-31 13:55:21 -0800
commit255a1d31ac04e2d745b5f0e41a257c9970c8bc97 (patch)
tree5f5a3462036755cdb6bf5e16e2938f5d4132f880
parent4e9353d739d2a4479ec7f991c745c8bc56cff43a (diff)
downloaduhd-255a1d31ac04e2d745b5f0e41a257c9970c8bc97.tar.gz
uhd-255a1d31ac04e2d745b5f0e41a257c9970c8bc97.tar.bz2
uhd-255a1d31ac04e2d745b5f0e41a257c9970c8bc97.zip
E31x: Destruct RFNoC before loading idle image
Eliminates errors during application shutdown by explicitly destroying RFNoC blocks before loading the idle image. Signed-off-by: michael-west <michael.west@ettus.com>
-rw-r--r--host/lib/usrp/e300/e300_impl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index ec6ed84ae..59a8cec88 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -585,6 +585,8 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr)
e300_impl::~e300_impl(void)
{
+ // Force RFNoC destructors to fire before loading the idle image
+ _rfnoc_block_ctrl.clear();
if (_xport_path == AXI and not _do_not_reload)
common::load_fpga_image(_idle_image);
}