diff options
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 5 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 1 | ||||
| -rw-r--r-- | gr-uhd/python/uhd/__init__.py | 1 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 4 |
4 files changed, 0 insertions, 11 deletions
diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index bbdb347a1f..8fc4a83e73 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -132,11 +132,6 @@ usrp_block_impl::usrp_block_impl( _curr_tune_req(stream_args.channels.size(), ::uhd::tune_request_t()), _chans_to_tune(stream_args.channels.size()) { - // TODO remove this when we update UHD - if(stream_args.cpu_format == "fc32") - _type = boost::make_shared< ::uhd::io_type_t >(::uhd::io_type_t::COMPLEX_FLOAT32); - if(stream_args.cpu_format == "sc16") - _type = boost::make_shared< ::uhd::io_type_t >(::uhd::io_type_t::COMPLEX_INT16); _dev = ::uhd::usrp::multi_usrp::make(device_addr); _check_mboard_sensors_locked(); diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index 647e3bab35..efae28074e 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -216,7 +216,6 @@ namespace gr { //! Shared pointer to the underlying multi_usrp object ::uhd::usrp::multi_usrp::sptr _dev; ::uhd::stream_args_t _stream_args; - boost::shared_ptr< ::uhd::io_type_t > _type; //! Number of channels (i.e. number of in- or outputs) size_t _nchan; bool _stream_now; diff --git a/gr-uhd/python/uhd/__init__.py b/gr-uhd/python/uhd/__init__.py index c5c05ddb2e..d88cd4b32d 100644 --- a/gr-uhd/python/uhd/__init__.py +++ b/gr-uhd/python/uhd/__init__.py @@ -113,7 +113,6 @@ def _prepare_uhd_swig(): kwargs = dict(kwargs) for index, key, cast in ( (0, 'device_addr', device_addr), - (1, 'io_type', io_type), ): if len(args) > index: args[index] = cast(args[index]) diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 2852447c80..fb9a8e58fb 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -79,8 +79,6 @@ %include <uhd/types/device_addr.hpp> -%include <uhd/types/io_type.hpp> - %template(range_vector_t) std::vector<uhd::range_t>; //define before range %include <uhd/types/ranges.hpp> @@ -88,8 +86,6 @@ %include <uhd/types/tune_result.hpp> -%include <uhd/types/io_type.hpp> - %include <uhd/types/time_spec.hpp> %extend uhd::time_spec_t{ |