From 2373f3267a5aa975064e30060b2dcf909c462a93 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 30 Oct 2018 17:05:17 -0700 Subject: x300: Remove 120 MHz option None of our FPGA images support a 120 MHz master clock rate, so the UHD code should match that. --- host/lib/usrp/x300/x300_defaults.hpp | 2 +- host/lib/usrp/x300/x300_device_args.hpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/x300/x300_defaults.hpp b/host/lib/usrp/x300/x300_defaults.hpp index e10b29291..1f5a52fec 100644 --- a/host/lib/usrp/x300/x300_defaults.hpp +++ b/host/lib/usrp/x300/x300_defaults.hpp @@ -33,7 +33,7 @@ static constexpr size_t DST_ADDR = 2; static constexpr double DEFAULT_TICK_RATE = 200e6; // Hz static constexpr double BUS_CLOCK_RATE = 187.5e6; //Hz -static const std::vector TICK_RATE_OPTIONS{120e6, 184.32e6, 200e6}; +static const std::vector TICK_RATE_OPTIONS{184.32e6, 200e6}; static const std::string FW_FILE_NAME = "usrp_x300_fw.bin"; diff --git a/host/lib/usrp/x300/x300_device_args.hpp b/host/lib/usrp/x300/x300_device_args.hpp index 76edc95ab..57e6e04cc 100644 --- a/host/lib/usrp/x300/x300_device_args.hpp +++ b/host/lib/usrp/x300/x300_device_args.hpp @@ -116,8 +116,6 @@ private: _dboard_clock_rate.set(50e6); } else if (_master_clock_rate.get() == 184.32e6) { _dboard_clock_rate.set(46.08e6); - } else if (_master_clock_rate.get() == 120e6) { - _dboard_clock_rate.set(40e6); } else { throw uhd::value_error( "Can't infer daughterboard clock rate. Specify " -- cgit v1.2.3