diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-10-27 14:51:02 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-11-09 14:59:14 -0800 |
commit | 1bd5f44de5485aa835999ee7a6c65ea6836953d1 (patch) | |
tree | 6bfda63eccca9e927efdc6c072d8f484b722644a /host | |
parent | 646f05237d68f0e79a8ea8de52c2dd9f6e38e752 (diff) | |
download | uhd-1bd5f44de5485aa835999ee7a6c65ea6836953d1.tar.gz uhd-1bd5f44de5485aa835999ee7a6c65ea6836953d1.tar.bz2 uhd-1bd5f44de5485aa835999ee7a6c65ea6836953d1.zip |
rfnoc: Removed transport endianness as make arg
This is only confusing, since the blocks do not have to care about
endianness. The control interface needs to know (and takes care of it
internally), and the streaming transport does the same (and does not
directly connect to blocks).
Reviewed-By: Michael West <michael.west@ettus.com>
Diffstat (limited to 'host')
-rw-r--r-- | host/include/uhd/rfnoc/block_ctrl_base.hpp | 5 | ||||
-rw-r--r-- | host/lib/rfnoc/block_ctrl_base.cpp | 1 | ||||
-rw-r--r-- | host/lib/usrp/device3/device3_impl.cpp | 1 | ||||
-rw-r--r-- | host/tests/device3_test.cpp | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp index 725f0d966..724e155bb 100644 --- a/host/include/uhd/rfnoc/block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp @@ -46,7 +46,6 @@ struct make_args_t { make_args_t(const std::string &key="") : device_index(0), - is_big_endian(true), block_name(""), block_key(key) {} @@ -61,7 +60,6 @@ struct make_args_t // property tree is /mboards/0, pass a subtree starting at /mboards/0 // to the constructor. uhd::property_tree::sptr tree; - bool is_big_endian; //! The name of the block as it will be addressed std::string block_name; //! The key of the block, i.e. how it was registered @@ -391,9 +389,6 @@ protected: //! Root node of this block's properties uhd::fs_path _root_path; - //! Endianness of underlying transport (for data transport) - bool _transport_is_big_endian; - //! Block definition (stores info about the block such as ports) blockdef::sptr _block_def; diff --git a/host/lib/rfnoc/block_ctrl_base.cpp b/host/lib/rfnoc/block_ctrl_base.cpp index c273fa76b..20299a3c3 100644 --- a/host/lib/rfnoc/block_ctrl_base.cpp +++ b/host/lib/rfnoc/block_ctrl_base.cpp @@ -48,7 +48,6 @@ inline uint32_t _sr_to_addr64(uint32_t reg) { return reg * 8; }; // for peek64 block_ctrl_base::block_ctrl_base( const make_args_t &make_args ) : _tree(make_args.tree), - _transport_is_big_endian(make_args.is_big_endian), _ctrl_ifaces(make_args.ctrl_ifaces), _base_address(make_args.base_address & 0xFFF0) { diff --git a/host/lib/usrp/device3/device3_impl.cpp b/host/lib/usrp/device3/device3_impl.cpp index 589925940..28b7bc34b 100644 --- a/host/lib/usrp/device3/device3_impl.cpp +++ b/host/lib/usrp/device3/device3_impl.cpp @@ -172,7 +172,6 @@ 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 = (xport.endianness == ENDIANNESS_BIG); _rfnoc_block_ctrl.push_back(uhd::rfnoc::block_ctrl_base::make(make_args, noc_id)); } } diff --git a/host/tests/device3_test.cpp b/host/tests/device3_test.cpp index 657436717..a81f4ca0a 100644 --- a/host/tests/device3_test.cpp +++ b/host/tests/device3_test.cpp @@ -87,7 +87,6 @@ class pseudo_device3_impl : public uhd::device3 make_args.base_address = TEST_SID0.get_dst(); make_args.device_index = 0; make_args.tree = _tree; - make_args.is_big_endian = false; std::cout << "[PSEUDO] Generating block controls 1/2:" << std::endl; _rfnoc_block_ctrl.push_back( block_ctrl_base::make(make_args) ); |