summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--host/lib/convert/convert_impl.cpp2
-rw-r--r--host/lib/transport/super_recv_packet_handler.hpp2
-rw-r--r--host/lib/transport/super_send_packet_handler.hpp2
-rw-r--r--host/lib/usrp/usrp1/io_impl.cpp8
4 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp
index 5c9e77e93..280957c2a 100644
--- a/host/lib/convert/convert_impl.cpp
+++ b/host/lib/convert/convert_impl.cpp
@@ -124,7 +124,7 @@ size_t convert::get_bytes_per_item(const std::string &markup){
return get_bytes_per_item(markup.substr(0, pos));
}
- throw uhd::key_error("Cannot find an item size " + markup);
+ throw uhd::key_error("Cannot find an item size:\n" + markup);
}
UHD_STATIC_BLOCK(convert_register_item_sizes){
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index de7b4b34c..83c8988e8 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -123,7 +123,7 @@ public:
//! Set the conversion routine for all channels
void set_converter(const uhd::convert::id_type &id){
- _io_buffs.resize(id.num_inputs);
+ _io_buffs.resize(id.num_outputs);
_converter = uhd::convert::get_converter(id);
_bytes_per_otw_item = uhd::convert::get_bytes_per_item(id.input_markup);
_bytes_per_cpu_item = uhd::convert::get_bytes_per_item(id.output_markup);
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp
index 42bac5e21..1ac178ad2 100644
--- a/host/lib/transport/super_send_packet_handler.hpp
+++ b/host/lib/transport/super_send_packet_handler.hpp
@@ -99,7 +99,7 @@ public:
//! Set the conversion routine for all channels
void set_converter(const uhd::convert::id_type &id){
- _io_buffs.resize(id.num_outputs);
+ _io_buffs.resize(id.num_inputs);
_converter = uhd::convert::get_converter(id);
_bytes_per_otw_item = uhd::convert::get_bytes_per_item(id.output_markup);
_bytes_per_cpu_item = uhd::convert::get_bytes_per_item(id.input_markup);
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 22c2db6ae..03263ed26 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -549,9 +549,9 @@ rx_streamer::sptr usrp1_impl::get_rx_stream(const uhd::stream_args_t &args){
//set the converter
uhd::convert::id_type id;
id.input_markup = args.otw_format + "_item32_le";
- id.num_inputs = channels.size();
+ id.num_inputs = 1;
id.output_markup = args.cpu_format;
- id.num_outputs = 1;
+ id.num_outputs = channels.size();
id.args = args.args;
my_streamer->set_converter(id);
@@ -590,9 +590,9 @@ tx_streamer::sptr usrp1_impl::get_tx_stream(const uhd::stream_args_t &args){
//set the converter
uhd::convert::id_type id;
id.input_markup = args.cpu_format;
- id.num_inputs = 1;
+ id.num_inputs = channels.size();
id.output_markup = args.otw_format + "_item32_le";
- id.num_outputs = channels.size();
+ id.num_outputs = 1;
id.args = args.args;
my_streamer->set_converter(id);