From 7b95cbd7fd2cb0a1aac1ccaea06d417480bf86a0 Mon Sep 17 00:00:00 2001 From: Ciro Nishiguchi Date: Wed, 23 Oct 2019 17:12:03 -0500 Subject: rfnoc: Merge I/O service device args with stream args This makes it possible for users to put I/O service-related args in either the device args or stream args. --- host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp') diff --git a/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp b/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp index 1093f7bec..2707c564c 100644 --- a/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp +++ b/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp @@ -72,7 +72,8 @@ public: * \param recv_link The recv link to connect to an I/O service * \param send_link The send link to connect to an I/O service * \param link_type The type of transport in which the links will be used - * \param io_srv_args The user-requested options for the stream + * \param io_srv_args The default stream args for the device + * \param stream_args The user-provided stream args * \param streamer_id A unique ID for the streamer that will use the links * \return The I/O service to which the links are connected */ @@ -80,8 +81,9 @@ public: transport::recv_link_if::sptr recv_link, transport::send_link_if::sptr send_link, const transport::link_type_t link_type, - const io_service_args_t& io_srv_args = io_service_args_t(), - const std::string& streamer_id = "") = 0; + const io_service_args_t& default_args = io_service_args_t(), + const uhd::device_addr_t& stream_args = uhd::device_addr_t(), + const std::string& streamer_id = "") = 0; /*! Disconnects links from their I/O service * -- cgit v1.2.3