diff options
| author | Josh Blum <josh@joshknows.com> | 2012-02-06 16:40:42 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-06 16:40:42 -0800 |
| commit | 5eec31fab45649b529428cda756d04bcdaeb3134 (patch) | |
| tree | f130af1d4c7cdacef74a4918a1d72d3f3facadec /host/lib/usrp/usrp2/usrp2_iface.cpp | |
| parent | 5c56ca574ffdf7ad469ab3a3f54def944a978bee (diff) | |
| download | uhd-5eec31fab45649b529428cda756d04bcdaeb3134.tar.gz uhd-5eec31fab45649b529428cda756d04bcdaeb3134.tar.bz2 uhd-5eec31fab45649b529428cda756d04bcdaeb3134.zip | |
dsp rework: implement 64 bit ticks, no seconds
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 4830c10d9..f3d474a2d 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -126,7 +126,7 @@ public: bool is_device_locked(void){ boost::uint32_t lock_secs = this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FW_PEEK32>(U2_FW_REG_LOCK_TIME); boost::uint32_t lock_gpid = this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FW_PEEK32>(U2_FW_REG_LOCK_GPID); - boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_SECS_RB_IMM); + boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_LO_RB_IMM)/100e6; //if the difference is larger, assume not locked anymore if (curr_secs - lock_secs >= 3) return false; @@ -137,7 +137,7 @@ public: void lock_task(void){ //re-lock in task - boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_SECS_RB_IMM); + boost::uint32_t curr_secs = this->peek32(U2_REG_TIME64_LO_RB_IMM)/100e6; this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FW_POKE32>(U2_FW_REG_LOCK_TIME, curr_secs); //sleep for a bit boost::this_thread::sleep(boost::posix_time::milliseconds(1500)); |