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/x300 | |
| 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/x300')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 959245135..548f7bd9c 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -942,8 +942,7 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) n_rfnoc_blocks, X300_XB_DST_PCI + 1, /* base port */ uhd::sid_t(X300_SRC_ADDR0, 0, X300_DST_ADDR + mb_i, 0), - dev_addr, - mb.if_pkt_is_big_endian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE + dev_addr ); //////////////// RFNOC ///////////////// @@ -1063,6 +1062,7 @@ uhd::both_xports_t x300_impl::make_transport( zero_copy_xport_params default_buff_args; both_xports_t xports; + xports.endianness = mb.if_pkt_is_big_endian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE; if (mb.xport_path == "nirio") { xports.send_sid = this->allocate_sid(mb, address, X300_SRC_ADDR0, X300_XB_DST_PCI); xports.recv_sid = xports.send_sid.reversed(); diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index ff18b1a22..3ae37b54a 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -277,9 +277,6 @@ private: /// More IO stuff uhd::device_addr_t get_tx_hints(size_t mb_index); uhd::device_addr_t get_rx_hints(size_t mb_index); - uhd::endianness_t get_transport_endianness(size_t mb_index) { - return _mb[mb_index].if_pkt_is_big_endian ? uhd::ENDIANNESS_BIG : uhd::ENDIANNESS_LITTLE; - }; void post_streamer_hooks(uhd::direction_t dir); }; |