diff options
| author | Philip Balister <philip@opensdr.com> | 2010-11-04 08:02:10 -0400 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-11-04 08:02:10 -0400 |
| commit | 40080e474268291c915f8d68e99506e8ae2a3f75 (patch) | |
| tree | 99581ec02c77b08a11f38af901dc9db35adcbe3a /host/lib/usrp/usrp_e/mboard_impl.cpp | |
| parent | 7f8d7b0e2fef1b2d5bb9c8047380dcf958c0c49c (diff) | |
| parent | 16351339eb6962288844cefefbdb3f6eece8aca1 (diff) | |
| download | uhd-40080e474268291c915f8d68e99506e8ae2a3f75.tar.gz uhd-40080e474268291c915f8d68e99506e8ae2a3f75.tar.bz2 uhd-40080e474268291c915f8d68e99506e8ae2a3f75.zip | |
Merge remote branch 'origin/usrp_e_next' into usrp_e_next
Diffstat (limited to 'host/lib/usrp/usrp_e/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e/mboard_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp_e/mboard_impl.cpp b/host/lib/usrp/usrp_e/mboard_impl.cpp index 3d4cef069..f0118aa4b 100644 --- a/host/lib/usrp/usrp_e/mboard_impl.cpp +++ b/host/lib/usrp/usrp_e/mboard_impl.cpp @@ -125,7 +125,7 @@ void usrp_e_impl::mboard_set(const wax::obj &key, const wax::obj &val){ case MBOARD_PROP_TIME_NOW: case MBOARD_PROP_TIME_NEXT_PPS:{ time_spec_t time_spec = val.as<time_spec_t>(); - _iface->poke32(UE_REG_TIME64_TICKS, time_spec.get_tick_count(MASTER_CLOCK_RATE)); + _iface->poke32(UE_REG_TIME64_TICKS, time_spec.get_tick_count(_clock_ctrl->get_fpga_clock_rate())); boost::uint32_t imm_flags = (key.as<mboard_prop_t>() == MBOARD_PROP_TIME_NOW)? 1 : 0; _iface->poke32(UE_REG_TIME64_IMM, imm_flags); _iface->poke32(UE_REG_TIME64_SECS, time_spec.get_full_secs()); |