aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-18 13:42:24 -0700
committermichael-west <michael.west@ettus.com>2014-06-18 13:42:24 -0700
commit016430b3f8b3535b59e70592fc1029f783cf6cd0 (patch)
tree1a2baf168007a3c4c8fb8c67785237541cfb1a3f
parent248df215aa0b382e2c54877680abfc1ca823bb6b (diff)
downloaduhd-016430b3f8b3535b59e70592fc1029f783cf6cd0.tar.gz
uhd-016430b3f8b3535b59e70592fc1029f783cf6cd0.tar.bz2
uhd-016430b3f8b3535b59e70592fc1029f783cf6cd0.zip
Fix for BUG #516: B210: Fails to Run with 30.72 MHz Clock
- Corrected clock rate checks for B2x0
-rw-r--r--host/lib/usrp/b200/b200_impl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index 40b316175..72dd25904 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -684,7 +684,7 @@ void b200_impl::enforce_tick_rate_limits(size_t chan_count, double tick_rate, co
if (tick_rate > max_tick_rate and (tick_rate - max_tick_rate > 1.0))
{
throw uhd::value_error(boost::str(
- boost::format("current master clock rate (%.2f MHz) exceeds maximum possible master clock rate (%.2f MHz) when using %d %s channels")
+ boost::format("current master clock rate (%.6f MHz) exceeds maximum possible master clock rate (%.6f MHz) when using %d %s channels")
% (tick_rate/1e6)
% (max_tick_rate/1e6)
% chan_count
@@ -696,12 +696,12 @@ void b200_impl::enforce_tick_rate_limits(size_t chan_count, double tick_rate, co
double b200_impl::set_tick_rate(const double rate)
{
- UHD_MSG(status) << (boost::format("Asking for clock rate %.2f MHz\n") % (rate/1e6));
+ UHD_MSG(status) << (boost::format("Asking for clock rate %.6f MHz\n") % (rate/1e6));
check_tick_rate_with_current_streamers(rate); // Defined in b200_io_impl.cpp
_tick_rate = _codec_ctrl->set_clock_rate(rate);
- UHD_MSG(status) << (boost::format("Actually got clock rate %.2f MHz\n") % (_tick_rate/1e6));
+ UHD_MSG(status) << (boost::format("Actually got clock rate %.6f MHz\n") % (_tick_rate/1e6));
//reset after clock rate change
this->reset_codec_dcm();