aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-09-19 18:02:35 -0700
committerJosh Blum <josh@joshknows.com>2011-09-19 18:02:35 -0700
commit9f16b409d36a06ba3c40ca1d68411b74cd5fbbbb (patch)
tree80646b11775ad911e52b307653e3acc03795c47d /host/lib
parentc35462adaf8e7ede3da961df92ddbfc78b2c8708 (diff)
downloaduhd-9f16b409d36a06ba3c40ca1d68411b74cd5fbbbb.tar.gz
uhd-9f16b409d36a06ba3c40ca1d68411b74cd5fbbbb.tar.bz2
uhd-9f16b409d36a06ba3c40ca1d68411b74cd5fbbbb.zip
b100: order of deconstruction, kill marauder first
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/usrp/b100/b100_ctrl.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/host/lib/usrp/b100/b100_ctrl.cpp b/host/lib/usrp/b100/b100_ctrl.cpp
index e08b47ce4..7d40daa32 100644
--- a/host/lib/usrp/b100/b100_ctrl.cpp
+++ b/host/lib/usrp/b100/b100_ctrl.cpp
@@ -45,6 +45,11 @@ public:
viking_marauder = task::make(boost::bind(&b100_ctrl_impl::viking_marauder_loop, this));
}
+ ~b100_ctrl_impl(void){
+ //stop the marauder first so it cant access deconstructed objects
+ viking_marauder.reset();
+ }
+
int write(boost::uint32_t addr, const ctrl_data_t &data);
ctrl_data_t read(boost::uint32_t addr, size_t len);