diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-19 09:38:25 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-19 09:38:25 -0700 |
| commit | f386a2805b1cda04eef8c2ba1a3c680edf28c2a6 (patch) | |
| tree | b7cd00691bf68ce2c7b3bda9d9c1dc67a3bd522d /host/lib | |
| parent | d172b44f157a1429de69599cf0a06aa61fa7a274 (diff) | |
| parent | ad5b10677c91494f87c363e9096b7a2e61e414f6 (diff) | |
| download | uhd-f386a2805b1cda04eef8c2ba1a3c680edf28c2a6.tar.gz uhd-f386a2805b1cda04eef8c2ba1a3c680edf28c2a6.tar.bz2 uhd-f386a2805b1cda04eef8c2ba1a3c680edf28c2a6.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/rfnoc/tick_node_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_remote_codec_ctrl.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/host/lib/rfnoc/tick_node_ctrl.cpp b/host/lib/rfnoc/tick_node_ctrl.cpp index fa5c7b6a1..5548194ae 100644 --- a/host/lib/rfnoc/tick_node_ctrl.cpp +++ b/host/lib/rfnoc/tick_node_ctrl.cpp @@ -37,9 +37,9 @@ double tick_node_ctrl::get_tick_rate( std::set< node_ctrl_base::sptr > explored_nodes(_explored_nodes); explored_nodes.insert(shared_from_this()); // Here, we need all up- and downstream nodes - std::vector< sptr > neighbouring_tick_nodes = find_downstream_node<tick_node_ctrl>(); + std::vector< sptr > neighbouring_tick_nodes = find_downstream_node<tick_node_ctrl>(true); { - std::vector< sptr > upstream_neighbouring_tick_nodes = find_upstream_node<tick_node_ctrl>(); + std::vector< sptr > upstream_neighbouring_tick_nodes = find_upstream_node<tick_node_ctrl>(true); neighbouring_tick_nodes.insert( neighbouring_tick_nodes.end(), upstream_neighbouring_tick_nodes.begin(), diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 33f0850eb..9bd2799c2 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1041,8 +1041,11 @@ void b200_impl::update_clock_source(const std::string &source) } _adf4001_iface->set_lock_to_ext_ref(true); } - else if (_gps and source == "gpsdo") + else if (source == "gpsdo") { + if (not _gps or not _gps->gps_detected()) { + throw uhd::key_error("update_clock_source: gpsdo selected, but no gpsdo detected!"); + } if (_gpio_state.ref_sel != 1) { _gpio_state.ref_sel = 1; diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp index cb2583b1b..6ec39131d 100644 --- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp +++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp @@ -36,8 +36,8 @@ public: { } - void set_timed_spi(uhd::spi_iface::sptr spi_iface, boost::uint32_t slave_num) {}; - void set_safe_spi(uhd::spi_iface::sptr spi_iface, boost::uint32_t slave_num) {}; + void set_timed_spi(uhd::spi_iface::sptr, boost::uint32_t ) {}; + void set_safe_spi(uhd::spi_iface::sptr, boost::uint32_t ) {}; double set_gain(const std::string &which, const double value) { |