aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2015-08-12 10:54:25 -0700
committerMartin Braun <martin.braun@ettus.com>2015-08-12 17:23:40 -0700
commit89ba34c4fff7ffbcd3f7431840df4622ae935c4e (patch)
tree8764e8913bccf443efbc3dac1d431d5a417d99a3
parentf4f3ce2550aba933b5f4d310d82a42a41ce3f6a1 (diff)
downloaduhd-89ba34c4fff7ffbcd3f7431840df4622ae935c4e.tar.gz
uhd-89ba34c4fff7ffbcd3f7431840df4622ae935c4e.tar.bz2
uhd-89ba34c4fff7ffbcd3f7431840df4622ae935c4e.zip
B200/X300: Make default clock and time sources internal
-rw-r--r--host/lib/usrp/b200/b200_impl.cpp14
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp14
2 files changed, 1 insertions, 27 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index 5aac5995d..f9e7eacfc 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -618,7 +618,7 @@ b200_impl::b200_impl(const uhd::device_addr_t& device_addr, usb_device_handle::s
//init to internal clock and time source
_tree->access<std::string>(mb_path / "clock_source/value").set("internal");
- _tree->access<std::string>(mb_path / "time_source/value").set("none");
+ _tree->access<std::string>(mb_path / "time_source/value").set("internal");
// Set the DSP chains to some safe value
for (size_t i = 0; i < _radio_perifs.size(); i++) {
@@ -631,18 +631,6 @@ b200_impl::b200_impl(const uhd::device_addr_t& device_addr, usb_device_handle::s
UHD_MSG(status) << "Setting master clock rate selection to 'automatic'." << std::endl;
}
- //GPS installed: use external ref, time, and init time spec
- if (_gps and _gps->gps_detected())
- {
- UHD_MSG(status) << "Setting references to the internal GPSDO" << std::endl;
- _tree->access<std::string>(mb_path / "time_source" / "value").set("gpsdo");
- _tree->access<std::string>(mb_path / "clock_source" / "value").set("gpsdo");
- } else {
- //init to internal clock and time source
- _tree->access<std::string>(mb_path / "clock_source/value").set("internal");
- _tree->access<std::string>(mb_path / "time_source/value").set("internal");
- }
-
}
b200_impl::~b200_impl(void)
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index 8e82e8efd..470c1e17d 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -815,20 +815,6 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr)
.set(mb.clock->get_master_clock_rate());
////////////////////////////////////////////////////////////////////
- // initialize clock and time sources
- ////////////////////////////////////////////////////////////////////
- if (mb.gps and mb.gps->gps_detected())
- {
- UHD_MSG(status) << "Setting references to the internal GPSDO" << std::flush;
- _tree->access<std::string>(mb_path / "clock_source" / "value").set("gpsdo");
- _tree->access<std::string>(mb_path / "time_source" / "value").set("gpsdo");
- } else {
- _tree->access<std::string>(mb_path / "clock_source" / "value").set("internal");
- _tree->access<std::string>(mb_path / "time_source" / "value").set("internal");
- }
- UHD_MSG(status) << "done" << std::endl;
-
- ////////////////////////////////////////////////////////////////////
// create frontend mapping
////////////////////////////////////////////////////////////////////
std::vector<size_t> default_map(2, 0); default_map[1] = 1;