From 255a1d31ac04e2d745b5f0e41a257c9970c8bc97 Mon Sep 17 00:00:00 2001 From: michael-west Date: Wed, 30 Jan 2019 15:45:07 -0800 Subject: 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 --- host/lib/usrp/e300/e300_impl.cpp | 2 ++ 1 file changed, 2 insertions(+) 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); } -- cgit v1.2.3