From 8ec775e936b15404b34d34fd08cc5b3b3489055b Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Fri, 13 Feb 2015 08:40:50 -0800 Subject: usrp2: fixed image compatibility error message * Point to usrp2_card_burner_gui.py instead of usrp2_card_burner.py --- host/lib/usrp/usrp2/usrp2_iface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host/lib/usrp/usrp2') diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 65cf90a17..2f2c345be 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -387,7 +387,7 @@ public: //create the burner commands if (this->get_rev() == USRP2_REV3 or this->get_rev() == USRP2_REV4){ - const std::string card_burner = (fs::path(uhd::get_pkg_path()) / UHD_LIB_DIR / "uhd" / "utils" / "usrp2_card_burner.py").string(); + const std::string card_burner = (fs::path(uhd::get_pkg_path()) / UHD_LIB_DIR / "uhd" / "utils" / "usrp2_card_burner_gui.py").string(); const std::string card_burner_cmd = str(boost::format("\"%s%s\" %s--fpga=\"%s\" %s--fw=\"%s\"") % sudo % card_burner % ml % fpga_image_path % ml % fw_image_path); return str(boost::format("%s\n%s") % print_utility_error("uhd_images_downloader.py") % card_burner_cmd); } -- cgit v1.2.3 From bcd364df0fadf28c2b8bd7933939a7a099d6da04 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 26 Feb 2015 13:07:44 +0100 Subject: N2x0: Fixed missing usage of send_buff_size --- host/lib/usrp/usrp2/io_impl.cpp | 3 ++- host/lib/usrp/usrp2/usrp2_impl.cpp | 5 +++-- host/lib/usrp/usrp2/usrp2_impl.hpp | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'host/lib/usrp/usrp2') diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 9ee6abed0..81be97fa5 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -239,7 +239,8 @@ void usrp2_impl::io_init(void){ //init the tx xport and flow control monitor _io_impl->tx_xports.push_back(_mbc[mb].tx_dsp_xport); _io_impl->fc_mons.push_back(flow_control_monitor::sptr(new flow_control_monitor( - USRP2_SRAM_BYTES/_mbc[mb].tx_dsp_xport->get_send_frame_size() + device_addr.cast("send_buff_size", USRP2_SRAM_BYTES) / + _mbc[mb].tx_dsp_xport->get_send_frame_size() ))); } diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 16e8a1f22..50b8431a1 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -316,9 +316,10 @@ static zero_copy_if::sptr make_xport( /*********************************************************************** * Structors **********************************************************************/ -usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){ +usrp2_impl::usrp2_impl(const device_addr_t &_device_addr) : + device_addr(_device_addr) +{ UHD_MSG(status) << "Opening a USRP2/N-Series device..." << std::endl; - device_addr_t device_addr = _device_addr; //setup the dsp transport hints (default to a large recv buff) if (not device_addr.has_key("recv_buff_size")){ diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index edbb7888b..fac4b3907 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -116,6 +116,7 @@ private: bool _ignore_cal_file; //io impl methods and members + uhd::device_addr_t device_addr; UHD_PIMPL_DECL(io_impl) _io_impl; void io_init(void); void update_tick_rate(const double rate); -- cgit v1.2.3