aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/lib
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-03-02 15:30:29 -0800
committeratrnati <54334261+atrnati@users.noreply.github.com>2020-03-03 08:51:32 -0600
commit476dccd6c383e4c0eccf0f42242137f863cda136 (patch)
treeb2de8a55e3e63374fc05f94dbe82cc9fcb4691aa /mpm/lib
parent876d4150aa3da531ddd687b48afada6e43f79146 (diff)
downloaduhd-476dccd6c383e4c0eccf0f42242137f863cda136.tar.gz
uhd-476dccd6c383e4c0eccf0f42242137f863cda136.tar.bz2
uhd-476dccd6c383e4c0eccf0f42242137f863cda136.zip
mpm: Apply clang-format against all .cpp and .hpp files
Diffstat (limited to 'mpm/lib')
-rw-r--r--mpm/lib/dboards/e31x_db_manager.cpp14
-rw-r--r--mpm/lib/dboards/neon_manager.cpp4
-rw-r--r--mpm/lib/mykonos/ad937x_device.cpp5
-rw-r--r--mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp6
4 files changed, 18 insertions, 11 deletions
diff --git a/mpm/lib/dboards/e31x_db_manager.cpp b/mpm/lib/dboards/e31x_db_manager.cpp
index 3c6346bd3..9965db280 100644
--- a/mpm/lib/dboards/e31x_db_manager.cpp
+++ b/mpm/lib/dboards/e31x_db_manager.cpp
@@ -28,9 +28,9 @@ constexpr uint32_t AD9361_SPI_DATA_MASK = 0x000000FF;
constexpr uint32_t AD9361_SPI_DATA_SHIFT = 0;
constexpr uint32_t AD9361_SPI_NUM_BITS = 24;
constexpr uint32_t AD9361_SPI_SPEED_HZ = 2000000;
-constexpr int AD9361_SPI_MODE = 1;
+constexpr int AD9361_SPI_MODE = 1;
-} // namespace /*anon*/
+} // namespace
/*! MPM-style E310 SPI Iface for AD9361 CTRL
*
@@ -38,10 +38,14 @@ constexpr int AD9361_SPI_MODE = 1;
class e310_ad9361_io_spi : public ad9361_io
{
public:
- e310_ad9361_io_spi(regs_iface::sptr regs_iface, uint32_t slave_num) :
- _regs_iface(regs_iface), _slave_num(slave_num) { }
+ e310_ad9361_io_spi(regs_iface::sptr regs_iface, uint32_t slave_num)
+ : _regs_iface(regs_iface), _slave_num(slave_num)
+ {
+ }
- ~e310_ad9361_io_spi() {/*nop*/}
+ ~e310_ad9361_io_spi()
+ { /*nop*/
+ }
uint8_t peek8(uint32_t reg)
{
diff --git a/mpm/lib/dboards/neon_manager.cpp b/mpm/lib/dboards/neon_manager.cpp
index 31ecf7291..395a1c6b2 100644
--- a/mpm/lib/dboards/neon_manager.cpp
+++ b/mpm/lib/dboards/neon_manager.cpp
@@ -73,6 +73,6 @@ neon_manager::neon_manager(const std::string& catalina_spidev)
// Make the SPI interface
auto spi_io_iface = std::make_shared<e320_ad9361_io_spi>(spi_iface, 0);
// Make the actual Catalina Ctrl object
- _catalina_ctrl = ad9361_ctrl::make_spi(
- std::make_shared<e320_ad9361_client_t>(), spi_io_iface);
+ _catalina_ctrl =
+ ad9361_ctrl::make_spi(std::make_shared<e320_ad9361_client_t>(), spi_io_iface);
}
diff --git a/mpm/lib/mykonos/ad937x_device.cpp b/mpm/lib/mykonos/ad937x_device.cpp
index 5d089601e..b476922f2 100644
--- a/mpm/lib/mykonos/ad937x_device.cpp
+++ b/mpm/lib/mykonos/ad937x_device.cpp
@@ -47,7 +47,7 @@ static const uint32_t PLL_LOCK_TIMEOUT_MS = 200;
// Fewer discontinuities at lower signal frequencies
// Minimum value is 0.8 ms, enforced by ADI's API
static constexpr double RX_DC_OFFSET_AVERAGING_WINDOW_MS = 1.0;
-static_assert(RX_DC_OFFSET_AVERAGING_WINDOW_MS >= 0.8,
+static_assert(RX_DC_OFFSET_AVERAGING_WINDOW_MS >= 0.8,
"RX DC offset averaging window must be greater than 0.8 ms");
/******************************************************
@@ -305,7 +305,8 @@ void ad937x_device::setup_cal(const uint32_t init_cals_mask,
uint16_t window = std::ceil((RX_DC_OFFSET_AVERAGING_WINDOW_MS
* (mykonos_config.device->rx->rxProfile->iqRate_kHz))
/ 1024);
- CALL_API(MYKONOS_setRfDcOffsetCnt(mykonos_config.device, MYK_DC_OFFSET_RX_CHN, window));
+ CALL_API(
+ MYKONOS_setRfDcOffsetCnt(mykonos_config.device, MYK_DC_OFFSET_RX_CHN, window));
CALL_API(MYKONOS_enableTrackingCals(mykonos_config.device, tracking_cals_mask));
// ready for radioOn
diff --git a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
index 12851af92..79c24abd5 100644
--- a/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
+++ b/mpm/lib/mykonos/config/ad937x_gain_ctrl_config.hpp
@@ -15,7 +15,8 @@
// C++14 requires std::hash includes a specialization for enums, but gcc doesn't do that
// yet Remove this when that happens
namespace std {
-template <> struct hash<uhd::direction_t>
+template <>
+struct hash<uhd::direction_t>
{
size_t operator()(const uhd::direction_t& x) const
{
@@ -23,7 +24,8 @@ template <> struct hash<uhd::direction_t>
}
};
-template <> struct hash<mpm::ad937x::device::chain_t>
+template <>
+struct hash<mpm::ad937x::device::chain_t>
{
size_t operator()(const mpm::ad937x::device::chain_t& x) const
{