aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/common/ad9361_driver/ad9361_device.cpp8
-rw-r--r--host/lib/usrp/e300/e300_defaults.hpp2
-rw-r--r--host/lib/usrp/e300/e300_fpga_defs.hpp2
-rw-r--r--host/lib/usrp/e300/e300_impl.cpp46
-rw-r--r--host/lib/usrp/e300/e300_network.cpp5
-rw-r--r--host/lib/usrp/e300/e300_sensor_manager.cpp69
-rw-r--r--host/lib/usrp/e300/e300_sensor_manager.hpp6
7 files changed, 94 insertions, 44 deletions
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
index 3ce655c9b..97b214d7d 100644
--- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
+++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp
@@ -135,9 +135,15 @@ void ad9361_device_t::_program_fir_filter(direction_t direction, int num_taps, b
_io_iface->poke8(base + 5, reg_numtaps | 0x1A);
if (direction == RX) {
_io_iface->poke8(base + 5, reg_numtaps | 0x18);
+ /* Rx Gain, set to prevent digital overflow/saturation in filters
+ 0:+6dB, 1:0dB, 2:-6dB, 3:-12dB
+ page 35 of UG-671 */
_io_iface->poke8(base + 6, 0x02); /* Also turn on -6dB Rx gain here, to stop filter overfow.*/
} else {
- _io_iface->poke8(base + 5, reg_numtaps | 0x19); /* Also turn on -6dB Tx gain here, to stop filter overfow.*/
+ /* Tx Gain. bit[0]. set to prevent digital overflow/saturation in filters
+ 0: 0dB, 1:-6dB
+ page 25 of UG-671 */
+ _io_iface->poke8(base + 5, reg_numtaps | 0x18);
}
}
diff --git a/host/lib/usrp/e300/e300_defaults.hpp b/host/lib/usrp/e300/e300_defaults.hpp
index 9c0e5df1d..8fe8c3a05 100644
--- a/host/lib/usrp/e300/e300_defaults.hpp
+++ b/host/lib/usrp/e300/e300_defaults.hpp
@@ -35,7 +35,7 @@ static const double DEFAULT_FE_GAIN = 0.0;
static const double DEFAULT_FE_FREQ = 1.0e9;
static const double DEFAULT_FE_BW = 56e6;
-static const std::string DEFAULT_TIME_SRC = "none";
+static const std::string DEFAULT_TIME_SRC = "internal";
static const std::string DEFAULT_CLOCK_SRC = "internal";
static const size_t DEFAULT_RX_DATA_FRAME_SIZE = 4096;
diff --git a/host/lib/usrp/e300/e300_fpga_defs.hpp b/host/lib/usrp/e300/e300_fpga_defs.hpp
index 5fba65b90..c038efbae 100644
--- a/host/lib/usrp/e300/e300_fpga_defs.hpp
+++ b/host/lib/usrp/e300/e300_fpga_defs.hpp
@@ -21,7 +21,7 @@ namespace uhd { namespace usrp { namespace e300 { namespace fpga {
static const size_t NUM_RADIOS = 2;
-static const boost::uint32_t COMPAT_MAJOR = 5;
+static const boost::uint32_t COMPAT_MAJOR = 6;
static const boost::uint32_t COMPAT_MINOR = 0;
}}}} // namespace
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index d04794947..0c112fdb1 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -381,7 +381,7 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr)
} catch (std::exception &e) {
UHD_MSG(error) << "An error occured making GPSDO control: " << e.what() << std::endl;
}
- _sensor_manager = e300_sensor_manager::make_local(_gps);
+ _sensor_manager = e300_sensor_manager::make_local(_gps, _global_regs);
}
UHD_MSG(status) << (_sensor_manager->get_gps_found() ? "found" : "not found") << std::endl;
@@ -493,14 +493,15 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr)
.subscribe(boost::bind(&time_core_3000::set_time_next_pps, _radio_perifs[1].time64, _1));
//setup time source props
_tree->create<std::string>(mb_path / "time_source" / "value")
- .subscribe(boost::bind(&e300_impl::_update_time_source, this, _1));
- static const std::vector<std::string> time_sources = boost::assign::list_of("none")("external")("gpsdo");
+ .subscribe(boost::bind(&e300_impl::_update_time_source, this, _1))
+ .set(e300::DEFAULT_TIME_SRC);
+ static const std::vector<std::string> time_sources = boost::assign::list_of("none")("internal")("external")("gpsdo");
_tree->create<std::vector<std::string> >(mb_path / "time_source" / "options").set(time_sources);
//setup reference source props
_tree->create<std::string>(mb_path / "clock_source" / "value")
- .subscribe(boost::bind(&e300_impl::_update_clock_source, this, _1));
- static const std::vector<std::string> clock_sources = boost::assign::list_of("internal");
- // not implemented ("external")("gpsdo");
+ .subscribe(boost::bind(&e300_impl::_update_clock_source, this, _1))
+ .set(e300::DEFAULT_CLOCK_SRC);
+ static const std::vector<std::string> clock_sources = boost::assign::list_of("internal"); //external,gpsdo not supported
_tree->create<std::vector<std::string> >(mb_path / "clock_source" / "options").set(clock_sources);
////////////////////////////////////////////////////////////////////
@@ -573,29 +574,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);
-
- if (_sensor_manager->get_gps_found()) {
- _tree->access<std::string>(mb_path / "clock_source" / "value").set("gpsdo");
- _tree->access<std::string>(mb_path / "time_source" / "value").set("gpsdo");
- UHD_MSG(status) << "References initialized to GPSDO sources" << std::endl;
- const time_t tp = time_t(_sensor_manager->get_gps_time().to_int());
- _tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp));
- //wait for time to be set (timeout after 1 second)
- for (int i = 0; i < 10; i++)
- {
- boost::this_thread::sleep(boost::posix_time::milliseconds(100));
- if(tp == (_tree->access<time_spec_t>(mb_path / "time" / "pps").get()).get_full_secs())
- break;
- }
- } else {
- // init to default time and clock source
- _tree->access<std::string>(mb_path / "clock_source" / "value").set(
- e300::DEFAULT_CLOCK_SRC);
- _tree->access<std::string>(mb_path / "time_source" / "value").set(
- e300::DEFAULT_TIME_SRC);
-
- UHD_MSG(status) << "References initialized to internal sources" << std::endl;
- }
}
boost::uint8_t e300_impl::_get_internal_gpio(
@@ -895,14 +873,20 @@ e300_impl::both_xports_t e300_impl::_make_transport(
return xports;
}
-void e300_impl::_update_clock_source(const std::string &)
+void e300_impl::_update_clock_source(const std::string &source)
{
+ if (source != "internal") {
+ throw uhd::value_error(boost::str(
+ boost::format("Clock source option not supported: %s. The only value supported is \"internal\". " \
+ "To discipline the internal oscillator, set the appropriate time source.") % source
+ ));
+ }
}
void e300_impl::_update_antenna_sel(const size_t &which, const std::string &ant)
{
if (ant != "TX/RX" and ant != "RX2")
- throw uhd::value_error("e300: unknown RX antenna option: " + ant);
+ throw uhd::value_error("Unknown RX antenna option: " + ant);
_radio_perifs[which].ant_rx2 = (ant == "RX2");
this->_update_atrs();
}
diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp
index 6d36d8681..2c37f2ff1 100644
--- a/host/lib/usrp/e300/e300_network.cpp
+++ b/host/lib/usrp/e300/e300_network.cpp
@@ -332,6 +332,9 @@ static void e300_sensor_tunnel(
} else if (uhd::ntohx(in->which) == GPS_LOCK) {
in->value = uhd::htonx<boost::uint32_t>(
sensor_manager->get_gps_lock().to_bool() ? 1 : 0);
+ } else if (uhd::ntohx(in->which) == REF_LOCK) {
+ in->value = uhd::htonx<boost::uint32_t>(
+ sensor_manager->get_ref_lock().to_bool() ? 1 : 0);
} else if (uhd::ntohx(in->which) == GPS_TIME) {
in->value = uhd::htonx<boost::uint32_t>(
sensor_manager->get_gps_time().to_int());
@@ -622,7 +625,7 @@ network_server_impl::network_server_impl(const uhd::device_addr_t &device_addr)
// This is horrible ... why do I have to sleep here?
boost::this_thread::sleep(boost::posix_time::milliseconds(100));
_sensor_manager = e300_sensor_manager::make_local(
- gps::ublox::ubx::control::make("/dev/ttyPS1", 9600));
+ gps::ublox::ubx::control::make("/dev/ttyPS1", 9600), _global_regs);
}
}}} // namespace
diff --git a/host/lib/usrp/e300/e300_sensor_manager.cpp b/host/lib/usrp/e300/e300_sensor_manager.cpp
index 5e65b8fd3..95f31742b 100644
--- a/host/lib/usrp/e300/e300_sensor_manager.cpp
+++ b/host/lib/usrp/e300/e300_sensor_manager.cpp
@@ -38,7 +38,7 @@ public:
std::vector<std::string> get_sensors()
{
- return boost::assign::list_of("temp")("gps_locked")("gps_time");
+ return boost::assign::list_of("temp")("gps_locked")("gps_time")("ref_locked");
}
uhd::sensor_value_t get_sensor(const std::string &key)
@@ -49,6 +49,8 @@ public:
return get_gps_lock();
else if (key == "gps_time")
return get_gps_time();
+ else if (key == "ref_locked")
+ return get_ref_lock();
else
throw uhd::lookup_error(
str(boost::format("Invalid sensor %s requested.") % key));
@@ -194,6 +196,40 @@ public:
return sensor_value_t("GPS lock status", static_cast<bool>(uhd::ntohx(transaction.value)), "locked", "unlocked");
}
+ uhd::sensor_value_t get_ref_lock(void)
+ {
+ boost::mutex::scoped_lock(_mutex);
+ sensor_transaction_t transaction;
+ transaction.which = uhd::htonx<boost::uint32_t>(REF_LOCK);
+ {
+ uhd::transport::managed_send_buffer::sptr buff
+ = _xport->get_send_buff(1.0);
+ if (not buff or buff->size() < sizeof(transaction)) {
+ throw uhd::runtime_error("sensor proxy send timeout");
+ }
+ std::memcpy(
+ buff->cast<void *>(),
+ &transaction,
+ sizeof(transaction));
+ buff->commit(sizeof(transaction));
+ }
+ {
+ uhd::transport::managed_recv_buffer::sptr buff
+ = _xport->get_recv_buff(1.0);
+
+ if (not buff or buff->size() < sizeof(transaction))
+ throw uhd::runtime_error("sensor proxy recv timeout");
+
+ std::memcpy(
+ &transaction,
+ buff->cast<const void *>(),
+ sizeof(transaction));
+ }
+ UHD_ASSERT_THROW(uhd::ntohx<boost::uint32_t>(transaction.which) == REF_LOCK);
+ // TODO: Use proper serialization here ...
+ return sensor_value_t("Ref", static_cast<bool>(uhd::ntohx(transaction.value)), "locked", "unlocked");
+ }
+
private:
uhd::transport::zero_copy_if::sptr _xport;
boost::mutex _mutex;
@@ -219,13 +255,14 @@ static const std::string E300_TEMP_SYSFS = "iio:device0";
class e300_sensor_local : public e300_sensor_manager
{
public:
- e300_sensor_local(uhd::gps_ctrl::sptr gps_ctrl) : _gps_ctrl(gps_ctrl)
+ e300_sensor_local(uhd::gps_ctrl::sptr gps_ctrl, global_regs::sptr global_regs) :
+ _gps_ctrl(gps_ctrl), _global_regs(global_regs)
{
}
std::vector<std::string> get_sensors()
{
- return boost::assign::list_of("temp")("gps_locked")("gps_time");
+ return boost::assign::list_of("temp")("gps_locked")("gps_time")("ref_locked");
}
uhd::sensor_value_t get_sensor(const std::string &key)
@@ -236,6 +273,8 @@ public:
return get_gps_lock();
else if (key == "gps_time")
return get_gps_time();
+ else if (key == "ref_locked")
+ return get_ref_lock();
else
throw uhd::lookup_error(
str(boost::format("Invalid sensor %s requested.") % key));
@@ -267,22 +306,38 @@ public:
return _gps_ctrl->get_sensor("gps_time");
}
+ uhd::sensor_value_t get_ref_lock(void)
+ {
+ //PPSLOOP_LOCKED_MASK is asserted in the following cases:
+ //- (Time source = GPS or External) AND (Loop is locked and is in fine adj mode)
+ //- Time source is Internal
+ static const boost::uint32_t PPSLOOP_LOCKED_MASK = 0x04;
+ static const boost::uint32_t REFPLL_LOCKED_MASK = 0x20;
+
+ const boost::uint32_t status =
+ _global_regs->peek32(global_regs::RB32_CORE_MISC);
+ bool ref_locked = (status & PPSLOOP_LOCKED_MASK) && (status & REFPLL_LOCKED_MASK);
+
+ return sensor_value_t("Ref", ref_locked, "locked", "unlocked");
+ }
+
private:
- gps_ctrl::sptr _gps_ctrl;
+ gps_ctrl::sptr _gps_ctrl;
+ global_regs::sptr _global_regs;
};
}}}
using namespace uhd::usrp::e300;
e300_sensor_manager::sptr e300_sensor_manager::make_local(
- uhd::gps_ctrl::sptr gps_ctrl)
+ uhd::gps_ctrl::sptr gps_ctrl, global_regs::sptr global_regs)
{
- return sptr(new e300_sensor_local(gps_ctrl));
+ return sptr(new e300_sensor_local(gps_ctrl, global_regs));
}
#else
using namespace uhd::usrp::e300;
e300_sensor_manager::sptr e300_sensor_manager::make_local(
- uhd::gps_ctrl::sptr gps_ctrl)
+ uhd::gps_ctrl::sptr, global_regs::sptr)
{
throw uhd::assertion_error("e300_sensor_manager::make_local() !E300_NATIVE");
}
diff --git a/host/lib/usrp/e300/e300_sensor_manager.hpp b/host/lib/usrp/e300/e300_sensor_manager.hpp
index 503a7bb63..9c060b19a 100644
--- a/host/lib/usrp/e300/e300_sensor_manager.hpp
+++ b/host/lib/usrp/e300/e300_sensor_manager.hpp
@@ -22,6 +22,7 @@
#include <uhd/types/sensors.hpp>
#include <uhd/utils/byteswap.hpp>
#include <uhd/usrp/gps_ctrl.hpp>
+#include "e300_global_regs.hpp"
#ifndef INCLUDED_E300_SENSOR_MANAGER_HPP
#define INCLUDED_E300_SENSOR_MANAGER_HPP
@@ -39,7 +40,7 @@ struct sensor_transaction_t {
enum sensor {ZYNQ_TEMP=0, GPS_FOUND=1, GPS_TIME=2,
- GPS_LOCK=3};
+ GPS_LOCK=3, REF_LOCK=4};
class e300_sensor_manager : boost::noncopyable
{
@@ -53,9 +54,10 @@ public:
virtual uhd::sensor_value_t get_mb_temp(void) = 0;
virtual uhd::sensor_value_t get_gps_lock(void) = 0;
virtual uhd::sensor_value_t get_gps_time(void) = 0;
+ virtual uhd::sensor_value_t get_ref_lock(void) = 0;
static sptr make_proxy(uhd::transport::zero_copy_if::sptr xport);
- static sptr make_local(uhd::gps_ctrl::sptr gps_ctrl);
+ static sptr make_local(uhd::gps_ctrl::sptr gps_ctrl, global_regs::sptr global_regs);
// Note: This is a hack
static boost::uint32_t pack_float_in_uint32_t(const float &v)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 13:39:56 +0000