diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-uhd/lib/usrp_block_impl.cc | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-uhd/lib/usrp_block_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index 84a6791cf7..bbdb347a1f 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015 Free Software Foundation, Inc. + * Copyright 2015-2016 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -207,7 +207,7 @@ bool usrp_block_impl::_wait_for_locked_sensor( else { first_lock_time = boost::system_time(); //reset to 'not a date time' - if (boost::get_system_time() > (start + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT)))){ + if (boost::get_system_time() > (start + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT)))) { return false; } } @@ -313,62 +313,38 @@ void usrp_block_impl::set_time_source(const std::string &source, const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->set_time_source(source, mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } std::string usrp_block_impl::get_time_source(const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->get_time_source(mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } std::vector<std::string> usrp_block_impl::get_time_sources(const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->get_time_sources(mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } void usrp_block_impl::set_clock_source(const std::string &source, const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->set_clock_source(source, mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } std::string usrp_block_impl::get_clock_source(const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->get_clock_source(mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } std::vector<std::string> usrp_block_impl::get_clock_sources(const size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_REF_SOURCES_API return _dev->get_clock_sources(mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } double @@ -441,21 +417,13 @@ void usrp_block_impl::set_command_time(const ::uhd::time_spec_t &time_spec, size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_COMMAND_TIME_API return _dev->set_command_time(time_spec, mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } void usrp_block_impl::clear_command_time(size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_COMMAND_TIME_API return _dev->clear_command_time(mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } void @@ -463,11 +431,7 @@ usrp_block_impl::set_user_register(const uint8_t addr, const uint32_t data, size_t mboard) { -#ifdef UHD_USRP_MULTI_USRP_USER_REGS_API _dev->set_user_register(addr, data, mboard); -#else - throw std::runtime_error("not implemented in this version"); -#endif } void |