aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2014-08-29 10:06:47 -0700
committerMartin Braun <martin.braun@ettus.com>2014-09-23 13:05:37 -0700
commitdf0c602c43959d15b5102fefe0b2d999a6b27141 (patch)
tree8ed90309e420d9780c77620ccc4bad8476a63611
parent0d6454b27b99a137c55bc772a641e0df9d7ddaa0 (diff)
downloaduhd-df0c602c43959d15b5102fefe0b2d999a6b27141.tar.gz
uhd-df0c602c43959d15b5102fefe0b2d999a6b27141.tar.bz2
uhd-df0c602c43959d15b5102fefe0b2d999a6b27141.zip
usrp: don't print duplicate GPSDO detection messages
-rw-r--r--host/lib/usrp/b200/b200_impl.cpp1
-rw-r--r--host/lib/usrp/e100/e100_impl.cpp4
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.cpp2
3 files changed, 1 insertions, 6 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index bf5fdd251..7f92ae33a 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -304,7 +304,6 @@ b200_impl::b200_impl(const device_addr_t &device_addr)
}
else
{
- UHD_MSG(status) << "not found" << std::endl;
_local_ctrl->poke32(TOREG(SR_CORE_GPSDO_ST), B200_GPSDO_ST_NONE);
}
}
diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp
index b49ba64a2..1d026e2bf 100644
--- a/host/lib/usrp/e100/e100_impl.cpp
+++ b/host/lib/usrp/e100/e100_impl.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -259,7 +259,6 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){
}
if (_gps and _gps->gps_detected())
{
- UHD_MSG(status) << "found" << std::endl;
BOOST_FOREACH(const std::string &name, _gps->get_sensors())
{
_tree->create<sensor_value_t>(mb_path / "sensors" / name)
@@ -268,7 +267,6 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){
}
else
{
- UHD_MSG(status) << "not found" << std::endl;
std::ofstream(GPSDO_VOLATILE_PATH.string().c_str(), std::ofstream::binary) << "42" << std::endl;
}
}
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index d96a8ab7d..3414b7009 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -523,7 +523,6 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
}
if (_mbc[mb].gps and _mbc[mb].gps->gps_detected())
{
- UHD_MSG(status) << "found" << std::endl;
BOOST_FOREACH(const std::string &name, _mbc[mb].gps->get_sensors())
{
_tree->create<sensor_value_t>(mb_path / "sensors" / name)
@@ -532,7 +531,6 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
}
else
{
- UHD_MSG(status) << "not found" << std::endl;
_mbc[mb].iface->pokefw(U2_FW_REG_HAS_GPSDO, dont_look_for_gpsdo);
}
}