aboutsummaryrefslogtreecommitdiffstats
path: root/host/examples
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-06-10 23:15:22 -0700
committerMartin Braun <martin.braun@ettus.com>2019-11-26 11:49:08 -0800
commit2ed94af7726e0f22e765950618ae87bb507e773a (patch)
treed3db840c542f8bb31cd36e843bdfb3e742d902c8 /host/examples
parentd94140a4129d6b2153b15860eeb2406672ebb414 (diff)
downloaduhd-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/examples')
-rw-r--r--host/examples/benchmark_rate.cpp17
-rw-r--r--host/examples/rx_samples_to_file.cpp1
-rw-r--r--host/examples/tx_samples_from_file.cpp2
3 files changed, 1 insertions, 19 deletions
diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp
index 539958ede..dd67ebf3c 100644
--- a/host/examples/benchmark_rate.cpp
+++ b/host/examples/benchmark_rate.cpp
@@ -300,7 +300,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
double rx_rate, tx_rate;
std::string rx_otw, tx_otw;
std::string rx_cpu, tx_cpu;
- std::string mode, ref, pps;
+ std::string ref, pps;
std::string channel_list, rx_channel_list, tx_channel_list;
bool random_nsamps = false;
std::atomic<bool> burst_timer_elapsed(false);
@@ -323,7 +323,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
("tx_cpu", po::value<std::string>(&tx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for TX")
("ref", po::value<std::string>(&ref), "clock reference (internal, external, mimo, gpsdo)")
("pps", po::value<std::string>(&pps), "PPS source (internal, external, mimo, gpsdo)")
- ("mode", po::value<std::string>(&mode), "DEPRECATED - use \"ref\" and \"pps\" instead (none, mimo)")
("random", "Run with random values of samples in send() and recv() to stress-test the I/O.")
("channels", po::value<std::string>(&channel_list)->default_value("0"), "which channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)")
("rx_channels", po::value<std::string>(&rx_channel_list), "which RX channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)")
@@ -359,20 +358,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
random_nsamps = true;
}
- if (vm.count("mode")) {
- if (vm.count("pps") or vm.count("ref")) {
- std::cout << "ERROR: The \"mode\" parameter cannot be used with the \"ref\" "
- "and \"pps\" parameters.\n"
- << std::endl;
- return -1;
- } else if (mode == "mimo") {
- ref = pps = "mimo";
- std::cout << "The use of the \"mode\" parameter is deprecated. Please use "
- "\"ref\" and \"pps\" parameters instead\n"
- << std::endl;
- }
- }
-
// create a usrp device
std::cout << std::endl;
uhd::device_addrs_t device_addrs = uhd::device::find(args, uhd::device::USRP);
diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp
index 3a0fe5b5e..235a9b97b 100644
--- a/host/examples/rx_samples_to_file.cpp
+++ b/host/examples/rx_samples_to_file.cpp
@@ -230,7 +230,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
("type", po::value<std::string>(&type)->default_value("short"), "sample type: double, float, or short")
("nsamps", po::value<size_t>(&total_num_samps)->default_value(0), "total number of samples to receive")
("duration", po::value<double>(&total_time)->default_value(0), "total number of seconds to receive")
- ("time", po::value<double>(&total_time), "(DEPRECATED) will go away soon! Use --duration instead")
("spb", po::value<size_t>(&spb)->default_value(10000), "samples per buffer")
("rate", po::value<double>(&rate)->default_value(1e6), "rate of incoming samples")
("freq", po::value<double>(&freq)->default_value(0.0), "RF center frequency in Hz")
diff --git a/host/examples/tx_samples_from_file.cpp b/host/examples/tx_samples_from_file.cpp
index 7493718d2..89e961b38 100644
--- a/host/examples/tx_samples_from_file.cpp
+++ b/host/examples/tx_samples_from_file.cpp
@@ -70,8 +70,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
("freq", po::value<double>(&freq), "RF center frequency in Hz")
("lo-offset", po::value<double>(&lo_offset)->default_value(0.0),
"Offset for frontend LO in Hz (optional)")
- ("lo_off", po::value<double>(&lo_offset),
- "(DEPRECATED) will go away soon! Use --lo-offset instead")
("gain", po::value<double>(&gain), "gain for the RF chain")
("ant", po::value<std::string>(&ant), "antenna selection")
("subdev", po::value<std::string>(&subdev), "subdevice specification")