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.cpp | |
| 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.cpp')
| -rw-r--r-- | host/lib/usrp/n230/n230_resource_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp index 08a98d245..c5617bbf7 100644 --- a/host/lib/usrp/n230/n230_resource_manager.cpp +++ b/host/lib/usrp/n230/n230_resource_manager.cpp @@ -17,7 +17,7 @@ #include "n230_resource_manager.hpp" -#include "usrp3_fw_ctrl_iface.hpp" +#include "n230_fw_ctrl_iface.hpp" #include <uhd/transport/if_addrs.hpp> #include <uhd/transport/udp_zero_copy.hpp> #include <uhd/utils/byteswap.hpp> @@ -91,7 +91,7 @@ n230_resource_manager::n230_resource_manager( uint32_t iface_id = 0xFFFFFFFF; try { - iface_id = usrp3::usrp3_fw_ctrl_iface::get_iface_id( + iface_id = n230::n230_fw_ctrl_iface::get_iface_id( conn_iface.ip_addr, BOOST_STRINGIZE(N230_FW_COMMS_UDP_PORT), N230_FW_PRODUCT_ID); } catch (uhd::io_error&) { throw uhd::io_error(str(boost::format( @@ -118,7 +118,7 @@ n230_resource_manager::n230_resource_manager( } //Create firmware communication interface - _fw_ctrl = usrp3::usrp3_fw_ctrl_iface::make( + _fw_ctrl = n230::n230_fw_ctrl_iface::make( transport::udp_simple::make_connected( _get_conn(PRI_ETH).ip_addr, BOOST_STRINGIZE(N230_FW_COMMS_UDP_PORT)), N230_FW_PRODUCT_ID); if (_fw_ctrl.get() == NULL) { @@ -276,7 +276,7 @@ transport::zero_copy_if::sptr n230_resource_manager::create_transport( return xport; } -bool n230_resource_manager::is_device_claimed(uhd::usrp::usrp3::usrp3_fw_ctrl_iface::sptr fw_ctrl) +bool n230_resource_manager::is_device_claimed(n230_fw_ctrl_iface::sptr fw_ctrl) { boost::mutex::scoped_lock(_claimer_mutex); |