diff options
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 20 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 5 |
4 files changed, 1 insertions, 30 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index f5129bc24..5aac5995d 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -637,9 +637,6 @@ b200_impl::b200_impl(const uhd::device_addr_t& device_addr, usb_device_handle::s 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"); - UHD_MSG(status) << "Initializing time to the internal GPSDO" << std::endl; - const time_t tp = time_t(_gps->get_sensor("gps_time").to_int()+1); - _tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp)); } else { //init to internal clock and time source _tree->access<std::string>(mb_path / "clock_source/value").set("internal"); diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 5bef783f6..6d66e83c0 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -621,26 +621,6 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr) } _tree->access<subdev_spec_t>(mb_path / "rx_subdev_spec").set(rx_spec); _tree->access<subdev_spec_t>(mb_path / "tx_subdev_spec").set(tx_spec); - -#ifdef E300_GPSD - //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"); - UHD_MSG(status) << "Initializing time to the internal GPSDO" - << std::endl; - const time_t tp = time_t(_gps->get_sensor("gps_time").to_int()+1); - _tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp)); - - // wait for time to be actually set - boost::this_thread::sleep(boost::posix_time::seconds(1)); - } -#else - //init to internal clock and time source - _tree->access<std::string>(mb_path / "time_source/value").set("internal"); -#endif// E300_GPSD - } boost::uint8_t e300_impl::_get_internal_gpio(gpio_core_200::sptr gpio) diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 6073ec1c0..7b59dfaf1 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -782,9 +782,6 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr) : UHD_MSG(status) << "Setting references to the internal GPSDO" << std::endl; _tree->access<std::string>(root / "time_source/value").set("gpsdo"); _tree->access<std::string>(root / "clock_source/value").set("gpsdo"); - UHD_MSG(status) << "Initializing time to the internal GPSDO" << std::endl; - const time_t tp = time_t(_mbc[mb].gps->get_sensor("gps_time").to_int()+1); - _tree->access<time_spec_t>(root / "time" / "pps").set(time_spec_t(tp)); } } diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 229bf7b23..8e82e8efd 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -819,13 +819,10 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) //////////////////////////////////////////////////////////////////// if (mb.gps and mb.gps->gps_detected()) { - UHD_MSG(status) << "Initializing clock and time using GPSDO... " << std::flush; + 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"); - const time_t tp = time_t(mb.gps->get_sensor("gps_time").to_int() + 1); - _tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp)); } else { - UHD_MSG(status) << "Initializing clock and time using internal sources... " << std::flush; _tree->access<std::string>(mb_path / "clock_source" / "value").set("internal"); _tree->access<std::string>(mb_path / "time_source" / "value").set("internal"); } |