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/include | |
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/include')
-rw-r--r-- | host/include/uhd/CMakeLists.txt | 1 | ||||
-rw-r--r-- | host/include/uhd/deprecated.hpp | 67 | ||||
-rw-r--r-- | host/include/uhd/device.hpp | 1 | ||||
-rw-r--r-- | host/include/uhd/types/CMakeLists.txt | 2 | ||||
-rw-r--r-- | host/include/uhd/types/clock_config.hpp | 57 | ||||
-rw-r--r-- | host/include/uhd/types/otw_type.hpp | 2 | ||||
-rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 12 |
7 files changed, 0 insertions, 142 deletions
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt index 6a103fa18..5bb736567 100644 --- a/host/include/uhd/CMakeLists.txt +++ b/host/include/uhd/CMakeLists.txt @@ -21,7 +21,6 @@ UHD_INSTALL(FILES build_info.hpp config.hpp convert.hpp - deprecated.hpp device.hpp exception.hpp property_tree.ipp diff --git a/host/include/uhd/deprecated.hpp b/host/include/uhd/deprecated.hpp deleted file mode 100644 index 0eeefecee..000000000 --- a/host/include/uhd/deprecated.hpp +++ /dev/null @@ -1,67 +0,0 @@ -//---------------------------------------------------------------------- -//-- deprecated interfaces below, to be removed when the API is changed -//---------------------------------------------------------------------- - -// -// Copyright 2010 Ettus Research LLC -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_TYPES_OTW_TYPE_HPP -# define INCLUDED_UHD_TYPES_OTW_TYPE_HPP - -# include <uhd/config.hpp> -# include <cstddef> - -namespace uhd { - -/*! - * Description for over-the-wire integers: - * The DSP units in the FPGA deal with signed 16-bit integers. - * The width and shift define the translation between OTW and DSP, - * defined by the following relation: otw_int = dsp_int >> shift - * - * Note: possible combinations of width, shift, and byteorder - * depend on the internals of the FPGA. Not all are supported! - */ -struct UHD_API otw_type_t -{ - /*! - * Width of an over-the-wire integer in bits. - */ - size_t width; // in bits - - /*! - * Shift of an over-the-wire integer in bits. - * otw_int = dsp_int >> shift - * dsp_int = otw_int << shift - */ - size_t shift; // in bits - - /*! - * Constants for byte order (borrowed from numpy's dtype) - */ - enum /*bo_t*/ { - BO_NATIVE = int('='), - BO_LITTLE_ENDIAN = int('<'), - BO_BIG_ENDIAN = int('>'), - BO_NOT_APPLICABLE = int('|') - } byteorder; - - /*! - * Get the sample size of this otw type. - * \return the size of a sample in bytes - */ - size_t get_sample_size(void) const; - - otw_type_t(void); -}; - -} // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_OTW_TYPE_HPP */ - -#include <uhd/types/clock_config.hpp> //wish it was in here -#include <uhd/types/io_type.hpp> //wish it was in here diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index d2bf4785c..44f74b210 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -9,7 +9,6 @@ #define INCLUDED_UHD_DEVICE_HPP #include <uhd/config.hpp> -#include <uhd/deprecated.hpp> #include <uhd/property_tree.hpp> #include <uhd/stream.hpp> #include <uhd/types/device_addr.hpp> diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt index 40163cb7c..a0eccc3f0 100644 --- a/host/include/uhd/types/CMakeLists.txt +++ b/host/include/uhd/types/CMakeLists.txt @@ -8,7 +8,6 @@ UHD_INSTALL(FILES byte_vector.hpp - clock_config.hpp device_addr.hpp dict.ipp dict.hpp @@ -17,7 +16,6 @@ UHD_INSTALL(FILES io_type.hpp mac_addr.hpp metadata.hpp - otw_type.hpp ranges.hpp ref_vector.hpp sensors.hpp diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp deleted file mode 100644 index 30a754f54..000000000 --- a/host/include/uhd/types/clock_config.hpp +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright 2010-2011 Ettus Research LLC -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP -#define INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP - -#include <uhd/config.hpp> - -namespace uhd { - -/*! - * The DEPRECATED Clock configuration settings: - * The source for the 10MHz reference clock. - * The source and polarity for the PPS clock. - * - * Deprecated in favor of set time/clock source calls. - * Its still in this file for the sake of gr-uhd swig. - * - * Use the convenience functions external() and internal(), - * unless you have a special purpose and cannot use them. - */ -struct UHD_API clock_config_t -{ - //------ simple usage --------// - - //! A convenience function to create an external clock configuration - static clock_config_t external(void); - - //! A convenience function to create an internal clock configuration - static clock_config_t internal(void); - - //------ advanced usage --------// - enum ref_source_t { - REF_AUTO = int('a'), // automatic (device specific) - REF_INT = int('i'), // internal reference - REF_SMA = int('s'), // external sma port - REF_MIMO = int('m') // reference from mimo cable - } ref_source; - enum pps_source_t { - PPS_INT = int('i'), // there is no internal - PPS_SMA = int('s'), // external sma port - PPS_MIMO = int('m') // time sync from mimo cable - } pps_source; - enum pps_polarity_t { - PPS_NEG = int('n'), // negative edge - PPS_POS = int('p') // positive edge - } pps_polarity; - clock_config_t(void); -}; - -} // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP */ diff --git a/host/include/uhd/types/otw_type.hpp b/host/include/uhd/types/otw_type.hpp deleted file mode 100644 index ff761cc55..000000000 --- a/host/include/uhd/types/otw_type.hpp +++ /dev/null @@ -1,2 +0,0 @@ -// The OTW type API has been deprecated in favor of the streamer interface -#include <uhd/deprecated.hpp> diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 6ea711be2..b7710e036 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -25,7 +25,6 @@ #define UHD_USRP_MULTI_USRP_TX_LO_CONFIG_API #include <uhd/config.hpp> -#include <uhd/deprecated.hpp> #include <uhd/device.hpp> #include <uhd/types/filters.hpp> #include <uhd/types/ranges.hpp> @@ -337,17 +336,6 @@ public: virtual void issue_stream_cmd( const stream_cmd_t& stream_cmd, size_t chan = ALL_CHANS) = 0; - /*! - * Set the clock configuration for the usrp device. - * DEPRECATED in favor of set time and clock source calls. - * This tells the usrp how to get a 10MHz reference and PPS clock. - * See the documentation for clock_config_t for more info. - * \param clock_config the clock configuration to set - * \param mboard which motherboard to set the config - */ - virtual void set_clock_config( - const clock_config_t& clock_config, size_t mboard = ALL_MBOARDS) = 0; - /*! Set the time source for the USRP device * * This sets the method of time synchronization, typically a pulse per |