diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-02-13 10:19:43 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-02-20 10:42:10 -0800 |
| commit | 37ebaa6ad84e90c7d1d0d1133af008e9970a333f (patch) | |
| tree | 05cbb08f781b978d15fcafe712daded4ffc54fe1 /host/lib/usrp/n230/n230_resource_manager.hpp | |
| parent | 2333a30341cbb337f8d5dc49d48b8d2dd2b886c7 (diff) | |
| download | uhd-37ebaa6ad84e90c7d1d0d1133af008e9970a333f.tar.gz uhd-37ebaa6ad84e90c7d1d0d1133af008e9970a333f.tar.bz2 uhd-37ebaa6ad84e90c7d1d0d1133af008e9970a333f.zip | |
n230: Fold in module fka usrp3_fw_ctrl_iface
Diffstat (limited to 'host/lib/usrp/n230/n230_resource_manager.hpp')
| -rw-r--r-- | host/lib/usrp/n230/n230_resource_manager.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp index 180f4f437..6da3b9035 100644 --- a/host/lib/usrp/n230/n230_resource_manager.hpp +++ b/host/lib/usrp/n230/n230_resource_manager.hpp @@ -37,7 +37,7 @@ #include <uhd/transport/bounded_buffer.hpp> #include <uhd/usrp/gps_ctrl.hpp> -#include "usrp3_fw_ctrl_iface.hpp" +#include "n230_fw_ctrl_iface.hpp" #include "n230_clk_pps_ctrl.hpp" #include "n230_cores.hpp" #include "n230_fpga_defs.h" @@ -98,7 +98,7 @@ public: //Methods n230_resource_manager(const std::vector<std::string> ip_addrs, const bool safe_mode); virtual ~n230_resource_manager(); - static bool is_device_claimed(uhd::usrp::usrp3::usrp3_fw_ctrl_iface::sptr fw_ctrl); + static bool is_device_claimed(n230_fw_ctrl_iface::sptr fw_ctrl); inline bool is_device_claimed() { if (_fw_ctrl.get()) { @@ -276,12 +276,12 @@ private: ver_info_t _fpga_version; //Firmware register interface - uhd::usrp::usrp3::usrp3_fw_ctrl_iface::sptr _fw_ctrl; + n230_fw_ctrl_iface::sptr _fw_ctrl; uhd::task::sptr _claimer_task; static boost::mutex _claimer_mutex; //All claims and checks in this process are serialized //Transport - uint8_t _last_host_enpoint; + uint8_t _last_host_enpoint; //Radio settings interface radio_ctrl_core_3000::sptr _core_ctrl; |