diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-07-01 13:42:56 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-07-04 13:21:14 -0500 |
| commit | 9e1245035299277ac5361329a039c9a943f88fe0 (patch) | |
| tree | fa5ddd1a2721547835db2cbfadeb626aaa56c048 | |
| parent | ae93514658e8e54b2ad007ea56681c3b8d6dc441 (diff) | |
uhd: Remove references to clock_config_t
This extends 87af011b, where we removed other deprecated types.
clock_config_t should have been removed then (same reason: It's
deprecated forever in UHD, and no longer available in the upcoming UHD 4.0).
| -rw-r--r-- | gr-uhd/include/gnuradio/uhd/usrp_block.h | 12 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.cc | 9 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_block_impl.h | 3 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 2 |
4 files changed, 3 insertions, 23 deletions
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_block.h b/gr-uhd/include/gnuradio/uhd/usrp_block.h index 998908b67b..4218faa1f0 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_block.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_block.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015 Free Software Foundation, Inc. + * Copyright 2015,2019 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -486,16 +486,6 @@ namespace gr { size_t mboard = 0) = 0; /*! - * Set the clock configuration. - * - * DEPRECATED for set_time/clock_source. - * \param clock_config the new configuration - * \param mboard the motherboard index 0 to M-1 - */ - virtual void set_clock_config(const ::uhd::clock_config_t &clock_config, - size_t mboard = 0) = 0; - - /*! * Set the time source for the USRP device. * * This sets the method of time synchronization, diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc index 8fc4a83e73..d6b948ba9e 100644 --- a/gr-uhd/lib/usrp_block_impl.cc +++ b/gr-uhd/lib/usrp_block_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015-2016 Free Software Foundation, Inc. + * Copyright 2015-2016,2019 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -298,13 +298,6 @@ usrp_block_impl::get_mboard_sensor_names(size_t mboard) } void -usrp_block_impl::set_clock_config(const ::uhd::clock_config_t &clock_config, - size_t mboard) -{ - return _dev->set_clock_config(clock_config, mboard); -} - -void usrp_block_impl::set_time_source(const std::string &source, const size_t mboard) { diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h index efae28074e..e4eeb81d73 100644 --- a/gr-uhd/lib/usrp_block_impl.h +++ b/gr-uhd/lib/usrp_block_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015-2016 Free Software Foundation, Inc. + * Copyright 2015-2016,2019 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -71,7 +71,6 @@ namespace gr { size_t get_num_mboards(); // Setters - void set_clock_config(const ::uhd::clock_config_t &clock_config, size_t mboard); void set_time_source(const std::string &source, const size_t mboard); void set_clock_source(const std::string &source, const size_t mboard); void set_clock_rate(double rate, size_t mboard); diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index fb9a8e58fb..d27108b905 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -109,8 +109,6 @@ %include <uhd/types/stream_cmd.hpp> -%include <uhd/types/clock_config.hpp> - %include <uhd/types/metadata.hpp> %template(device_addr_vector_t) std::vector<uhd::device_addr_t>; |