diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-12 00:39:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-03 20:37:12 -0700 |
| commit | c885da11389ee275f9c5206b9f8a2155a5393a8a (patch) | |
| tree | ef9a1f22b43f046ecf35674c91b3321d7e5d6867 /host/lib/usrp/usrp1 | |
| parent | 9fc513c961775c9682123394fe5d42ef914bbbd6 (diff) | |
| download | uhd-c885da11389ee275f9c5206b9f8a2155a5393a8a.tar.gz uhd-c885da11389ee275f9c5206b9f8a2155a5393a8a.tar.bz2 uhd-c885da11389ee275f9c5206b9f8a2155a5393a8a.zip | |
uhd: renamed convert markup to format
removed convert args
added simd level
got orc and neon updated
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/io_impl.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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 |