aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/lib/mykonos/ad937x_ctrl.cpp
diff options
context:
space:
mode:
authorMark Meserve <mark.meserve@ni.com>2017-08-09 15:17:44 -0700
committerMartin Braun <martin.braun@ettus.com>2017-12-22 15:04:00 -0800
commit309a2f04e3da6667bc44c78121064b2d03e24e75 (patch)
tree08b453917053ac0a445ee261c694a706d9f5e180 /mpm/lib/mykonos/ad937x_ctrl.cpp
parent8ee3da3ef9b812eda2ac3269927191e09916dc3c (diff)
downloaduhd-309a2f04e3da6667bc44c78121064b2d03e24e75.tar.gz
uhd-309a2f04e3da6667bc44c78121064b2d03e24e75.tar.bz2
uhd-309a2f04e3da6667bc44c78121064b2d03e24e75.zip
mg: General fixes
- Make DB probe-able - Add RPC client
Diffstat (limited to 'mpm/lib/mykonos/ad937x_ctrl.cpp')
-rw-r--r--mpm/lib/mykonos/ad937x_ctrl.cpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/mpm/lib/mykonos/ad937x_ctrl.cpp b/mpm/lib/mykonos/ad937x_ctrl.cpp
index 6bd8b5ce1..55479fb1d 100644
--- a/mpm/lib/mykonos/ad937x_ctrl.cpp
+++ b/mpm/lib/mykonos/ad937x_ctrl.cpp
@@ -157,41 +157,30 @@ public:
device.start_jesd_tx();
}
- // TODO: interpret the status byte
- // or provide means to do so
virtual uint8_t get_multichip_sync_status()
{
std::lock_guard<std::mutex> lock(*spi_mutex);
return device.get_multichip_sync_status();
}
- // TODO: interpret the status byte
- // or provide means to do so
virtual uint8_t get_framer_status()
{
std::lock_guard<std::mutex> lock(*spi_mutex);
return device.get_framer_status();
}
- // TODO: interpret the status byte
- // or provide means to do so
virtual uint8_t get_deframer_status()
{
std::lock_guard<std::mutex> lock(*spi_mutex);
return device.get_deframer_status();
}
- virtual uint8_t get_deframer_irq()
- {
- std::lock_guard<std::mutex> lock(*spi_mutex);
- return device.get_deframer_irq();
- }
-
virtual uint16_t get_ilas_config_match()
{
std::lock_guard<std::mutex> lock(*spi_mutex);
return device.get_ilas_config_match();
}
+
virtual void enable_jesd_loopback(uint8_t enable)
{
std::lock_guard<std::mutex> lock(*spi_mutex);
@@ -297,13 +286,13 @@ public:
return device.enable_channel(dir, chain, enable);
}
- virtual double set_freq(const std::string &which, double value)
+ virtual double set_freq(const std::string &which, double value, bool wait_for_lock)
{
auto dir = _get_direction_from_antenna(which);
auto clipped_value = get_rf_freq_range().clip(value);
std::lock_guard<std::mutex> lock(*spi_mutex);
- return device.tune(dir, clipped_value);
+ return device.tune(dir, clipped_value, wait_for_lock);
}
virtual double get_freq(const std::string &which)