summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/mimo_usrp.cpp10
-rw-r--r--host/lib/usrp/simple_usrp.cpp4
2 files changed, 9 insertions, 5 deletions
diff --git a/host/lib/usrp/mimo_usrp.cpp b/host/lib/usrp/mimo_usrp.cpp
index bd7753d09..440aaf9f6 100644
--- a/host/lib/usrp/mimo_usrp.cpp
+++ b/host/lib/usrp/mimo_usrp.cpp
@@ -63,11 +63,6 @@ public:
BOOST_FOREACH(wax::obj mboard, _mboards){
mboard[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
}
-
- //set the times to zero at the next pps and sleep
- this->set_time_next_pps(time_spec_t(0, 0));
- sleep(1);
-
}
~mimo_usrp_impl(void){
@@ -115,6 +110,11 @@ public:
/*******************************************************************
* Misc
******************************************************************/
+ time_spec_t get_time_now(void){
+ //the time on the first mboard better be the same on all
+ return _mboards.front()[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+ }
+
void set_time_next_pps(const time_spec_t &time_spec){
BOOST_FOREACH(wax::obj mboard, _mboards){
mboard[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
diff --git a/host/lib/usrp/simple_usrp.cpp b/host/lib/usrp/simple_usrp.cpp
index 4a5171cf7..56e82d7ee 100644
--- a/host/lib/usrp/simple_usrp.cpp
+++ b/host/lib/usrp/simple_usrp.cpp
@@ -86,6 +86,10 @@ public:
/*******************************************************************
* Misc
******************************************************************/
+ time_spec_t get_time_now(void){
+ return _mboard[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+ }
+
void set_time_now(const time_spec_t &time_spec){
_mboard[MBOARD_PROP_TIME_NOW] = time_spec;
}