diff options
author | Martin Braun <martin.braun@ettus.com> | 2017-05-02 12:54:55 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:52 -0800 |
commit | df9ca47ed1301eb131fdc0dbdd1e2ab052549aff (patch) | |
tree | 65bf2bf1538663485c5b53c779848039327216fd /mpm/lib/chips | |
parent | 0c5c2f1834d3912e41ff3aa2480b1fd632aa49bd (diff) | |
download | uhd-df9ca47ed1301eb131fdc0dbdd1e2ab052549aff.tar.gz uhd-df9ca47ed1301eb131fdc0dbdd1e2ab052549aff.tar.bz2 uhd-df9ca47ed1301eb131fdc0dbdd1e2ab052549aff.zip |
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
Diffstat (limited to 'mpm/lib/chips')
-rw-r--r-- | mpm/lib/chips/CMakeLists.txt | 6 | ||||
-rw-r--r-- | mpm/lib/chips/lmk04828_spi_iface.cpp | 40 |
2 files changed, 3 insertions, 43 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 - ); -} - |