mpm: move public includes into include/

3 files changed, 22 insertions, 121 deletions

diff --git a/mpm/lib/mykonos/ad937x_ctrl.cpp b/mpm/lib/mykonos/ad937x_ctrl.cpp
index 1aff4ed42..c4343a2e6 100644
--- a/mpm/lib/mykonos/ad937x_ctrl.cpp
+++ b/mpm/lib/mykonos/ad937x_ctrl.cpp
@@ -16,7 +16,7 @@
 //
 
 #include "ad937x_device.hpp"
-#include "ad937x_ctrl.hpp"
+#include "mpm/mykonos/ad937x_ctrl.hpp"
 #include "adi/mykonos.h"
 
 #include <sstream>
@@ -85,21 +85,6 @@ uhd::direction_t ad937x_ctrl::_get_direction_from_antenna(const std::string& ant
     return uhd::direction_t::RX_DIRECTION;
 }
 
-ad937x_device::chain_t ad937x_ctrl::_get_chain_from_antenna(const std::string& antenna)
-{
-    auto sub = antenna.substr(2, 1);
-    if (sub == "1") {
-        return ad937x_device::chain_t::ONE;
-    }
-    else if (sub == "2") {
-        return ad937x_device::chain_t::TWO;
-    }
-    else {
-        throw uhd::runtime_error("ad937x_ctrl got an invalid channel string.");
-    }
-    return ad937x_device::chain_t::ONE;
-}
-
 class ad937x_ctrl_impl : public ad937x_ctrl
 {
 public:
@@ -110,6 +95,23 @@ public:
 
     }
 
+    static ad937x_device::chain_t _get_chain_from_antenna(const std::string& antenna)
+        {
+            auto sub = antenna.substr(2, 1);
+            if (sub == "1") {
+                return ad937x_device::chain_t::ONE;
+            }
+            else if (sub == "2") {
+                return ad937x_device::chain_t::TWO;
+            }
+            else {
+                throw uhd::runtime_error("ad937x_ctrl got an invalid channel string.");
+            }
+            return ad937x_device::chain_t::ONE;
+        }
+
+
+
     virtual uint8_t get_product_id()
     {
         std::lock_guard<spi_lock> lock(*spi_l);
diff --git a/mpm/lib/mykonos/ad937x_ctrl.hpp b/mpm/lib/mykonos/ad937x_ctrl.hpp
deleted file mode 100644
index 12c165dab..000000000
--- a/mpm/lib/mykonos/ad937x_ctrl.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright 2017 Ettus Research (National Instruments)
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#pragma once
-
-#include "ad937x_device.hpp"
-#include "../spi/spi_lock.h"
-
-// TODO: fix path of UHD includes
-#include <../../host/include/uhd/types/direction.hpp>
-#include <../../host/include/uhd/types/ranges.hpp>
-#include <../../host/include/uhd/exception.hpp>
-#include <../../host/include/uhd/types/serial.hpp>
-
-#include <boost/noncopyable.hpp>
-#include <memory>
-#include <functional>
-#include <set>
-
-class ad937x_ctrl : public boost::noncopyable
-{
-public:
-    typedef std::shared_ptr<ad937x_ctrl> sptr;
-    static sptr make(spi_lock::sptr spi_l, uhd::spi_iface::sptr iface);
-    virtual ~ad937x_ctrl(void) {}
-
-    static uhd::meta_range_t get_rf_freq_range(void);
-    static uhd::meta_range_t get_bw_filter_range(void);
-    static std::vector<double> get_clock_rates(void);
-    static uhd::meta_range_t get_gain_range(const std::string &which);
-
-    virtual uint8_t get_product_id() = 0;
-    virtual uint8_t get_device_rev() = 0;
-    virtual std::string get_api_version() = 0;
-    virtual std::string get_arm_version() = 0;
-
-    virtual double set_bw_filter(const std::string &which, double value) = 0;
-    virtual double set_gain(const std::string &which, double value) = 0;
-
-    virtual void set_agc_mode(const std::string &which, const std::string &mode) = 0;
-
-    virtual double set_clock_rate(double value) = 0;
-    virtual void enable_channel(const std::string &which, bool enable) = 0;
-
-    virtual double set_freq(const std::string &which, double value) = 0;
-    virtual double get_freq(const std::string &which) = 0;
-
-    virtual void set_fir(const std::string &which, int8_t gain, const std::vector<int16_t> & fir) = 0;
-    virtual std::vector<int16_t> get_fir(const std::string &which, int8_t &gain) = 0;
-
-    virtual int16_t get_temperature() = 0;
-
-protected:
-    static uhd::direction_t _get_direction_from_antenna(const std::string& antenna);
-    static ad937x_device::chain_t _get_chain_from_antenna(const std::string& antenna);
-
-    static std::set<size_t> _get_valid_fir_lengths(const std::string& which);
-};
-
-#ifdef LIBMPM_PYTHON
-void export_mykonos(){
-    LIBMPM_BOOST_PREAMBLE("ad937x")
-
-    bp::class_<ad937x_ctrl, boost::noncopyable, std::shared_ptr<ad937x_ctrl> >("ad937x_ctrl", bp::no_init)
-        .def("make", &ad937x_ctrl::make)
-        .def("get_rf_freq_range", &ad937x_ctrl::get_rf_freq_range)
-        .def("get_bw_filter_range", &ad937x_ctrl::get_bw_filter_range)
-        .def("get_clock_rates", &ad937x_ctrl::get_clock_rates)
-        .def("get_gain_range", &ad937x_ctrl::get_gain_range)
-        .def("get_product_id", &ad937x_ctrl::get_product_id)
-        .def("get_device_rev", &ad937x_ctrl::get_device_rev)
-        .def("get_api_version", &ad937x_ctrl::get_api_version)
-        .def("get_arm_version", &ad937x_ctrl::get_arm_version)
-        .def("set_bw_filter", &ad937x_ctrl::set_bw_filter)
-        .def("set_gain", &ad937x_ctrl::set_gain)
-        .def("set_agc_mode", &ad937x_ctrl::set_agc_mode)
-        .def("set_clock_rate", &ad937x_ctrl::set_clock_rate)
-        .def("enable_channel", &ad937x_ctrl::enable_channel)
-        .def("set_freq", &ad937x_ctrl::set_freq)
-        .def("get_freq", &ad937x_ctrl::get_freq)
-        .def("set_fir", &ad937x_ctrl::set_fir)
-        .def("get_fir", &ad937x_ctrl::get_fir)
-        .def("get_temperature", &ad937x_ctrl::get_temperature)
-        ;
-}
-#endif
-
diff --git a/mpm/lib/mykonos/ad937x_device.hpp b/mpm/lib/mykonos/ad937x_device.hpp
index 52d25abba..4fedc05f0 100644
--- a/mpm/lib/mykonos/ad937x_device.hpp
+++ b/mpm/lib/mykonos/ad937x_device.hpp
@@ -24,9 +24,9 @@
 #include "mpm/spi/adi_ctrl.hpp"
 
 // TODO: fix path of UHD includes
-#include <../../host/include/uhd/types/direction.hpp>
-#include <../../host/include/uhd/types/ranges.hpp>
-#include <../../host/include/uhd/exception.hpp>
+#include <uhd/types/direction.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/exception.hpp>
 
 #include <boost/noncopyable.hpp>
 #include <mutex>
@@ -100,4 +100,4 @@ private:
 
     static uint8_t _convert_rx_gain(double gain);
     static uint16_t _convert_tx_gain(double gain);
-};
\ No newline at end of file
+};