diff options
| author | michael-west <michael.west@ettus.com> | 2019-01-30 18:31:56 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish.chaudhari@ettus.com> | 2019-01-31 13:47:31 -0800 |
| commit | 324c6d37da35f8e7bdb3b18d6d79d1d0e8252f41 (patch) | |
| tree | db38fc8833386658cdbea44e43bebda10239f659 /host/include | |
| parent | 13663f459d67fb3c0f289bbcbddc4534224381f5 (diff) | |
| download | uhd-324c6d37da35f8e7bdb3b18d6d79d1d0e8252f41.tar.gz uhd-324c6d37da35f8e7bdb3b18d6d79d1d0e8252f41.tar.bz2 uhd-324c6d37da35f8e7bdb3b18d6d79d1d0e8252f41.zip | |
fixup! RFNoC: More graph traversal fixes
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/rfnoc/node_ctrl_base.hpp | 36 | ||||
| -rw-r--r-- | host/include/uhd/rfnoc/node_ctrl_base.ipp | 4 |
2 files changed, 10 insertions, 30 deletions
diff --git a/host/include/uhd/rfnoc/node_ctrl_base.hpp b/host/include/uhd/rfnoc/node_ctrl_base.hpp index db552ff4c..2251baf2d 100644 --- a/host/include/uhd/rfnoc/node_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/node_ctrl_base.hpp @@ -166,26 +166,6 @@ public: get_property, null_value, exclude_nodes); } - UHD_INLINE size_t get_num_input_ports(void) - { - return _num_input_ports; - } - - UHD_INLINE void set_num_input_ports(size_t num_ports) - { - _num_input_ports = num_ports; - } - - UHD_INLINE size_t get_num_output_ports(void) - { - return _num_output_ports; - } - - UHD_INLINE void set_num_output_ports(size_t num_ports) - { - _num_output_ports = num_ports; - } - protected: /*********************************************************************** * Structors @@ -211,6 +191,14 @@ protected: //! List of downstream nodes node_map_t _downstream_nodes; + /*! Number of input ports + */ + size_t _num_input_ports; + + /*! Number of output ports + */ + size_t _num_output_ports; + /*! For every output port, store rx streamer activity. * * If _rx_streamer_active[0] == true, this means that an active rx @@ -283,14 +271,6 @@ private: */ std::map<size_t, size_t> _downstream_ports; - /*! Stores the number of input ports. - */ - size_t _num_input_ports; - - /*! Stores the number of output ports. - */ - size_t _num_output_ports; - }; /* class node_ctrl_base */ }} /* namespace uhd::rfnoc */ diff --git a/host/include/uhd/rfnoc/node_ctrl_base.ipp b/host/include/uhd/rfnoc/node_ctrl_base.ipp index 43a3cb162..0a9553b6d 100644 --- a/host/include/uhd/rfnoc/node_ctrl_base.ipp +++ b/host/include/uhd/rfnoc/node_ctrl_base.ipp @@ -85,8 +85,8 @@ namespace uhd { // map each input port directly to the same output // port. This limits the graph traversal to prevent // finding nodes that are not part of this chain. - if (one_next_node->get_num_input_ports() == - one_next_node->get_num_output_ports()) + if (one_next_node->_num_input_ports == + one_next_node->_num_output_ports) { next_port = (downstream ? node->get_downstream_port(connected_port) : |