diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-14 14:05:19 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-14 14:05:19 -0500 |
| commit | 2f760ac0f883e1de9adca48449498deab72a9359 (patch) | |
| tree | ffe52eeabe9f265dd0471b20d670091091f8dcc8 /host/lib/usrp/common/ad9361_ctrl.cpp | |
| parent | 2f48c9bb979c8777cc8a3d3a0de03e9cf2958b14 (diff) | |
| parent | 19716045c60f00296f24e115580da154e5ddef8d (diff) | |
| download | uhd-2f760ac0f883e1de9adca48449498deab72a9359.tar.gz uhd-2f760ac0f883e1de9adca48449498deab72a9359.tar.bz2 uhd-2f760ac0f883e1de9adca48449498deab72a9359.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_io_impl.cpp
host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
host/lib/usrp/common/ad9361_driver/ad9361_device.h
Diffstat (limited to 'host/lib/usrp/common/ad9361_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/common/ad9361_ctrl.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/host/lib/usrp/common/ad9361_ctrl.cpp b/host/lib/usrp/common/ad9361_ctrl.cpp index 9c17a582d..f3ab36247 100644 --- a/host/lib/usrp/common/ad9361_ctrl.cpp +++ b/host/lib/usrp/common/ad9361_ctrl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012-2014 Ettus Research LLC +// Copyright 2012-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -133,12 +133,6 @@ public: { boost::lock_guard<boost::mutex> lock(_mutex); - //warning for known trouble rates - if (rate > ad9361_device_t::AD9361_RECOMMENDED_MAX_CLOCK_RATE) UHD_MSG(warning) << boost::format( - "The requested clock rate %f MHz may cause slow configuration.\n" - "The driver recommends a master clock rate less than %f MHz.\n" - ) % (rate/1e6) % (ad9361_device_t::AD9361_RECOMMENDED_MAX_CLOCK_RATE/1e6) << std::endl; - //clip to known bounds const meta_range_t clock_rate_range = ad9361_ctrl::get_clock_rate_range(); const double clipped_rate = clock_rate_range.clip(rate); |