Renamed or moved files (minor cleanup)

7 files changed, 2 insertions, 78 deletions

diff --git a/mpm/include/mpm/CMakeLists.txt b/mpm/include/mpm/CMakeLists.txt
index 47fd2b2ed..8d073b622 100644
--- a/mpm/include/mpm/CMakeLists.txt
+++ b/mpm/include/mpm/CMakeLists.txt
@@ -22,5 +22,5 @@ INSTALL(FILES
 )
 ADD_SUBDIRECTORY(dboards)
 ADD_SUBDIRECTORY(lmk04828)
-ADD_SUBDIRECTORY(mykonos)
+ADD_SUBDIRECTORY(ad937x)
 ADD_SUBDIRECTORY(spi)
diff --git a/mpm/include/mpm/mykonos/CMakeLists.txt b/mpm/include/mpm/ad937x/CMakeLists.txt
index 3fe8d1419..3fe8d1419 100644
--- a/mpm/include/mpm/mykonos/CMakeLists.txt
+++ b/mpm/include/mpm/ad937x/CMakeLists.txt
diff --git a/mpm/include/mpm/mykonos/ad937x_ctrl.hpp b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp
index 663424b06..663424b06 100644
--- a/mpm/include/mpm/mykonos/ad937x_ctrl.hpp
+++ b/mpm/include/mpm/ad937x/ad937x_ctrl.hpp
diff --git a/mpm/include/mpm/spi/adi_ctrl.hpp b/mpm/include/mpm/ad937x/adi_ctrl.hpp
index 7cc87b586..7cc87b586 100644
--- a/mpm/include/mpm/spi/adi_ctrl.hpp
+++ b/mpm/include/mpm/ad937x/adi_ctrl.hpp
diff --git a/mpm/include/mpm/spi/CMakeLists.txt b/mpm/include/mpm/spi/CMakeLists.txt
index f334678d1..7aa3de791 100644
--- a/mpm/include/mpm/spi/CMakeLists.txt
+++ b/mpm/include/mpm/spi/CMakeLists.txt
@@ -18,7 +18,6 @@ INSTALL(FILES
   adi_ctrl.hpp
   mock_spi.h
   spidev_iface.hpp
-  spi_iface.hpp
   spi_lock.hpp
   DESTINATION ${INCLUDE_DIR}/mpm/spi
 )
diff --git a/mpm/include/mpm/spi/spi_iface.hpp b/mpm/include/mpm/spi/spi_iface.hpp
deleted file mode 100644
index 3142fd661..000000000
--- a/mpm/include/mpm/spi/spi_iface.hpp
+++ /dev/null
@@ -1,75 +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 <memory>
-
-namespace mpm {
-
-    /*! \brief Intermediate object to SPI
-     *
-     */
-    class spi_iface
-    {
-    public:
-        typedef std::shared_ptr<spi_iface> sptr;
-
-        enum class spi_wire_mode_t {
-            THREE_WIRE_MODE = 0,
-            FOUR_WIRE_MODE = 1
-        };
-
-        enum class spi_endianness_t {
-            LSB_FIRST = 0,
-            MSB_FIRST = 1
-        };
-
-        virtual void write_byte(
-            const uint16_t addr,
-            const uint8_t data
-        ) = 0;
-
-        virtual void write_bytes(
-            const uint16_t *addr,
-            const uint8_t *data,
-            const uint32_t count
-        ) = 0;
-
-        virtual uint8_t read_byte(const uint16_t addr) = 0;
-
-        virtual void write_field(
-            const uint16_t addr,
-            const uint8_t field_val,
-            const uint8_t mask,
-            const uint8_t start_bit
-        ) = 0;
-
-        virtual uint8_t read_field(
-                const uint16_t addr,
-                const uint8_t mask,
-                const uint8_t start_bit
-        ) = 0;
-
-        virtual spi_wire_mode_t get_wire_mode() const = 0;
-        virtual spi_endianness_t get_endianness() const = 0;
-
-        virtual size_t get_chip_select() const = 0;
-    };
-
-} /* namespace mpm */
-
diff --git a/mpm/include/mpm/tests/tests_spi_iface.hpp b/mpm/include/mpm/tests/tests_spi_iface.hpp
index 6dde42612..e10a82c0c 100644
--- a/mpm/include/mpm/tests/tests_spi_iface.hpp
+++ b/mpm/include/mpm/tests/tests_spi_iface.hpp
@@ -16,9 +16,9 @@
 //
 #pragma once
 
-#include <mpm/spi_iface.hpp>
 #include <unordered_map>
 #include <memory>
+
 namespace mpm {
     class tests_spi_iface : public virtual spi_iface
     {