diff options
author | Ashish Chaudhari <ashish@ettus.com> | 2015-09-30 11:53:11 -0700 |
---|---|---|
committer | Ashish Chaudhari <ashish@ettus.com> | 2015-09-30 13:23:15 -0700 |
commit | 09a69b22ae41ca6b9935508d523ae88df58301f3 (patch) | |
tree | f9562687da8aba976b9846de32a2311a5674345e /host/lib | |
parent | ad2b2d1d9603b6ffffe4ab617e3957f55d6b5aed (diff) | |
download | uhd-09a69b22ae41ca6b9935508d523ae88df58301f3.tar.gz uhd-09a69b22ae41ca6b9935508d523ae88df58301f3.tar.bz2 uhd-09a69b22ae41ca6b9935508d523ae88df58301f3.zip |
fixup! x300: Added DMA FIFO support to X300
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 1 | ||||
-rw-r--r-- | host/lib/usrp/e300/e300_io_impl.cpp | 1 | ||||
-rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 6d66e83c0..c17161e41 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -1027,7 +1027,6 @@ void e300_impl::_setup_radio(const size_t dspno) // create tx dsp control objects //////////////////////////////////////////////////////////////////// _tree->access<double>(mb_path / "tick_rate") - .subscribe(boost::bind(&tx_vita_core_3000::set_tick_rate, perif.deframer, _1)) .subscribe(boost::bind(&tx_dsp_core_3000::set_tick_rate, perif.duc, _1)); const fs_path tx_dsp_path = mb_path / "tx_dsps" / str(boost::format("%u") % dspno); perif.duc->populate_subtree(_tree->subtree(tx_dsp_path)); diff --git a/host/lib/usrp/e300/e300_io_impl.cpp b/host/lib/usrp/e300/e300_io_impl.cpp index 29d250c8f..209a73077 100644 --- a/host/lib/usrp/e300/e300_io_impl.cpp +++ b/host/lib/usrp/e300/e300_io_impl.cpp @@ -87,7 +87,6 @@ void e300_impl::_update_tick_rate(const double rate) boost::dynamic_pointer_cast<sph::send_packet_streamer>(perif.tx_streamer.lock()); if (my_streamer) my_streamer->set_tick_rate(rate); - perif.deframer->set_tick_rate(_tick_rate); } } diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index c73e26f3d..a47f4e5a9 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -766,7 +766,7 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) } } else { if (mb.dram_buff_ctrl[i]->run_bist() != 0) { - throw uhd::runtime_error(str(boost::format("DRAM FIFO %d BIST failed! (code: %d)\n") % i)); + throw uhd::runtime_error(str(boost::format("DRAM FIFO %d BIST failed!\n") % i)); } } } |