diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
| commit | 38b740cde2dfde06185edb83d9caa64a56789914 (patch) | |
| tree | f5073ba267ee22a36e915bdb40fba94845e15958 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 949eebc0e456db83bb44da24197a038ea695b65b (diff) | |
| parent | 93d909e7c8c4053a05cdc9cb69c886183b4a7f09 (diff) | |
| download | uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.gz uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.bz2 uhd-38b740cde2dfde06185edb83d9caa64a56789914.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index fac4b3907..701403029 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -57,7 +57,7 @@ static const std::string USRP2_EEPROM_MAP_KEY = "N100"; //! Make a usrp2 dboard interface. uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface( - uhd::wb_iface::sptr wb_iface, + uhd::timed_wb_iface::sptr wb_iface, uhd::i2c_iface::sptr i2c_iface, uhd::spi_iface::sptr spi_iface, usrp2_clock_ctrl::sptr clk_ctrl @@ -83,7 +83,7 @@ private: usrp2_iface::sptr iface; usrp2_fifo_ctrl::sptr fifo_ctrl; uhd::spi_iface::sptr spiface; - uhd::wb_iface::sptr wbiface; + uhd::timed_wb_iface::sptr wbiface; usrp2_clock_ctrl::sptr clock; usrp2_codec_ctrl::sptr codec; uhd::gps_ctrl::sptr gps; |