aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/multi_usrp.cpp
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2011-02-14 22:01:53 -0800
committerPhilip Balister <philip@opensdr.com>2011-02-14 22:01:53 -0800
commitf157f0ba340b5bee85965881b25a3861a099b7bb (patch)
tree19bf9c0bcff6e2884438db09ca3ff74128b1f0ba /host/lib/usrp/multi_usrp.cpp
parentc9b3cb60e1559a5ea583bbef184a3c76ccb51a21 (diff)
parent85a1575d83505d4d2770e5754bee207181ba0f8a (diff)
downloaduhd-f157f0ba340b5bee85965881b25a3861a099b7bb.tar.gz
uhd-f157f0ba340b5bee85965881b25a3861a099b7bb.tar.bz2
uhd-f157f0ba340b5bee85965881b25a3861a099b7bb.zip
Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into next
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
-rw-r--r--host/lib/usrp/multi_usrp.cpp8
1 files changed, 4 insertions, 4 deletions
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){