diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-17 15:12:38 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-17 15:12:38 -0700 |
| commit | 0aff497dacc9cc4eba5d800cc46343da083cfdf1 (patch) | |
| tree | 86ba88e9b103e82140a0413b1ed62ef8d38d0d7b /host/lib/usrp/usrp1 | |
| parent | 9065043544dd129e16d7bb30ae8cb8d5562c3326 (diff) | |
| parent | 17ecc9a442c999f4e752a3c0dc6d237392a499e3 (diff) | |
| download | uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.tar.gz uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.tar.bz2 uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.zip | |
Merge branch 'master' into release_workrelease_003_001_000
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/mboard_impl.cpp | 12 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.hpp | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp index e9108e4f1..f699c8e12 100644 --- a/host/lib/usrp/usrp1/mboard_impl.cpp +++ b/host/lib/usrp/usrp1/mboard_impl.cpp @@ -295,7 +295,7 @@ void usrp1_impl::mboard_get(const wax::obj &key_, wax::obj &val) return; case MBOARD_PROP_CLOCK_CONFIG: - val = _clock_config; + val = clock_config_t::internal(); return; case MBOARD_PROP_RX_SUBDEV_SPEC: @@ -389,6 +389,16 @@ void usrp1_impl::mboard_set(const wax::obj &key, const wax::obj &val) _clock_ctrl->set_master_clock_freq(val.as<double>()); return; + case MBOARD_PROP_CLOCK_CONFIG:{ + clock_config_t clock_config = val.as<clock_config_t>(); + if (clock_config.ref_source != clock_config_t::REF_INT){ + throw uhd::value_error("USRP1 clock config: reference source must be set to internal"); + } + if (clock_config.pps_source != clock_config_t::PPS_INT){ + throw uhd::value_error("USRP1 clock config: PPS source must be set to internal"); + } + }return; + default: UHD_THROW_PROP_SET_ERROR(); } } diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index 69ad9b0a0..a4d40a54d 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.hpp @@ -136,7 +136,6 @@ private: uhd::otw_type_t _tx_otw_type; //configuration shadows - uhd::clock_config_t _clock_config; uhd::usrp::subdev_spec_t _rx_subdev_spec, _tx_subdev_spec; //clock control |