aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'mpm/lib')
-rw-r--r--mpm/lib/CMakeLists.txt1
-rw-r--r--mpm/lib/lmk04828/lmk04828_spi_iface.cpp10
-rw-r--r--mpm/lib/mykonos/ad937x_ctrl.cpp34
-rw-r--r--mpm/lib/mykonos/ad937x_ctrl.hpp101
-rw-r--r--mpm/lib/mykonos/ad937x_device.hpp8
-rw-r--r--mpm/lib/net_helper.cpp2
-rw-r--r--mpm/lib/net_helper.hpp69
-rw-r--r--mpm/lib/print_foo.cpp8
-rw-r--r--mpm/lib/spi/mock_spi.h10
-rw-r--r--mpm/lib/spi/spi_lock.cpp2
-rw-r--r--mpm/lib/spi/spi_lock.h25
-rw-r--r--mpm/lib/udev_helper.cpp2
-rw-r--r--mpm/lib/udev_helper.hpp62
-rw-r--r--mpm/lib/xbar_iface.cpp2
-rw-r--r--mpm/lib/xbar_iface.hpp69
15 files changed, 31 insertions, 374 deletions
diff --git a/mpm/lib/CMakeLists.txt b/mpm/lib/CMakeLists.txt
index 647697c84..649d944c9 100644
--- a/mpm/lib/CMakeLists.txt
+++ b/mpm/lib/CMakeLists.txt
@@ -28,5 +28,4 @@ USRP_PERIPHS_ADD_OBJECT(periphs
net_helper.cpp
udev_helper.cpp
xbar_iface.cpp
- print_foo.cpp
)
diff --git a/mpm/lib/lmk04828/lmk04828_spi_iface.cpp b/mpm/lib/lmk04828/lmk04828_spi_iface.cpp
index 2e3b43a3c..d0ae26063 100644
--- a/mpm/lib/lmk04828/lmk04828_spi_iface.cpp
+++ b/mpm/lib/lmk04828/lmk04828_spi_iface.cpp
@@ -1,7 +1,7 @@
-#include "lmk/lmk04828_spi_iface.hpp"
-#include "uhd/exception.hpp"
-#include <boost/bind.hpp>
+#include <mpm/lmk04828/lmk04828_spi_iface.hpp>
+#include <uhd/exception.hpp>
#include <boost/make_shared.hpp>
+#include <functional>
lmk04828_spi_iface::lmk04828_spi_iface(uhd::spi_iface::sptr iface) : _spi_iface(iface)
{
@@ -11,12 +11,12 @@ lmk04828_spi_iface::lmk04828_spi_iface(uhd::spi_iface::sptr iface) : _spi_iface(
lmk04828_iface::write_fn_t lmk04828_spi_iface::get_write_fn()
{
- return boost::bind(&lmk04828_spi_iface::spi_write, this, _1);
+ return std::bind(&lmk04828_spi_iface::spi_write, this, std::placeholders::_1);
}
lmk04828_iface::read_fn_t lmk04828_spi_iface::get_read_fn()
{
- return boost::bind(&lmk04828_spi_iface::spi_read, this, _1);
+ return std::bind(&lmk04828_spi_iface::spi_read, this, std::placeholders::_1);
}
void lmk04828_spi_iface::spi_write(std::vector<uint32_t> writes) {
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
+};
diff --git a/mpm/lib/net_helper.cpp b/mpm/lib/net_helper.cpp
index 0da8de3cf..a40fd742d 100644
--- a/mpm/lib/net_helper.cpp
+++ b/mpm/lib/net_helper.cpp
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#include "net_helper.hpp"
+#include <mpm/net_helper.hpp>
#include <uhd/exception.hpp>
#include <boost/format.hpp>
#include <netdb.h>
diff --git a/mpm/lib/net_helper.hpp b/mpm/lib/net_helper.hpp
deleted file mode 100644
index b07e43ccc..000000000
--- a/mpm/lib/net_helper.hpp
+++ /dev/null
@@ -1,69 +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/>.
-//
-
-#include <map>
-#include <vector>
-#include <string>
-
-namespace mpm {
-namespace network {
-
-/*!
- * A struct describing a single network interface
- */
-using net_iface = struct net_iface {
- /*! MAC address of the interface in the form AABBCCDDEEFF */
- std::string mac_addr;
- /*! vector of associated IP addresses, contains both IPv4 and IPv6 */
- std::vector<std::string> ip_addr;
-};
-
-/*!
- * net_ifaces contains a <interfaces name, net_iface> pair
- * describing mac address and associated ip addresses for
- * each interface
- */
-using net_ifaces = std::map<std::string, net_iface>;
-
-/*!
- * Convenience function to get all ip addresses of one MAC address
- * \param MAC address in the form AABBCCDDEEFF
- * \return vector of strings containing all IP addresses with this MAC address
- */
-std::vector<std::string> get_if_addrs(const std::string& mac_addr);
-
-/*!
- * Get information about all interfaces on this system
- * \return a map with interface names as keys and the interfaces information as value
- */
-net_ifaces get_net_map();
-
-/*!
- * Pretty print net_ifaces in the style of `ip addr`
- * \param interface map net_ifaces to print
- */
-void print_net_ifaces(net_ifaces my_ifaces);
-}
-}
-
-#ifdef LIBMPM_PYTHON
-void export_net_iface(){
- LIBMPM_BOOST_PREAMBLE("network")
- bp::def("get_if_addrs", &mpm::network::get_if_addrs);
-}
-#endif
-
diff --git a/mpm/lib/print_foo.cpp b/mpm/lib/print_foo.cpp
deleted file mode 100644
index 4f6d69775..000000000
--- a/mpm/lib/print_foo.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <iostream>
-#include <mpm/print_foo.hpp>
-
-void mpm::print_foo()
-{
- std::cout << "foo" << std::endl;
-}
-
diff --git a/mpm/lib/spi/mock_spi.h b/mpm/lib/spi/mock_spi.h
deleted file mode 100644
index c289faa16..000000000
--- a/mpm/lib/spi/mock_spi.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <uhd/types/serial.hpp>
-
-class mock_spi : public virtual uhd::spi_iface
-{
-public:
- typedef boost::shared_ptr<spi> sptr;
- static sptr make(const std::string &device);
-};
diff --git a/mpm/lib/spi/spi_lock.cpp b/mpm/lib/spi/spi_lock.cpp
index 5077053e7..b37daa738 100644
--- a/mpm/lib/spi/spi_lock.cpp
+++ b/mpm/lib/spi/spi_lock.cpp
@@ -1,4 +1,4 @@
-#include "spi_lock.h"
+#include "mpm/spi/spi_lock.hpp"
spi_lock::spi_lock(uint8_t spidev_index) :
spidev_index(spidev_index)
diff --git a/mpm/lib/spi/spi_lock.h b/mpm/lib/spi/spi_lock.h
deleted file mode 100644
index 9ad4e20fe..000000000
--- a/mpm/lib/spi/spi_lock.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <boost/noncopyable.hpp>
-#include <mutex>
-#include <memory>
-
-class spi_lock : public boost::noncopyable
-{
-public:
- using sptr = std::shared_ptr<spi_lock>;
- static sptr make(uint8_t spidev_index);
-
- spi_lock(uint8_t spidev_index);
-
- uint8_t get_spidev() const;
-
-private:
- const uint8_t spidev_index;
-
- // BasicLockable implementation for lock_guard
- mutable std::mutex spi_mutex;
- friend class std::lock_guard<spi_lock>;
- void lock();
- void unlock();
-};
diff --git a/mpm/lib/udev_helper.cpp b/mpm/lib/udev_helper.cpp
index ba12f6667..108b4b07a 100644
--- a/mpm/lib/udev_helper.cpp
+++ b/mpm/lib/udev_helper.cpp
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#include "udev_helper.hpp"
+#include "mpm/udev_helper.hpp"
#include <uhd/exception.hpp>
#include <boost/format.hpp>
#include <boost/make_shared.hpp>
diff --git a/mpm/lib/udev_helper.hpp b/mpm/lib/udev_helper.hpp
deleted file mode 100644
index 055a93cee..000000000
--- a/mpm/lib/udev_helper.hpp
+++ /dev/null
@@ -1,62 +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/>.
-//
-
-#include <libudev.h>
-#include <string>
-#include <vector>
-
-namespace mpm {
- /*!
- * The udev_helper class:
- *
- * talks to libudev and holds a udev context. Device enumeration is done
- * once during initialization.
- * On destruction the udev context is unreferenced again.
- */
- class udev_helper{
- public:
- udev_helper();
- ~udev_helper();
- /*!
- * Return the nvmem device associated with the parent address
- * \param address of the parent platform driver
- * \return a string containing the name of file of the device in /sys
- */
- std::string get_eeprom(const std::string &address);
- /*!
- * Find spidevices associated with the spi_master
- * \param address of the parent platform driver
- * \return a vector of string containing the device paths is /dev
- */
- std::vector<std::string> get_spidev_nodes(const std::string &spi_master);
-
- private:
- udev *_udev;
- udev_enumerate *_enumerate;
- };
-}
-
-#ifdef LIBMPM_PYTHON
-void export_udev_helper(){
- LIBMPM_BOOST_PREAMBLE("udev")
- bp::class_<mpm::udev_helper>("udev_helper", bp::init<>())
- .def("get_eeprom", &mpm::udev_helper::get_eeprom)
- .def("get_spidev_nodes", &mpm::udev_helper::get_spidev_nodes)
- ;
-}
-#endif
-
diff --git a/mpm/lib/xbar_iface.cpp b/mpm/lib/xbar_iface.cpp
index 21b60d131..8bd89533c 100644
--- a/mpm/lib/xbar_iface.cpp
+++ b/mpm/lib/xbar_iface.cpp
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#include "xbar_iface.hpp"
+#include "mpm/xbar_iface.hpp"
#include <uhd/exception.hpp>
#include <boost/format.hpp>
#include <sys/ioctl.h>
diff --git a/mpm/lib/xbar_iface.hpp b/mpm/lib/xbar_iface.hpp
deleted file mode 100644
index 9b17ed97b..000000000
--- a/mpm/lib/xbar_iface.hpp
+++ /dev/null
@@ -1,69 +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 <boost/noncopyable.hpp>
-#include <memory>
-#include <mutex>
-#include <cstdint>
-
-namespace mpm{
-
-/*!
- * Crossbar route command
- */
-using rfnoc_crossbar_cmd = struct rfnoc_crossbar_cmd {
- /*! destination address */
- uint8_t dest_addr;
- /*! destination port */
- uint8_t dest_port;
-};
-
-#define RFNCBWROUTIOC _IOW('R', 1, struct rfnoc_crossbar_cmd)
-#define RFNCDELROUTIOC _IOW('D', 1, struct rfnoc_crossbar_cmd)
-
-/*!
- * Crossbar interface class holding a crossbar context
- */
-class xbar_iface: boost::noncopyable{
-public:
- // use static mutex! lock_guard
- using sptr = std::shared_ptr<xbar_iface>;
- static sptr make(const std::string &device);
- void set_route(uint8_t dst_addr, uint8_t dst_port);
- void del_route(uint8_t dst_addr, uint8_t dst_port);
- ~xbar_iface();
- xbar_iface(const std::string &device);
-
-private:
- static std::mutex _lock;
- int _fd;
-};
-}
-
-
-#ifdef LIBMPM_PYTHON
-void export_xbar(){
- LIBMPM_BOOST_PREAMBLE("xbar")
- bp::class_<mpm::xbar_iface, boost::noncopyable, std::shared_ptr<mpm::xbar_iface> >("xbar", bp::no_init)
- .def("make", &mpm::xbar_iface::make)
- .staticmethod("make")
- .def("set_route", &mpm::xbar_iface::set_route)
- .def("del_route", &mpm::xbar_iface::del_route)
- ;
-}
-#endif
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 13:42:19 +0000