Merge branch 'master' into vivado

1 files changed, 15 insertions, 3 deletions

diff --git a/host/lib/usrp/b100/dboard_iface.cpp b/host/lib/usrp/b100/dboard_iface.cpp
index efbba1c4c..325efeec1 100644
--- a/host/lib/usrp/b100/dboard_iface.cpp
+++ b/host/lib/usrp/b100/dboard_iface.cpp
@@ -34,7 +34,7 @@ class b100_dboard_iface : public dboard_iface{
 public:
 
     b100_dboard_iface(
-        wb_iface::sptr wb_iface,
+        timed_wb_iface::sptr wb_iface,
         i2c_iface::sptr i2c_iface,
         spi_iface::sptr spi_iface,
         b100_clock_ctrl::sptr clock,
@@ -72,6 +72,8 @@ public:
     void _set_gpio_out(unit_t, boost::uint16_t);
     void set_gpio_debug(unit_t, int);
     boost::uint16_t read_gpio(unit_t);
+    void set_command_time(const uhd::time_spec_t& t);
+    uhd::time_spec_t get_command_time(void);
 
     void write_i2c(boost::uint16_t, const byte_vector_t &);
     byte_vector_t read_i2c(boost::uint16_t, size_t);
@@ -97,7 +99,7 @@ public:
     double get_codec_rate(unit_t);
 
 private:
-    wb_iface::sptr _wb_iface;
+    timed_wb_iface::sptr _wb_iface;
     i2c_iface::sptr _i2c_iface;
     spi_iface::sptr _spi_iface;
     b100_clock_ctrl::sptr _clock;
@@ -109,7 +111,7 @@ private:
  * Make Function
  **********************************************************************/
 dboard_iface::sptr make_b100_dboard_iface(
-    wb_iface::sptr wb_iface,
+    timed_wb_iface::sptr wb_iface,
     i2c_iface::sptr i2c_iface,
     spi_iface::sptr spi_iface,
     b100_clock_ctrl::sptr clock,
@@ -256,3 +258,13 @@ double b100_dboard_iface::read_aux_adc(dboard_iface::unit_t unit, aux_adc_t whic
     ;
     return _codec->read_aux_adc(unit_to_which_to_aux_adc[unit][which]);
 }
+
+void b100_dboard_iface::set_command_time(const uhd::time_spec_t& t)
+{
+    _wb_iface->set_time(t);
+}
+
+uhd::time_spec_t b100_dboard_iface::get_command_time(void)
+{
+    return _wb_iface->get_time();
+}