diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-08-21 16:09:12 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-09-02 12:45:36 +0200 |
| commit | 48875211e14a61d662ec94291a301e20300cbbb4 (patch) | |
| tree | e2f333ef1134b594c03604a52ec86f27853cd778 /host | |
| parent | da018c53b473428bc5a53134136db24bdc3cf4dc (diff) | |
| download | uhd-48875211e14a61d662ec94291a301e20300cbbb4.tar.gz uhd-48875211e14a61d662ec94291a301e20300cbbb4.tar.bz2 uhd-48875211e14a61d662ec94291a301e20300cbbb4.zip | |
ad9361: Made recommended rate a constant
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/common/ad9361_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/usrp/common/ad9361_ctrl.cpp b/host/lib/usrp/common/ad9361_ctrl.cpp index 555eace85..c84fcee39 100644 --- a/host/lib/usrp/common/ad9361_ctrl.cpp +++ b/host/lib/usrp/common/ad9361_ctrl.cpp @@ -114,10 +114,10 @@ public: boost::lock_guard<boost::mutex> lock(_mutex); //warning for known trouble rates - if (rate > 56e6) UHD_MSG(warning) << boost::format( + 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) % 56.0 << std::endl; + ) % (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(); diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp index ade206d36..d56cedec9 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp @@ -78,7 +78,7 @@ int get_num_taps(int max_num_taps) { const double ad9361_device_t::AD9361_MAX_GAIN = 89.75; const double ad9361_device_t::AD9361_MAX_CLOCK_RATE = 61.44e6; - +const double ad9361_device_t::AD9361_RECOMMENDED_MAX_CLOCK_RATE = 56e6; /* Program either the RX or TX FIR filter. * diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.h b/host/lib/usrp/common/ad9361_driver/ad9361_device.h index 74f16cff9..41af2eeea 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.h @@ -66,6 +66,7 @@ public: //Constants static const double AD9361_MAX_GAIN; static const double AD9361_MAX_CLOCK_RATE; + static const double AD9361_RECOMMENDED_MAX_CLOCK_RATE; private: //Methods void _program_fir_filter(direction_t direction, int num_taps, boost::uint16_t *coeffs); |