diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2016-02-18 17:40:47 -0800 |
| commit | 1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba (patch) | |
| tree | a6c4fb7f587a6949485717d13cea3e4fa53e3496 /host/lib/usrp/x300/x300_clock_ctrl.hpp | |
| parent | 2d68f228888807d0fd76c7b759ec39fd86523f67 (diff) | |
| parent | ed4223d74cab604213b925da2eccb6055aa7aea2 (diff) | |
| download | uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.gz uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.tar.bz2 uhd-1c2f56bbc1ccd0bffaac8fa4da174d1ad130a3ba.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
host/lib/usrp/dboard/db_ubx.cpp
Diffstat (limited to 'host/lib/usrp/x300/x300_clock_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_clock_ctrl.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/x300/x300_clock_ctrl.hpp b/host/lib/usrp/x300/x300_clock_ctrl.hpp index 160a14e6d..7126f1b9f 100644 --- a/host/lib/usrp/x300/x300_clock_ctrl.hpp +++ b/host/lib/usrp/x300/x300_clock_ctrl.hpp @@ -48,6 +48,7 @@ public: const size_t slaveno, const size_t hw_rev, const double master_clock_rate, + const double dboard_clock_rate, const double system_ref_rate); /*! Get the master clock rate of the device. |