diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:31:58 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:31:58 -0700 |
| commit | 94385e3e953c380227796ae9ae647ff8c4bd9497 (patch) | |
| tree | 296e2ee10d0e8a5e8a368a456815959c39f483f1 /host/lib/usrp/b200/b200_impl.hpp | |
| parent | 3e3524294629f3ad3c1ca0c0011aeadceab90120 (diff) | |
| parent | 670eeda6e4c9ff2ab81f4e387bce49ea4dc79dcc (diff) | |
| download | uhd-94385e3e953c380227796ae9ae647ff8c4bd9497.tar.gz uhd-94385e3e953c380227796ae9ae647ff8c4bd9497.tar.bz2 uhd-94385e3e953c380227796ae9ae647ff8c4bd9497.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/b200/b200_impl.hpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index 3ca76fce6..130e93891 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -28,7 +28,7 @@ #include "tx_vita_core_3000.hpp" #include "time_core_3000.hpp" #include "gpio_atr_3000.hpp" -#include "b200_radio_ctrl_core.hpp" +#include "radio_ctrl_core_3000.hpp" #include "rx_dsp_core_3000.hpp" #include "tx_dsp_core_3000.hpp" #include <uhd/device.hpp> @@ -131,7 +131,7 @@ private: //controllers b200_iface::sptr _iface; - b200_radio_ctrl_core::sptr _local_ctrl; + radio_ctrl_core_3000::sptr _local_ctrl; uhd::usrp::ad9361_ctrl::sptr _codec_ctrl; uhd::usrp::ad936x_manager::sptr _codec_mgr; b200_local_spi_core::sptr _spi_iface; @@ -154,8 +154,8 @@ private: struct AsyncTaskData { boost::shared_ptr<async_md_type> async_md; - boost::weak_ptr<b200_radio_ctrl_core> local_ctrl; - boost::weak_ptr<b200_radio_ctrl_core> radio_ctrl[2]; + boost::weak_ptr<radio_ctrl_core_3000> local_ctrl; + boost::weak_ptr<radio_ctrl_core_3000> radio_ctrl[2]; b200_uart::sptr gpsdo_uart; }; boost::shared_ptr<AsyncTaskData> _async_task_data; @@ -179,7 +179,7 @@ private: //perifs in the radio core struct radio_perifs_t { - b200_radio_ctrl_core::sptr ctrl; + radio_ctrl_core_3000::sptr ctrl; uhd::usrp::gpio_atr::gpio_atr_3000::sptr atr; uhd::usrp::gpio_atr::gpio_atr_3000::sptr fp_gpio; time_core_3000::sptr time64; |