summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2014-06-18 12:43:10 -0700
committermichael-west <michael.west@ettus.com>2014-06-18 12:43:10 -0700
commit248df215aa0b382e2c54877680abfc1ca823bb6b (patch)
treeb9e4fe93f24d2cedf882735d016847dadac775ca /host/lib/usrp
parent96c30a11f2924fcb5f914f2922506fe6cfdd93ec (diff)
downloaduhd-248df215aa0b382e2c54877680abfc1ca823bb6b.tar.gz
uhd-248df215aa0b382e2c54877680abfc1ca823bb6b.tar.bz2
uhd-248df215aa0b382e2c54877680abfc1ca823bb6b.zip
Fix for BUG #516: B210: Fails to Run with 30.72 MHz Clock
- Corrected clock rate checks for B2x0
Diffstat (limited to 'host/lib/usrp')
-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 261183128..40b316175 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -681,7 +681,7 @@ void b200_impl::enforce_tick_rate_limits(size_t chan_count, double tick_rate, co
else
{
const double max_tick_rate = ((chan_count <= 1) ? AD9361_1_CHAN_CLOCK_RATE_MAX : AD9361_2_CHAN_CLOCK_RATE_MAX);
- if (tick_rate > max_tick_rate)
+ 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")
@@ -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) << "Asking for clock rate " << rate/1e6 << " MHz\n";
+ UHD_MSG(status) << (boost::format("Asking for clock rate %.2f 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) << "Actually got clock rate " << _tick_rate/1e6 << " MHz\n";
+ UHD_MSG(status) << (boost::format("Actually got clock rate %.2f MHz\n") % (_tick_rate/1e6));
//reset after clock rate change
this->reset_codec_dcm();