diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
| commit | 625724d7f81c214e9955334860a364802be3fda9 (patch) | |
| tree | 39d6d0087646ef4028bc6a57d33c89a28112fed8 /host/lib/usrp/e100/dboard_iface.cpp | |
| parent | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (diff) | |
| parent | 3f0b770ab14aa0acaf4846680e3ee7379a1f93d7 (diff) | |
| download | uhd-625724d7f81c214e9955334860a364802be3fda9.tar.gz uhd-625724d7f81c214e9955334860a364802be3fda9.tar.bz2 uhd-625724d7f81c214e9955334860a364802be3fda9.zip | |
Merge branch 'master' into vivado
Diffstat (limited to 'host/lib/usrp/e100/dboard_iface.cpp')
| -rw-r--r-- | host/lib/usrp/e100/dboard_iface.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/host/lib/usrp/e100/dboard_iface.cpp b/host/lib/usrp/e100/dboard_iface.cpp index 07d0049c8..b5baf6c56 100644 --- a/host/lib/usrp/e100/dboard_iface.cpp +++ b/host/lib/usrp/e100/dboard_iface.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2011,2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ class e100_dboard_iface : public dboard_iface{ public: e100_dboard_iface( - wb_iface::sptr wb_iface, + timed_wb_iface::sptr wb_iface, i2c_iface::sptr i2c_iface, spi_iface::sptr spi_iface, e100_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; e100_clock_ctrl::sptr _clock; @@ -109,7 +111,7 @@ private: * Make Function **********************************************************************/ dboard_iface::sptr make_e100_dboard_iface( - wb_iface::sptr wb_iface, + timed_wb_iface::sptr wb_iface, i2c_iface::sptr i2c_iface, spi_iface::sptr spi_iface, e100_clock_ctrl::sptr clock, @@ -256,3 +258,13 @@ double e100_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]); } + +uhd::time_spec_t e100_dboard_iface::get_command_time() +{ + return _wb_iface->get_time(); +} + +void e100_dboard_iface::set_command_time(const uhd::time_spec_t& t) +{ + _wb_iface->set_time(t); +} |