diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:00:39 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:05:10 -0700 |
| commit | 2e594ae877f99411d54f1a8e3d9be274d8b9eb35 (patch) | |
| tree | 2fa0a5f0fc501ab2362f424831b367610077c2d6 /host/lib/usrp/b200 | |
| parent | a7049e4ff79cdc205db76bf7270219f254073961 (diff) | |
| parent | cc7d37f114d5a14b4e45372f38324bf95115b6b9 (diff) | |
| download | uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.gz uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.bz2 uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/transport/vrt_if_packet.hpp
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index b1ab6ea7d..693109b1b 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1122,6 +1122,6 @@ sensor_value_t b200_impl::get_ref_locked(void) sensor_value_t b200_impl::get_fe_pll_locked(const bool is_tx) { const boost::uint32_t st = _local_ctrl->peek32(RB32_CORE_PLL); - const bool locked = is_tx ? st & 0x1 : st & 0x2; + const bool locked = is_tx ? bool(st & 0x1) : bool(st & 0x2); return sensor_value_t("LO", locked, "locked", "unlocked"); } |