aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-10-06 09:25:54 -0700
committerJosh Blum <josh@joshknows.com>2011-11-03 20:37:11 -0700
commitfac15db5d77c5196badb4a06f2f5fec34eb57337 (patch)
treeb5cb44f47bc713a7205fa57b9f193f03a21745f2 /host/lib/usrp
parentfa6d1380918e655a66cd209d7be3b0b31c61e907 (diff)
downloaduhd-fac15db5d77c5196badb4a06f2f5fec34eb57337.tar.gz
uhd-fac15db5d77c5196badb4a06f2f5fec34eb57337.tar.bz2
uhd-fac15db5d77c5196badb4a06f2f5fec34eb57337.zip
uhd: renamed some of the stream types and functions
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/usrp1/io_impl.cpp4
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.hpp4
-rw-r--r--host/lib/usrp/usrp2/io_impl.cpp4
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.hpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 7d4fe2ec7..22c2db6ae 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -527,7 +527,7 @@ bool usrp1_impl::recv_async_msg(
/***********************************************************************
* Receive streamer
**********************************************************************/
-rx_streamer::sptr usrp1_impl::get_rx_streamer(const uhd::streamer_args &args){
+rx_streamer::sptr usrp1_impl::get_rx_stream(const uhd::stream_args_t &args){
//map an empty channel set to chan0
const std::vector<size_t> channels = args.channels.empty()? std::vector<size_t>(1, 0) : args.channels;
@@ -567,7 +567,7 @@ rx_streamer::sptr usrp1_impl::get_rx_streamer(const uhd::streamer_args &args){
/***********************************************************************
* Transmit streamer
**********************************************************************/
-tx_streamer::sptr usrp1_impl::get_tx_streamer(const uhd::streamer_args &args){
+tx_streamer::sptr usrp1_impl::get_tx_stream(const uhd::stream_args_t &args){
//map an empty channel set to chan0
const std::vector<size_t> channels = args.channels.empty()? std::vector<size_t>(1, 0) : args.channels;
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 7776ea8d6..c777307ee 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -55,8 +55,8 @@ public:
~usrp1_impl(void);
//the io interface
- uhd::rx_streamer::sptr get_rx_streamer(const uhd::streamer_args &args);
- uhd::tx_streamer::sptr get_tx_streamer(const uhd::streamer_args &args);
+ uhd::rx_streamer::sptr get_rx_stream(const uhd::stream_args_t &args);
+ uhd::tx_streamer::sptr get_tx_stream(const uhd::stream_args_t &args);
bool recv_async_msg(uhd::async_metadata_t &, double);
private:
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index f271d480a..d37be403b 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -366,7 +366,7 @@ bool usrp2_impl::recv_async_msg(
/***********************************************************************
* Receive streamer
**********************************************************************/
-rx_streamer::sptr usrp2_impl::get_rx_streamer(const uhd::streamer_args &args){
+rx_streamer::sptr usrp2_impl::get_rx_stream(const uhd::stream_args_t &args){
//map an empty channel set to chan0
const std::vector<size_t> channels = args.channels.empty()? std::vector<size_t>(1, 0) : args.channels;
@@ -426,7 +426,7 @@ rx_streamer::sptr usrp2_impl::get_rx_streamer(const uhd::streamer_args &args){
/***********************************************************************
* Transmit streamer
**********************************************************************/
-tx_streamer::sptr usrp2_impl::get_tx_streamer(const uhd::streamer_args &args){
+tx_streamer::sptr usrp2_impl::get_tx_stream(const uhd::stream_args_t &args){
//map an empty channel set to chan0
const std::vector<size_t> channels = args.channels.empty()? std::vector<size_t>(1, 0) : args.channels;
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index a67c704c8..31a390af7 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -72,8 +72,8 @@ public:
~usrp2_impl(void);
//the io interface
- uhd::rx_streamer::sptr get_rx_streamer(const uhd::streamer_args &args);
- uhd::tx_streamer::sptr get_tx_streamer(const uhd::streamer_args &args);
+ uhd::rx_streamer::sptr get_rx_stream(const uhd::stream_args_t &args);
+ uhd::tx_streamer::sptr get_tx_stream(const uhd::stream_args_t &args);
bool recv_async_msg(uhd::async_metadata_t &, double);
private: