uhd: renamed convert markup to format

removed convert args

added simd level

got orc and neon updated

4 files changed, 16 insertions, 24 deletions

diff --git a/host/lib/usrp/b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp
index 82298dca6..28b19f14e 100644
--- a/host/lib/usrp/b100/io_impl.cpp
+++ b/host/lib/usrp/b100/io_impl.cpp
@@ -218,11 +218,10 @@ rx_streamer::sptr b100_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.input_format = args.otw_format + "_item32_le";
     id.num_inputs = 1;
-    id.output_markup = args.cpu_format;
+    id.output_format = args.cpu_format;
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler
@@ -276,11 +275,10 @@ tx_streamer::sptr b100_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.input_format = args.cpu_format;
     id.num_inputs = 1;
-    id.output_markup = args.otw_format + "_item32_le";
+    id.output_format = args.otw_format + "_item32_le";
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler
diff --git a/host/lib/usrp/e100/io_impl.cpp b/host/lib/usrp/e100/io_impl.cpp
index 5936ee2d7..c47eb8940 100644
--- a/host/lib/usrp/e100/io_impl.cpp
+++ b/host/lib/usrp/e100/io_impl.cpp
@@ -294,11 +294,10 @@ rx_streamer::sptr e100_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.input_format = args.otw_format + "_item32_le";
     id.num_inputs = 1;
-    id.output_markup = args.cpu_format;
+    id.output_format = args.cpu_format;
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler
@@ -352,11 +351,10 @@ tx_streamer::sptr e100_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.input_format = args.cpu_format;
     id.num_inputs = 1;
-    id.output_markup = args.otw_format + "_item32_le";
+    id.output_format = args.otw_format + "_item32_le";
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index f46f4741b..534d33959 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -600,11 +600,10 @@ 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 + "_item16_usrp1";
+    id.input_format = args.otw_format + "_item16_usrp1";
     id.num_inputs = 1;
-    id.output_markup = args.cpu_format;
+    id.output_format = args.cpu_format;
     id.num_outputs = args.channels.size();
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //save as weak ptr for update access
@@ -653,11 +652,10 @@ 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.input_format = args.cpu_format;
     id.num_inputs = args.channels.size();
-    id.output_markup = args.otw_format + "_item16_usrp1";
+    id.output_format = args.otw_format + "_item16_usrp1";
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //save as weak ptr for update access
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index f1d0aee2a..660156285 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -391,11 +391,10 @@ rx_streamer::sptr usrp2_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_be";
+    id.input_format = args.otw_format + "_item32_be";
     id.num_inputs = 1;
-    id.output_markup = args.cpu_format;
+    id.output_format = args.cpu_format;
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler
@@ -459,11 +458,10 @@ tx_streamer::sptr usrp2_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.input_format = args.cpu_format;
     id.num_inputs = 1;
-    id.output_markup = args.otw_format + "_item32_be";
+    id.output_format = args.otw_format + "_item32_be";
     id.num_outputs = 1;
-    id.args = args.args;
     my_streamer->set_converter(id);
 
     //bind callbacks for the handler