diff options
author | Josh Blum <josh@joshknows.com> | 2011-02-11 10:29:59 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-02-11 10:29:59 -0800 |
commit | 24c626a1476895a6cb7dbb26b438778c61e52fc2 (patch) | |
tree | 5abc5b05ac59324595c7d811e9ff3946462780df /host | |
parent | 68e4a34d4381ad4d75f1c75ee67a23c95d747986 (diff) | |
download | uhd-24c626a1476895a6cb7dbb26b438778c61e52fc2.tar.gz uhd-24c626a1476895a6cb7dbb26b438778c61e52fc2.tar.bz2 uhd-24c626a1476895a6cb7dbb26b438778c61e52fc2.zip |
usrp: added mboard param to get time now and last pps
Diffstat (limited to 'host')
-rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 6 | ||||
-rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index c77b5d6d2..60b757f50 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -141,15 +141,17 @@ public: /*! * Get the current time in the usrp time registers. + * \param mboard which motherboard to query * \return a timespec representing current usrp time */ - virtual time_spec_t get_time_now(void) = 0; + virtual time_spec_t get_time_now(size_t mboard = 0) = 0; /*! * Get the time when the last pps pulse occured. + * \param mboard which motherboard to query * \return a timespec representing the last pps */ - virtual time_spec_t get_time_last_pps(void) = 0; + virtual time_spec_t get_time_last_pps(size_t mboard = 0) = 0; /*! * Sets the time registers on the usrp immediately. diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 817d7b085..4bdb2bf2e 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -128,12 +128,12 @@ public: return _mboard(mboard)[MBOARD_PROP_NAME].as<std::string>(); } - time_spec_t get_time_now(void){ - return _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>(); + time_spec_t get_time_now(size_t mboard = 0){ + return _mboard(mboard)[MBOARD_PROP_TIME_NOW].as<time_spec_t>(); } - time_spec_t get_time_last_pps(void){ - return _mboard(0)[MBOARD_PROP_TIME_PPS].as<time_spec_t>(); + time_spec_t get_time_last_pps(size_t mboard = 0){ + return _mboard(mboard)[MBOARD_PROP_TIME_PPS].as<time_spec_t>(); } void set_time_now(const time_spec_t &time_spec, size_t mboard){ |