diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-26 18:05:31 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-09 14:59:14 -0800 |
| commit | 646f05237d68f0e79a8ea8de52c2dd9f6e38e752 (patch) | |
| tree | ef81f0e0f511f19d6163cce701402e065a89ee64 /host/lib/usrp/device3/device3_impl.cpp | |
| parent | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (diff) | |
| download | uhd-646f05237d68f0e79a8ea8de52c2dd9f6e38e752.tar.gz uhd-646f05237d68f0e79a8ea8de52c2dd9f6e38e752.tar.bz2 uhd-646f05237d68f0e79a8ea8de52c2dd9f6e38e752.zip | |
rfnoc: Moved transport endianness as property into both_xports_t
Reviewed-By: Michael West <michael.west@ettus.com>
Diffstat (limited to 'host/lib/usrp/device3/device3_impl.cpp')
| -rw-r--r-- | host/lib/usrp/device3/device3_impl.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/device3/device3_impl.cpp b/host/lib/usrp/device3/device3_impl.cpp index 50598a519..589925940 100644 --- a/host/lib/usrp/device3/device3_impl.cpp +++ b/host/lib/usrp/device3/device3_impl.cpp @@ -105,8 +105,7 @@ void device3_impl::enumerate_rfnoc_blocks( size_t n_blocks, size_t base_port, const uhd::sid_t &base_sid, - uhd::device_addr_t transport_args, - uhd::endianness_t endianness + uhd::device_addr_t transport_args ) { // entries that are already connected to this block uhd::sid_t ctrl_sid = base_sid; @@ -131,7 +130,7 @@ void device3_impl::enumerate_rfnoc_blocks( ); UHD_DEVICE3_LOG() << str(boost::format("Setting up NoC-Shell Control for port #0 (SID: %s)...") % xport.send_sid.to_pp_string_hex()); uhd::rfnoc::ctrl_iface::sptr ctrl = uhd::rfnoc::ctrl_iface::make( - endianness == ENDIANNESS_BIG, + xport.endianness == uhd::ENDIANNESS_BIG, xport.send, xport.recv, xport.send_sid, @@ -160,7 +159,7 @@ void device3_impl::enumerate_rfnoc_blocks( ); UHD_DEVICE3_LOG() << str(boost::format("Setting up NoC-Shell Control for port #%d (SID: %s)...") % port_number % xport1.send_sid.to_pp_string_hex()); uhd::rfnoc::ctrl_iface::sptr ctrl1 = uhd::rfnoc::ctrl_iface::make( - endianness == ENDIANNESS_BIG, + xport1.endianness == uhd::ENDIANNESS_BIG, xport1.send, xport1.recv, xport1.send_sid, @@ -173,7 +172,7 @@ void device3_impl::enumerate_rfnoc_blocks( make_args.base_address = xport.send_sid.get_dst(); make_args.device_index = device_index; make_args.tree = subtree; - make_args.is_big_endian = (endianness == ENDIANNESS_BIG); + make_args.is_big_endian = (xport.endianness == ENDIANNESS_BIG); _rfnoc_block_ctrl.push_back(uhd::rfnoc::block_ctrl_base::make(make_args, noc_id)); } } |