diff options
| author | Lane Kolbly <lane.kolbly@ni.com> | 2021-12-07 16:47:26 -0600 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-01-05 10:28:39 -0600 |
| commit | 1880c6915d47aee1e8d6a6713da126767c9af9cf (patch) | |
| tree | ed52e29f122a9d73080f79af02494e576bdab884 /host/lib/include/uhdlib/usrp | |
| parent | 7deb56e2123785141e44969937f0ae902ea19c00 (diff) | |
| download | uhd-1880c6915d47aee1e8d6a6713da126767c9af9cf.tar.gz uhd-1880c6915d47aee1e8d6a6713da126767c9af9cf.tar.bz2 uhd-1880c6915d47aee1e8d6a6713da126767c9af9cf.zip | |
host: rf_control: Add internal antenna API abstraction.
Diffstat (limited to 'host/lib/include/uhdlib/usrp')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/dboard/zbx/zbx_dboard.hpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_dboard.hpp b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_dboard.hpp index 0a52d7bdf..6e1d31381 100644 --- a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_dboard.hpp +++ b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_dboard.hpp @@ -21,6 +21,7 @@ #include <uhd/types/wb_iface.hpp> #include <uhdlib/experts/expert_factory.hpp> #include <uhdlib/rfnoc/rf_control/dboard_iface.hpp> +#include <uhdlib/rfnoc/rf_control/antenna_iface.hpp> #include <uhdlib/usrp/common/mpmd_mb_controller.hpp> #include <uhdlib/usrp/common/pwr_cal_mgr.hpp> #include <uhdlib/usrp/common/rpc.hpp> @@ -40,7 +41,9 @@ const static uint16_t ZBX_PID = 0x4002; /*! Provide access to a ZBX radio. */ -class zbx_dboard_impl : public uhd::usrp::x400::x400_dboard_iface +class zbx_dboard_impl : + public uhd::usrp::x400::x400_dboard_iface, + public uhd::rfnoc::rf_control::antenna_radio_control_mixin { public: using sptr = std::shared_ptr<zbx_dboard_impl>; @@ -109,17 +112,6 @@ public: return _rx_gain_profile_api; } - void set_tx_antenna(const std::string& ant, const size_t chan) override; - void set_rx_antenna(const std::string& ant, const size_t chan) override; - std::vector<std::string> get_tx_antennas(const size_t /*chan*/) const override - { - return TX_ANTENNAS; - } - std::vector<std::string> get_rx_antennas(const size_t /*chan*/) const override - { - return RX_ANTENNAS; - } - double set_tx_frequency(const double freq, const size_t chan) override; double set_rx_frequency(const double freq, const size_t chan) override; uhd::freq_range_t get_tx_frequency_range(const size_t /*chan*/) const override @@ -239,8 +231,6 @@ public: * Radio Identification API Calls *************************************************************************/ - std::string get_tx_antenna(size_t chan) const override; - std::string get_rx_antenna(size_t chan) const override; double get_tx_frequency(size_t chan) override; double get_rx_frequency(size_t chan) override; double get_rx_bandwidth(size_t chan) override; |