diff options
author | Josh Blum <josh@joshknows.com> | 2011-02-03 17:43:38 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-02-03 17:43:38 -0800 |
commit | abf755a8846b6e2afa53c9b521069e488038cf9a (patch) | |
tree | 320a801cfa577327bbcd19a00c3aa3f3bd99107a /host/lib/usrp/multi_usrp.cpp | |
parent | d6cab26bf26d61d71ba0792bce8f48a89f7dc2d7 (diff) | |
parent | 67bba008255f98367cf19dba518dceb40f763c25 (diff) | |
download | uhd-abf755a8846b6e2afa53c9b521069e488038cf9a.tar.gz uhd-abf755a8846b6e2afa53c9b521069e488038cf9a.tar.bz2 uhd-abf755a8846b6e2afa53c9b521069e488038cf9a.zip |
Merge branch 'multi_usrp_only' into latency_test
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
-rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 48eec28c1..817d7b085 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -53,11 +53,26 @@ public: /******************************************************************* * Mboard methods ******************************************************************/ + void set_master_clock_rate(double rate, size_t mboard){ + if (mboard != ALL_MBOARDS){ + _mboard(mboard)[MBOARD_PROP_CLOCK_RATE] = rate; + return; + } + for (size_t m = 0; m < get_num_mboards(); m++){ + set_master_clock_rate(rate, m); + } + } + + double get_master_clock_rate(size_t mboard){ + return _mboard(mboard)[MBOARD_PROP_CLOCK_RATE].as<double>(); + } + std::string get_pp_string(void){ std::string buff = str(boost::format( - "Multi USRP:\n" + "%s USRP:\n" " Device: %s\n" ) + % ((get_num_mboards() > 1)? "Multi" : "Single") % (*_dev)[DEVICE_PROP_NAME].as<std::string>() ); for (size_t m = 0; m < get_num_mboards(); m++){ @@ -121,6 +136,16 @@ public: return _mboard(0)[MBOARD_PROP_TIME_PPS].as<time_spec_t>(); } + void set_time_now(const time_spec_t &time_spec, size_t mboard){ + if (mboard != ALL_MBOARDS){ + _mboard(mboard)[MBOARD_PROP_TIME_NOW] = time_spec; + return; + } + for (size_t m = 0; m < get_num_mboards(); m++){ + set_time_now(time_spec, m); + } + } + void set_time_next_pps(const time_spec_t &time_spec){ for (size_t m = 0; m < get_num_mboards(); m++){ _mboard(m)[MBOARD_PROP_TIME_PPS] = time_spec; |