diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-06-10 23:15:22 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 11:49:08 -0800 |
commit | 2ed94af7726e0f22e765950618ae87bb507e773a (patch) | |
tree | d3db840c542f8bb31cd36e843bdfb3e742d902c8 /host/lib/usrp | |
parent | d94140a4129d6b2153b15860eeb2406672ebb414 (diff) | |
download | uhd-2ed94af7726e0f22e765950618ae87bb507e773a.tar.gz uhd-2ed94af7726e0f22e765950618ae87bb507e773a.tar.bz2 uhd-2ed94af7726e0f22e765950618ae87bb507e773a.zip |
uhd: Remove deprecated objects and methods
This removes the following symbols:
- otw_type_t
- clock_config_t
- Any functions that use those symbols
- Non-standard args from examples (e.g., --total-time is deprecated in
favour of --duration)
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/b100/b100_impl.hpp | 1 | ||||
-rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 1 | ||||
-rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 23 | ||||
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.hpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 1 |
5 files changed, 0 insertions, 28 deletions
diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index a0bfcb8ef..492db5740 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -15,7 +15,6 @@ #include <uhd/property_tree.hpp> #include <uhd/types/dict.hpp> #include <uhd/types/sensors.hpp> -#include <uhd/types/clock_config.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/usrp/mboard_eeprom.hpp> #include <uhd/usrp/subdev_spec.hpp> diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index 95fbe6ad2..6e777d4d6 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -17,7 +17,6 @@ #include <uhd/utils/tasks.hpp> #include <uhd/types/dict.hpp> #include <uhd/types/sensors.hpp> -#include <uhd/types/clock_config.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/usrp/mboard_eeprom.hpp> #include <uhd/usrp/subdev_spec.hpp> diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index df36110cc..19d710349 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -697,29 +697,6 @@ public: } } - void set_clock_config(const clock_config_t &clock_config, size_t mboard){ - //set the reference source... - std::string clock_source; - switch(clock_config.ref_source){ - case clock_config_t::REF_INT: clock_source = "internal"; break; - case clock_config_t::REF_SMA: clock_source = "external"; break; - case clock_config_t::REF_MIMO: clock_source = "mimo"; break; - default: clock_source = "unknown"; - } - this->set_clock_source(clock_source, mboard); - - //set the time source - std::string time_source; - switch(clock_config.pps_source){ - case clock_config_t::PPS_INT: time_source = "internal"; break; - case clock_config_t::PPS_SMA: time_source = "external"; break; - case clock_config_t::PPS_MIMO: time_source = "mimo"; break; - default: time_source = "unknown"; - } - if (time_source == "external" and clock_config.pps_polarity == clock_config_t::PPS_NEG) time_source = "_external_"; - this->set_time_source(time_source, mboard); - } - void set_time_source(const std::string &source, const size_t mboard){ if (mboard != ALL_MBOARDS){ const auto time_source_path = diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index e26fa44d0..1cf8362e1 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.hpp @@ -12,8 +12,6 @@ #include <uhd/property_tree.hpp> #include <uhd/utils/pimpl.hpp> #include <uhd/types/dict.hpp> -#include <uhd/types/otw_type.hpp> -#include <uhd/types/clock_config.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/usrp/dboard_id.hpp> #include <uhd/usrp/mboard_eeprom.hpp> diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 0e164e537..4c86ca7c8 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -25,7 +25,6 @@ #include <uhd/utils/pimpl.hpp> #include <uhd/types/dict.hpp> #include <uhd/types/stream_cmd.hpp> -#include <uhd/types/clock_config.hpp> #include <uhd/usrp/dboard_eeprom.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/transport/udp_simple.hpp> |