diff options
author | Martin Braun <martin.braun@ettus.com> | 2017-03-08 09:28:55 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:44 -0800 |
commit | 1a4348038d0eb57d53475074dca49e8192aeb2d7 (patch) | |
tree | 04c8e87fa9c95d2702aac410f6fb271461acb9bb /host/lib | |
parent | fc8cd827f6b16b9c8c354a216889e6a9d7f37456 (diff) | |
download | uhd-1a4348038d0eb57d53475074dca49e8192aeb2d7.tar.gz uhd-1a4348038d0eb57d53475074dca49e8192aeb2d7.tar.bz2 uhd-1a4348038d0eb57d53475074dca49e8192aeb2d7.zip |
Initial commit for N3xx development.
- Creates mpm/ subdirectory
- First pass at hardware daemon/MPM
- New code for LMK04828, AD9371
- spidev integration
Contributions by:
Martin Braun <martin.braun@ettus.com>
Derek Kozel <derek.kozel@ettus.com>
Mark Meserve <mark.meserve@ni.com>
Andrej Rode <andrej.rode@ettus.com>
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/ic_reg_maps/CMakeLists.txt | 5 | ||||
-rwxr-xr-x | host/lib/ic_reg_maps/gen_lmk04828_regs.py | 103 | ||||
-rw-r--r-- | host/lib/usrp/common/CMakeLists.txt | 1 | ||||
-rw-r--r-- | host/lib/usrp/common/lmk04828.cpp | 81 | ||||
-rw-r--r-- | host/lib/usrp/common/lmk04828.hpp | 45 |
5 files changed, 235 insertions, 0 deletions
diff --git a/host/lib/ic_reg_maps/CMakeLists.txt b/host/lib/ic_reg_maps/CMakeLists.txt index 69035b483..50adbf58f 100644 --- a/host/lib/ic_reg_maps/CMakeLists.txt +++ b/host/lib/ic_reg_maps/CMakeLists.txt @@ -121,4 +121,9 @@ LIBUHD_PYTHON_GEN_SOURCE( ${CMAKE_CURRENT_BINARY_DIR}/adf5356_regs.hpp ) +LIBUHD_PYTHON_GEN_SOURCE( + ${CMAKE_CURRENT_SOURCE_DIR}/gen_lmk04828_regs.py + ${CMAKE_CURRENT_BINARY_DIR}/lmk04828_regs.hpp +) + SET(LIBUHD_PYTHON_GEN_SOURCE_DEPS) diff --git a/host/lib/ic_reg_maps/gen_lmk04828_regs.py b/host/lib/ic_reg_maps/gen_lmk04828_regs.py new file mode 100755 index 000000000..46bf825ad --- /dev/null +++ b/host/lib/ic_reg_maps/gen_lmk04828_regs.py @@ -0,0 +1,103 @@ +#Copyright 2017 Ettus Research LLC +# +# 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/>. +# + +######################################################################## +# Template for raw text data describing registers +# name addr[bit range inclusive] default optional enums +######################################################################## +REGS_TMPL="""\ +######################################################################## +## address 0 +######################################################################## +address0 0[20:8] 0 +Reset 0[7] 0 +Reserved_0_0 0[6:5] 0 +SPI_3wire 0[4] 0 enable, disable +Reserved_0_1 0[3:0] 0 +######################################################################## +## address 1 +######################################################################## +address1 1[20:8] 1 +Reserved_1_0 1[7:0] 0 +######################################################################## +## address 2 +######################################################################## +address2 2[20:8] 2 +Reserved_2_0 2[7:1] 0 +Powerdown 2[0] 0 normal, powerdown +######################################################################## +## address 3 +######################################################################## +address3 3[20:8] 3 +ID_Device_Type 3[7:0] 6 +######################################################################## +## address 4 +######################################################################## +address4 4[20:8] 4 +ID_Prod_MSB 4[7:0] 208 +######################################################################## +## address 5 +######################################################################## +address5 5[20:8] 5 +ID_Prod_LSB 5[7:0] 91 +######################################################################## +## address 6 +######################################################################## +address6 6[20:8] 6 +ID_MaskRev 6[7:0] 32 LMK04821=36,LMK04826=37,LMK04828=32 +######################################################################## +## address 12 (0x00C) +######################################################################## +address12 12[20:8] 0x00C +ID_Vendor_MSB 12[7:0] 81 +######################################################################## +## address 13 (0x00D) +######################################################################## +address13 13[20:8] 0x00D +ID_Vendor_LSB 13[7:0] 4 +""" +######################################################################## +# Template for methods in the body of the struct +######################################################################## + +BODY_TMPL = """\ + + + + +uint32_t get_reg(int addr){ + uint32_t reg = 0; + switch(addr){ + % for addr in sorted(set(map(lambda r: r.get_addr(), regs))): + case ${addr}: + % for reg in filter(lambda r: r.get_addr() == addr, regs): + reg |= (uint32_t(${reg.get_name()}) & ${reg.get_mask()}) << ${reg.get_shift()}; + % endfor + break; + % endfor + } + return reg; +} +""" + +if __name__ == '__main__': + import common; common.generate( + name='lmk04828_regs', + regs_tmpl=REGS_TMPL, + body_tmpl=BODY_TMPL, + file=__file__, + ) + diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt index 2f4fac5c6..c11dde123 100644 --- a/host/lib/usrp/common/CMakeLists.txt +++ b/host/lib/usrp/common/CMakeLists.txt @@ -32,4 +32,5 @@ LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/validate_subdev_spec.cpp ${CMAKE_CURRENT_SOURCE_DIR}/recv_packet_demuxer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/fifo_ctrl_excelsior.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/lmk04828.cpp ) diff --git a/host/lib/usrp/common/lmk04828.cpp b/host/lib/usrp/common/lmk04828.cpp new file mode 100644 index 000000000..fd681291f --- /dev/null +++ b/host/lib/usrp/common/lmk04828.cpp @@ -0,0 +1,81 @@ +// +// Copyright 2017 Ettus Research LLC +// +// 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 "lmk04828.hpp" +#include "lmk04828_regs.hpp" +#include "uhd/exception.hpp" + +using namespace uhd; + +static const uint32_t LMK04828_ID_DEVICE_TYPE = 6; +static const uint32_t LMK04828_ID_PROD_LSB = 91; +static const uint32_t LMK04828_ID_PROD_MSB = 208; +static const uint32_t LMK04828_ID_MASKREV = 32; + +class lmk04828_impl : public lmk04828_iface +{ +public: + lmk04828_impl(write_fn_t write_fn, read_fn_t read_fn) : _write_fn(write_fn), _read_fn(read_fn) + { + + } + + ~lmk04828_impl() + { + + } + + void verify_chip_id() + { + // Check ID Device Type, ID Prod, and ID Maskrev registers + uint8_t id_device_type = _read_fn(3); + + // assert(id_device_type == 6); + if (id_device_type != 6){ + printf("id_device_type is not 6!"); + } + } + + uint8_t get_chip_id(){ + uint8_t id_device_type = _read_fn(3); + return id_device_type; + } + + void init() + { + // Configure the LMK to start producing clocks + throw new uhd::not_implemented_error("Not needed for MPM bringup"); + } + + void send_sysref_pulse() + { + // Produce a single sysref pulse + throw new uhd::not_implemented_error("Not needed for MPM bringup"); + } + +private: + + lmk04828_regs_t _regs; + + write_fn_t _write_fn; + read_fn_t _read_fn; +}; + +lmk04828_iface::sptr lmk04828_iface::make(write_fn_t write_fn, read_fn_t read_fn) +{ + return sptr(new lmk04828_impl(write_fn, read_fn)); +} diff --git a/host/lib/usrp/common/lmk04828.hpp b/host/lib/usrp/common/lmk04828.hpp new file mode 100644 index 000000000..ff063379c --- /dev/null +++ b/host/lib/usrp/common/lmk04828.hpp @@ -0,0 +1,45 @@ +// +// Copyright 2015 Ettus Research LLC +// +// 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/>. +// + +#ifndef INCLUDE_LMK04828_HPP +#define INCLUDE_LMK04828_HPP + +#include <boost/function.hpp> +#include <boost/shared_ptr.hpp> +#include <vector> +#include <stdint.h> + +class lmk04828_iface +{ +public: + typedef boost::shared_ptr<lmk04828_iface> sptr; + typedef boost::function<void(std::vector<uint32_t>)> write_fn_t; + typedef boost::function<uint8_t(uint32_t)> read_fn_t; + + static sptr make(write_fn_t write_fn, read_fn_t read_fn); + + virtual ~lmk04828_iface() {} + + virtual void verify_chip_id() = 0; + + virtual uint8_t get_chip_id() = 0; + + virtual void init() = 0; + + virtual void send_sysref_pulse() = 0; +}; +#endif |