aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/usrp1_impl.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-05-14 19:57:03 -0700
committerJosh Blum <josh@joshknows.com>2011-05-14 19:57:03 -0700
commitf991d3dc751e110425d4a0eed722f6de0fef4261 (patch)
treed147596eba8d16294d4131dec2f66ca5c653f37a /host/lib/usrp/usrp1/usrp1_impl.cpp
parent29a0c916dfdc2f960761c1bebcccc53478abd30c (diff)
downloaduhd-f991d3dc751e110425d4a0eed722f6de0fef4261.tar.gz
uhd-f991d3dc751e110425d4a0eed722f6de0fef4261.tar.bz2
uhd-f991d3dc751e110425d4a0eed722f6de0fef4261.zip
usrp1: apply conditional disables/enables to rx and tx
Scapped the old gnuradio code for information about VRQ_FPGA_SET_XX_ENABLE. It turns out that we should disabled + restore state when changing muxes or rates. The USRP seems to stream properly when receiving single and dual channel. Prior to this commit, tx was accicentally always disabled from a few commits ago.
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index 57aae1b58..b1fa986d1 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -209,6 +209,8 @@ usrp1_impl::usrp1_impl(uhd::transport::usb_zero_copy::sptr data_transport,
}
usrp1_impl::~usrp1_impl(void){
+ UHD_SAFE_CALL(this->enable_rx(false);)
+ UHD_SAFE_CALL(this->enable_tx(false);)
//Safely destruct all RAII objects in a device.
//This prevents the mboard deconstructor from throwing,
//which allows the device to be safely deconstructed.