From 178b35569b1a25180a80a23b945b10b04c9f10f5 Mon Sep 17 00:00:00 2001 From: Sugandha Gupta Date: Fri, 25 Jan 2019 11:34:47 -0800 Subject: e310/e320: Move E310 to MPM architecture and refactor - Turns the E310 into an MPM device (like N3xx, E320) - Factor out common code between E320 and E310, maximize sharing between the two devices - Remove all pre-MPM E310 code that is no longer needed - Modify MPM to remove all existing overlays before applying new ones (this is necessary to enable idle image mode for E310) Co-authored-by: Virendra Kakade Signed-off-by: Virendra Kakade --- host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp | 156 ++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp (limited to 'host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp') diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp new file mode 100644 index 000000000..d9cadc86f --- /dev/null +++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp @@ -0,0 +1,156 @@ +// +// Copyright 2018 Ettus Research, a National Instruments Company +// +// SPDX-License-Identifier: GPL-3.0-or-later +// + +#include "e3xx_ad9361_iface.hpp" +#include +#include +#include + +using namespace uhd; + +class e3xx_ad9361_iface : public ad9361_ctrl +{ +public: + e3xx_ad9361_iface(rpc_client::sptr rpcc) + : _rpcc(rpcc), _rpc_prefix("db_0_"), _log_prefix("AD9361") + { + UHD_LOG_TRACE( + _log_prefix, "Initialized controls with RPC prefix " << _rpc_prefix); + } + + double set_bw_filter(const std::string& which, const double bw) + { + return _rpcc->request_with_token( + this->_rpc_prefix + "set_bw_filter", which, bw); + } + + double set_gain(const std::string& which, const double value) + { + return _rpcc->request_with_token( + this->_rpc_prefix + "set_gain", which, value); + } + + void set_agc(const std::string& which, bool enable) + { + _rpcc->request_with_token(this->_rpc_prefix + "set_agc", which, enable); + } + + void set_agc_mode(const std::string& which, const std::string& mode) + { + _rpcc->request_with_token(this->_rpc_prefix + "set_agc_mode", which, mode); + } + + double set_clock_rate(const double rate) + { + return _rpcc->request_with_token( + E3XX_RATE_TIMEOUT, this->_rpc_prefix + "set_catalina_clock_rate", rate); + } + + void set_active_chains(bool tx1, bool tx2, bool rx1, bool rx2) + { + _rpcc->request_with_token( + this->_rpc_prefix + "set_active_chains", tx1, tx2, rx1, rx2); + } + + double tune(const std::string& which, const double value) + { + return _rpcc->request_with_token( + E3XX_TUNE_TIMEOUT, this->_rpc_prefix + "catalina_tune", which, value); + } + + void set_dc_offset_auto(const std::string& which, const bool on) + { + _rpcc->request_with_token( + this->_rpc_prefix + "set_dc_offset_auto", which, on); + } + + void set_timing_mode(const std::string& timing_mode) + { + _rpcc->request_with_token( + this->_rpc_prefix + "set_timing_mode", timing_mode); + } + + void set_iq_balance_auto(const std::string& which, const bool on) + { + _rpcc->request_with_token( + this->_rpc_prefix + "set_iq_balance_auto", which, on); + } + + double get_freq(const std::string& which) + { + return _rpcc->request_with_token(this->_rpc_prefix + "get_freq", which); + } + + void data_port_loopback(const bool on) + { + _rpcc->request_with_token(this->_rpc_prefix + "data_port_loopback", on); + } + + sensor_value_t get_rssi(const std::string& which) + { + return sensor_value_t(_rpcc->request_with_token( + this->_rpc_prefix + "get_rssi", which)); + } + + sensor_value_t get_temperature() + { + return sensor_value_t(_rpcc->request_with_token( + this->_rpc_prefix + "get_temperature")); + } + + std::vector get_filter_names(const std::string& which) + { + return _rpcc->request_with_token>( + this->_rpc_prefix + "get_filter_names", which); + } + + filter_info_base::sptr get_filter( + const std::string& /*which*/, const std::string& /*filter_name*/) + { + throw uhd::runtime_error( + "ad9361_ctrl::get_filter is not supported over an RPC connection"); + } + + void set_filter(const std::string& /*which*/, + const std::string& /*filter_name*/, + const filter_info_base::sptr /*filter*/) + { + throw uhd::runtime_error( + "ad9361_ctrl::set_filter is not supported over an RPC connection"); + } + + void output_digital_test_tone(bool enb) + { + _rpcc->request_with_token( + this->_rpc_prefix + "output_digital_test_tone", enb); + } + +private: + //! Reference to the RPC client + rpc_client::sptr _rpcc; + + //! Stores the prefix to RPC calls + const std::string _rpc_prefix; + + //! Logger prefix + const std::string _log_prefix; +}; + +//! Factory function for E3xx's AD9361 RPC Controller +ad9361_ctrl::sptr make_rpc(rpc_client::sptr rpcc) +{ + return ad9361_ctrl::sptr(new e3xx_ad9361_iface(rpcc)); +} + +/*! Helper function to convert direction and channel to the 'which' required by most + Catalina driver functions */ +std::string get_which_ad9361_chain(const direction_t dir, const size_t chan, const bool fe_swap) +{ + UHD_ASSERT_THROW(dir == RX_DIRECTION or dir == TX_DIRECTION); + UHD_ASSERT_THROW(chan == 0 or chan == 1); + size_t ad9361_chan = fe_swap ? (chan ? 0 : 1) : chan; + return str(boost::format("%s%d") % (dir == RX_DIRECTION ? "RX" : "TX") % (ad9361_chan + 1)); +} -- cgit v1.2.3