diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-05 15:00:51 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-05 15:03:17 -0700 |
| commit | 8e5a81e2096887d7581fd232fb86cc303ca6ecc6 (patch) | |
| tree | f12308386319067c59ac9a6a5c98c1e9b26ba451 /host/lib/transport | |
| parent | 83912104a9c1ab3631f755a4d98ee86e195db690 (diff) | |
| download | uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.tar.gz uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.tar.bz2 uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.zip | |
transport: Removed conditional compiles for terminator APIs
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/super_recv_packet_handler.hpp | 8 | ||||
| -rw-r--r-- | host/lib/transport/super_send_packet_handler.hpp | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp index 5ca1da687..bd7f01c4f 100644 --- a/host/lib/transport/super_recv_packet_handler.hpp +++ b/host/lib/transport/super_recv_packet_handler.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP #define INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP +#include "../rfnoc/rx_stream_terminator.hpp" #include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/convert.hpp> @@ -28,9 +29,6 @@ #include <uhd/types/metadata.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/transport/zero_copy.hpp> -#ifdef DEVICE3_STREAMER -# include "../rfnoc/rx_stream_terminator.hpp" -#endif #include <boost/dynamic_bitset.hpp> #include <boost/foreach.hpp> #include <boost/function.hpp> @@ -131,7 +129,6 @@ public: } } - #ifdef DEVICE3_STREAMER void set_terminator(uhd::rfnoc::rx_stream_terminator::sptr terminator) { _terminator = terminator; @@ -141,7 +138,6 @@ public: { return _terminator; } - #endif ////////////////// RFNOC /////////////////////////// /*! @@ -397,9 +393,7 @@ private: int recvd_packets; #endif - #ifdef DEVICE3_STREAMER uhd::rfnoc::rx_stream_terminator::sptr _terminator; - #endif /******************************************************************* * Get and process a single packet from the transport: diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp index 5e81fb442..d49fb19ca 100644 --- a/host/lib/transport/super_send_packet_handler.hpp +++ b/host/lib/transport/super_send_packet_handler.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_LIBUHD_TRANSPORT_SUPER_SEND_PACKET_HANDLER_HPP #define INCLUDED_LIBUHD_TRANSPORT_SUPER_SEND_PACKET_HANDLER_HPP +#include "../rfnoc/tx_stream_terminator.hpp" #include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/convert.hpp> @@ -28,9 +29,6 @@ #include <uhd/types/metadata.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/transport/zero_copy.hpp> -#ifdef DEVICE3_STREAMER -# include "../rfnoc/tx_stream_terminator.hpp" -#endif #include <boost/thread/thread.hpp> #include <boost/thread/thread_time.hpp> #include <boost/foreach.hpp> @@ -115,7 +113,6 @@ public: } } - #ifdef DEVICE3_STREAMER void set_terminator(uhd::rfnoc::tx_stream_terminator::sptr terminator) { _terminator = terminator; @@ -125,7 +122,6 @@ public: { return _terminator; } - #endif ///////// RFNOC /////////////////// void set_enable_trailer(const bool enable) @@ -322,9 +318,7 @@ private: bool _cached_metadata; uhd::tx_metadata_t _metadata_cache; - #ifdef DEVICE3_STREAMER uhd::rfnoc::tx_stream_terminator::sptr _terminator; - #endif #ifdef UHD_TXRX_DEBUG_PRINTS struct dbg_send_stat_t { |