From 2ed94af7726e0f22e765950618ae87bb507e773a Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 10 Jun 2019 23:15:22 -0700 Subject: 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) --- host/examples/benchmark_rate.cpp | 17 +---------------- host/examples/rx_samples_to_file.cpp | 1 - host/examples/tx_samples_from_file.cpp | 2 -- 3 files changed, 1 insertion(+), 19 deletions(-) (limited to 'host/examples') 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 burst_timer_elapsed(false); @@ -323,7 +323,6 @@ int UHD_SAFE_MAIN(int argc, char* argv[]) ("tx_cpu", po::value(&tx_cpu)->default_value("fc32"), "specify the host/cpu sample mode for TX") ("ref", po::value(&ref), "clock reference (internal, external, mimo, gpsdo)") ("pps", po::value(&pps), "PPS source (internal, external, mimo, gpsdo)") - ("mode", po::value(&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(&channel_list)->default_value("0"), "which channel(s) to use (specify \"0\", \"1\", \"0,1\", etc)") ("rx_channels", po::value(&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(&type)->default_value("short"), "sample type: double, float, or short") ("nsamps", po::value(&total_num_samps)->default_value(0), "total number of samples to receive") ("duration", po::value(&total_time)->default_value(0), "total number of seconds to receive") - ("time", po::value(&total_time), "(DEPRECATED) will go away soon! Use --duration instead") ("spb", po::value(&spb)->default_value(10000), "samples per buffer") ("rate", po::value(&rate)->default_value(1e6), "rate of incoming samples") ("freq", po::value(&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(&freq), "RF center frequency in Hz") ("lo-offset", po::value(&lo_offset)->default_value(0.0), "Offset for frontend LO in Hz (optional)") - ("lo_off", po::value(&lo_offset), - "(DEPRECATED) will go away soon! Use --lo-offset instead") ("gain", po::value(&gain), "gain for the RF chain") ("ant", po::value(&ant), "antenna selection") ("subdev", po::value(&subdev), "subdevice specification") -- cgit v1.2.3