mpm: cleanup CMakeLists, fixup minor bugs

3 files changed, 109 insertions, 0 deletions

diff --git a/mpm/dboards/CMakeLists.txt b/mpm/dboards/CMakeLists.txt
new file mode 100644
index 000000000..9947d8656
--- /dev/null
+++ b/mpm/dboards/CMakeLists.txt
@@ -0,0 +1,27 @@
+#
+# 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/>.
+#
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+
+USRP_PERIPHS_ADD_OBJECT(dboards
+  magnesium_manager.cpp
+  )
+
+TARGET_INCLUDE_DIRECTORIES(dboards PUBLIC ${UHD_HOST_ROOT}/lib/usrp/common)
diff --git a/mpm/dboards/magnesium_manager.cpp b/mpm/dboards/magnesium_manager.cpp
new file mode 100644
index 000000000..2411ef558
--- /dev/null
+++ b/mpm/dboards/magnesium_manager.cpp
@@ -0,0 +1,32 @@
+//
+// 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 "magnesium_manager.hpp"
+#include "mpm/spi/spidev_iface.hpp"
+#include <boost/make_shared.hpp>
+
+using namespace mpm::dboards;
+
+magnesium_periph_manager::magnesium_periph_manager(
+    std::string lmk_spidev, std::string mykonos_spidev
+    ): _spi_lock(spi_lock::make(std::rand()))
+{
+    _clock_spi = lmk04828_spi_iface::make(mpm::spi::spidev_iface::make(lmk_spidev));
+    _clock_ctrl = lmk04828_iface::make(_clock_spi->get_write_fn(), _clock_spi->get_read_fn());
+    _mykonos_spi = mpm::spi::spidev_iface::make(mykonos_spidev);
+    _mykonos_ctrl = ad937x_ctrl::make(_spi_lock, _mykonos_spi);
+};
diff --git a/mpm/dboards/magnesium_manager.hpp b/mpm/dboards/magnesium_manager.hpp
new file mode 100644
index 000000000..ca8a7e123
--- /dev/null
+++ b/mpm/dboards/magnesium_manager.hpp
@@ -0,0 +1,50 @@
+//
+// 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 "../lib/spi/spi_lock.h"
+#include "mpm/spi/spidev_iface.hpp"
+#include "lmk/lmk04828_spi_iface.hpp"
+#include "../lib/mykonos/ad937x_ctrl.hpp"
+#include <memory>
+
+namespace mpm { namespace dboards {
+    class magnesium_periph_manager// : public dboard_periph_manager
+    {
+    public:
+        magnesium_periph_manager(std::string lmk_spidev, std::string mykonos_spidev);
+
+        /*! Return a reference to the clock chip
+         */
+        lmk04828_iface::sptr get_clock_ctrl(){return _clock_ctrl;};
+
+        /*! Return a reference to the radio chip
+         */
+        ad937x_ctrl::sptr get_radio_ctrl(){return _mykonos_ctrl;};
+
+    private:
+        //cpld control
+        spi_lock::sptr _spi_lock;
+        lmk04828_spi_iface::sptr _clock_spi;
+        lmk04828_iface::sptr _clock_ctrl;
+        mpm::spi::spidev_iface::sptr _mykonos_spi;
+        ad937x_ctrl::sptr _mykonos_ctrl;
+    };
+
+}};
+