diff options
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/transport/nirio/niriok_proxy_impl_v1.cpp | 7 | ||||
-rw-r--r-- | host/lib/usrp/b200/b200_cores.hpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/common/adf4001_ctrl.hpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp index 7ef0e3645..f4a8e4ff5 100644 --- a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp +++ b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp @@ -285,9 +285,10 @@ namespace uhd { namespace niusrprio niriok_proxy_impl_v1::nirio_syncop_out_params_t out = {}; in.function = niriok_proxy_impl_v1::NIRIO_FUNC::ADD_RESOURCE; - in.subfunction = (fifo_info.direction == OUTPUT_FIFO) ? - niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO : - niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO; + if (fifo_info.direction == OUTPUT_FIFO) + in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO; + else + in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO; in.params.add.fifoWithDataType.channel = fifo_info.channel; in.params.add.fifoWithDataType.baseAddress = fifo_info.base_addr; diff --git a/host/lib/usrp/b200/b200_cores.hpp b/host/lib/usrp/b200/b200_cores.hpp index 8a8900412..32e583794 100644 --- a/host/lib/usrp/b200/b200_cores.hpp +++ b/host/lib/usrp/b200/b200_cores.hpp @@ -57,7 +57,7 @@ public: typedef boost::shared_ptr<b200_ref_pll_ctrl> sptr; b200_ref_pll_ctrl(b200_local_spi_core::sptr spi); - void set_lock_to_ext_ref(bool external); + virtual void set_lock_to_ext_ref(bool external); private: b200_local_spi_core::sptr _spi; diff --git a/host/lib/usrp/common/adf4001_ctrl.hpp b/host/lib/usrp/common/adf4001_ctrl.hpp index 9ea3caf1a..e801ae0c4 100644 --- a/host/lib/usrp/common/adf4001_ctrl.hpp +++ b/host/lib/usrp/common/adf4001_ctrl.hpp @@ -124,7 +124,7 @@ public: class adf4001_ctrl { public: adf4001_ctrl(uhd::spi_iface::sptr _spi, int slaveno); - void set_lock_to_ext_ref(bool external); + virtual void set_lock_to_ext_ref(bool external); private: uhd::spi_iface::sptr spi_iface; |