diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-09-13 08:09:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-09-13 08:09:53 -0700 |
| commit | ea2efe63327c59bc76f84efcc2301e878d15ca2d (patch) | |
| tree | 451ba8f8055322a87a854426a74ca024ba201165 /gr-uhd/lib | |
| parent | a84927af464f6c7513ef6d901a1490b69d4dda70 (diff) | |
| parent | 8e19986cd122d1b380e3d97b4ffc50540670525b (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 6 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 1 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index 1977b89a3a..7f3478c1a5 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -423,6 +423,12 @@ usrp_block_impl::get_device(void) return _dev; } +size_t +usrp_block_impl::get_num_mboards() +{ + return _dev->get_num_mboards(); +} + /********************************************************************** * External Interfaces *********************************************************************/ diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index 2158d542bc..cb07fb356d 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -68,6 +68,7 @@ namespace gr { const std::string &attr, const size_t mboard = 0 ); + size_t get_num_mboards(); // Setters void set_clock_config(const ::uhd::clock_config_t &clock_config, size_t mboard); diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index de91c3a828..efa49aae8e 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -545,8 +545,8 @@ namespace gr { return work(noutput_items, input_items, output_items); default: - std::cout << boost::format("UHD source block got error code 0x%x") - % _metadata.error_code << std::endl; + //GR_LOG_WARN(d_logger, boost::format("USRP Source Block caught rx error: %d") % _metadata.strerror()); + GR_LOG_WARN(d_logger, boost::format("USRP Source Block caught rx error code: %d") % _metadata.error_code); return num_samps; } |