mpm: eiscat: magnesium: Removed C++-only SPI ifaces

- EISCAT is now Python only with the exception of the definition of the
  SPI ifaces
- Magnesium uses a Python-generated SPI iface
- Removed SPI lock from EISCAT dboard

5 files changed, 3 insertions, 84 deletions

diff --git a/mpm/lib/chips/CMakeLists.txt b/mpm/lib/chips/CMakeLists.txt
index 519ab1fe8..db6559ad1 100644
--- a/mpm/lib/chips/CMakeLists.txt
+++ b/mpm/lib/chips/CMakeLists.txt
@@ -50,6 +50,6 @@
 #SET(LIBUHD_PYTHON_GEN_SOURCE_DEPS)
 
 # Define the object
-USRP_PERIPHS_ADD_OBJECT(chips
-    lmk04828_spi_iface.cpp
-)
+#USRP_PERIPHS_ADD_OBJECT(chips
+    #lmk04828_spi_iface.cpp
+#)
diff --git a/mpm/lib/chips/lmk04828_spi_iface.cpp b/mpm/lib/chips/lmk04828_spi_iface.cpp
deleted file mode 100644
index 6f21a0f46..000000000
--- a/mpm/lib/chips/lmk04828_spi_iface.cpp
+++ /dev/null
@@ -1,40 +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 <mpm/chips/lmk04828_spi_iface.hpp>
-#include <mpm/spi/spi_regs_iface.hpp>
-
-using namespace mpm::spi;
-
-static const int LMK_SPI_SPEED_HZ = 1000000;
-static const size_t LMK_ADDR_SHIFT = 8;
-static const size_t LMK_DATA_SHIFT = 0;
-static const size_t LMK_READ_FLAG = 1 << 23;
-static const size_t LMK_WRITE_FLAG = 0;
-
-mpm::types::regs_iface::sptr mpm::chips::make_lmk04828_iface(
-        const std::string &spi_device
-) {
-    return make_spi_regs_iface(
-        spi_iface::make_spidev(spi_device, LMK_SPI_SPEED_HZ),
-        LMK_ADDR_SHIFT,
-        LMK_DATA_SHIFT,
-        LMK_READ_FLAG,
-        LMK_WRITE_FLAG
-    );
-}
-
diff --git a/mpm/lib/dboards/CMakeLists.txt b/mpm/lib/dboards/CMakeLists.txt
index 4ca21ee37..b615d9289 100644
--- a/mpm/lib/dboards/CMakeLists.txt
+++ b/mpm/lib/dboards/CMakeLists.txt
@@ -19,9 +19,7 @@
 # This file included, use CMake directory variables
 ########################################################################
 
-
 USRP_PERIPHS_ADD_OBJECT(dboards
   magnesium_manager.cpp
-  eiscat_manager.cpp
 )
 
diff --git a/mpm/lib/dboards/eiscat_manager.cpp b/mpm/lib/dboards/eiscat_manager.cpp
deleted file mode 100644
index f3a9794f8..000000000
--- a/mpm/lib/dboards/eiscat_manager.cpp
+++ /dev/null
@@ -1,36 +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 <mpm/dboards/eiscat_manager.hpp>
-#include <mpm/chips/lmk04828_spi_iface.hpp>
-
-using namespace mpm::dboards;
-using namespace mpm::chips;
-
-eiscat_manager::eiscat_manager(
-    const std::string &lmk_spidev,
-    const std::string &adc0_spidev,
-    const std::string &adc1_spidev
-) : _spi_mutex(std::make_shared<std::mutex>())
-  , _spi_lock(mpm::types::lockable::make(_spi_mutex))
-  , _clock_ctrl(mpm::chips::make_lmk04828_iface(lmk_spidev))
-  , _adc0_ctrl(mpm::chips::make_lmk04828_iface(adc0_spidev))
-  , _adc1_ctrl(mpm::chips::make_lmk04828_iface(adc1_spidev))
-{
-
-}
-
diff --git a/mpm/lib/dboards/magnesium_manager.cpp b/mpm/lib/dboards/magnesium_manager.cpp
index f66364aec..cb215f893 100644
--- a/mpm/lib/dboards/magnesium_manager.cpp
+++ b/mpm/lib/dboards/magnesium_manager.cpp
@@ -16,18 +16,15 @@
 //
 
 #include <mpm/dboards/magnesium_manager.hpp>
-#include <mpm/chips/lmk04828_spi_iface.hpp>
 #include <mpm/ad937x/ad937x_spi_iface.hpp>
 
 using namespace mpm::dboards;
 using namespace mpm::chips;
 
 magnesium_manager::magnesium_manager(
-    const std::string &lmk_spidev,
     const std::string &mykonos_spidev
 ) : _spi_mutex(std::make_shared<std::mutex>())
   , _spi_lock(mpm::types::lockable::make(_spi_mutex))
-  , _clock_ctrl(mpm::chips::make_lmk04828_iface(lmk_spidev))
   , _mykonos_ctrl(ad937x_ctrl::make(
         _spi_mutex,
         make_ad937x_iface(mykonos_spidev),