uhd: Apply clang-format against all .cpp and .hpp files in host/

Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of
files that clang-format gets applied against.

17 files changed, 110 insertions, 118 deletions

diff --git a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp
index 2632f4a1f..5e1c90845 100644
--- a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp
@@ -13,12 +13,10 @@
 /*! For a requested frequency and sampling rate, return the
  *  correct frequency word (to set the CORDIC) and the actual frequency.
  */
-void get_freq_and_freq_word(
-        const double requested_freq,
-        const double tick_rate,
-        double &actual_freq,
-        int32_t &freq_word
-);
+void get_freq_and_freq_word(const double requested_freq,
+    const double tick_rate,
+    double& actual_freq,
+    int32_t& freq_word);
 
 /*! For a requested frequency and sampling rate, return the
  *  correct frequency word (to set the CORDIC) and the actual frequency.
diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp
index d6f104be1..920dd1e3c 100644
--- a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp
@@ -9,15 +9,16 @@
 #define INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP
 
 #include <uhd/config.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/usrp/dboard_iface.hpp>
 #include <uhd/usrp/gpio_defs.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <memory>
-#include <uhd/types/wb_iface.hpp>
-#include <map>
 #include <stdint.h>
+#include <map>
+#include <memory>
 
-class gpio_core_200 : uhd::noncopyable{
+class gpio_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<gpio_core_200> sptr;
 
@@ -27,8 +28,7 @@ public:
     virtual ~gpio_core_200(void) = 0;
 
     //! makes a new GPIO core from iface and slave base
-    static sptr make(
-        uhd::wb_iface::sptr iface, const size_t base, const size_t rb_addr);
+    static sptr make(uhd::wb_iface::sptr iface, const size_t base, const size_t rb_addr);
 
     //! 1 = ATR
     virtual void set_pin_ctrl(
@@ -36,8 +36,10 @@ public:
 
     virtual uint16_t get_pin_ctrl(unit_t unit) = 0;
 
-    virtual void set_atr_reg(
-        const unit_t unit, const atr_reg_t atr, const uint16_t value, const uint16_t mask) = 0;
+    virtual void set_atr_reg(const unit_t unit,
+        const atr_reg_t atr,
+        const uint16_t value,
+        const uint16_t mask) = 0;
 
     virtual uint16_t get_atr_reg(unit_t unit, atr_reg_t reg) = 0;
 
@@ -56,7 +58,8 @@ public:
 };
 
 //! Simple wrapper for 32 bit write only
-class gpio_core_200_32wo : uhd::noncopyable{
+class gpio_core_200_32wo : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<gpio_core_200_32wo> sptr;
 
diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp
index 42e57ca16..15afda0ef 100644
--- a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp
@@ -10,11 +10,12 @@
 
 #include <uhd/config.hpp>
 #include <uhd/types/serial.hpp>
-#include <uhd/utils/noncopyable.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <memory>
 
-class i2c_core_100_wb32 : uhd::noncopyable, public uhd::i2c_iface{
+class i2c_core_100_wb32 : uhd::noncopyable, public uhd::i2c_iface
+{
 public:
     typedef std::shared_ptr<i2c_core_100_wb32> sptr;
 
diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp
index 6d987b68a..2f6c4da79 100644
--- a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp
@@ -10,12 +10,13 @@
 
 #include <uhd/config.hpp>
 #include <uhd/types/serial.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/noncopyable.hpp>
 #include <boost/utility.hpp>
 #include <memory>
-#include <uhd/types/wb_iface.hpp>
 
-class i2c_core_200 : uhd::noncopyable, public uhd::i2c_iface{
+class i2c_core_200 : uhd::noncopyable, public uhd::i2c_iface
+{
 public:
     typedef std::shared_ptr<i2c_core_200> sptr;
 
diff --git a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
index 427a72586..c94217e82 100644
--- a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
@@ -8,12 +8,12 @@
 #ifndef INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP
 #define INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP
 
-#include <uhd/utils/msg_task.hpp>
-#include <uhd/types/time_spec.hpp>
 #include <uhd/transport/zero_copy.hpp>
+#include <uhd/types/time_spec.hpp>
 #include <uhd/types/wb_iface.hpp>
-#include <memory>
+#include <uhd/utils/msg_task.hpp>
 #include <boost/utility.hpp>
+#include <memory>
 #include <string>
 
 /*!
@@ -27,22 +27,20 @@ public:
     virtual ~radio_ctrl_core_3000(void) = 0;
 
     //! Make a new control object
-    static sptr make(
-        const bool big_endian,
+    static sptr make(const bool big_endian,
         uhd::transport::zero_copy_if::sptr ctrl_xport,
         uhd::transport::zero_copy_if::sptr resp_xport,
         const uint32_t sid,
-        const std::string &name = "0"
-    );
+        const std::string& name = "0");
 
     //! Hold a ref to a task thats feeding push response
     virtual void hold_task(uhd::msg_task::sptr task) = 0;
 
     //! Push a response externall (resp_xport is NULL)
-    virtual void push_response(const uint32_t *buff) = 0;
+    virtual void push_response(const uint32_t* buff) = 0;
 
     //! Set the command time that will activate
-    virtual void set_time(const uhd::time_spec_t &time) = 0;
+    virtual void set_time(const uhd::time_spec_t& time) = 0;
 
     //! Get the command time that will activate
     virtual uhd::time_spec_t get_time(void) = 0;
diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp
index 240838495..7f0cd9995 100644
--- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp
@@ -11,31 +11,32 @@
 #include <uhd/config.hpp>
 #include <uhd/stream.hpp>
 #include <uhd/types/ranges.hpp>
-#include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <uhd/types/stream_cmd.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
+#include <memory>
 #include <string>
 
-class rx_dsp_core_200 : uhd::noncopyable{
+class rx_dsp_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<rx_dsp_core_200> sptr;
 
     virtual ~rx_dsp_core_200(void) = 0;
 
-    static sptr make(
-        uhd::wb_iface::sptr iface,
-        const size_t dsp_base, const size_t ctrl_base,
-        const uint32_t sid, const bool lingering_packet = false
-    );
+    static sptr make(uhd::wb_iface::sptr iface,
+        const size_t dsp_base,
+        const size_t ctrl_base,
+        const uint32_t sid,
+        const bool lingering_packet = false);
 
     virtual void clear(void) = 0;
 
     virtual void set_nsamps_per_packet(const size_t nsamps) = 0;
 
-    virtual void issue_stream_command(const uhd::stream_cmd_t &stream_cmd) = 0;
+    virtual void issue_stream_command(const uhd::stream_cmd_t& stream_cmd) = 0;
 
-    virtual void set_mux(const std::string &mode, const bool fe_swapped = false) = 0;
+    virtual void set_mux(const std::string& mode, const bool fe_swapped = false) = 0;
 
     virtual void set_tick_rate(const double rate) = 0;
 
@@ -53,7 +54,7 @@ public:
 
     virtual void handle_overflow(void) = 0;
 
-    virtual void setup(const uhd::stream_args_t &stream_args) = 0;
+    virtual void setup(const uhd::stream_args_t& stream_args) = 0;
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp
index 6a91f83da..8c51dac6c 100644
--- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp
@@ -9,14 +9,15 @@
 #define INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/types/wb_iface.hpp>
 #include <uhd/property_tree.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <complex>
+#include <memory>
 #include <string>
 
-class rx_frontend_core_200 : uhd::noncopyable{
+class rx_frontend_core_200 : uhd::noncopyable
+{
 public:
     static const std::complex<double> DEFAULT_DC_OFFSET_VALUE;
     static const bool DEFAULT_DC_OFFSET_ENABLE;
@@ -32,12 +33,11 @@ public:
 
     virtual void set_dc_offset_auto(const bool enb) = 0;
 
-    virtual std::complex<double> set_dc_offset(const std::complex<double> &off) = 0;
+    virtual std::complex<double> set_dc_offset(const std::complex<double>& off) = 0;
 
-    virtual void set_iq_balance(const std::complex<double> &cor) = 0;
+    virtual void set_iq_balance(const std::complex<double>& cor) = 0;
 
     virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0;
-
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp
index b1dfd307e..d340d6f4d 100644
--- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp
@@ -13,8 +13,8 @@
 #include <uhd/types/wb_iface.hpp>
 #include <uhd/usrp/fe_connection.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <complex>
+#include <memory>
 #include <string>
 
 class rx_frontend_core_3000 : uhd::noncopyable
diff --git a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp
index 615ca2319..0f1850ddc 100644
--- a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp
@@ -11,10 +11,10 @@
 #include <uhd/config.hpp>
 #include <uhd/stream.hpp>
 #include <uhd/types/ranges.hpp>
-#include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <uhd/types/stream_cmd.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
+#include <memory>
 #include <string>
 
 class rx_vita_core_3000 : uhd::noncopyable
@@ -24,16 +24,13 @@ public:
 
     virtual ~rx_vita_core_3000(void) = 0;
 
-    static sptr make(
-        uhd::wb_iface::sptr iface,
-        const size_t base
-    );
+    static sptr make(uhd::wb_iface::sptr iface, const size_t base);
 
     virtual void clear(void) = 0;
 
     virtual void set_nsamps_per_packet(const size_t nsamps) = 0;
 
-    virtual void issue_stream_command(const uhd::stream_cmd_t &stream_cmd) = 0;
+    virtual void issue_stream_command(const uhd::stream_cmd_t& stream_cmd) = 0;
 
     virtual void set_tick_rate(const double rate) = 0;
 
@@ -41,7 +38,7 @@ public:
 
     virtual void handle_overflow(void) = 0;
 
-    virtual void setup(const uhd::stream_args_t &stream_args) = 0;
+    virtual void setup(const uhd::stream_args_t& stream_args) = 0;
 
     virtual void configure_flow_control(const size_t window_size) = 0;
 
diff --git a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp
index 4d08071f7..6dc0474ce 100644
--- a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp
@@ -10,16 +10,15 @@
 
 #include <uhd/config.hpp>
 #include <uhd/types/serial.hpp>
-#include <uhd/utils/noncopyable.hpp>
 #include <uhd/types/wb_iface.hpp>
-#include <memory>
-#include <memory>
+#include <uhd/utils/noncopyable.hpp>
 #include <functional>
+#include <memory>
 
 class spi_core_3000 : uhd::noncopyable, public uhd::spi_iface
 {
 public:
-    using sptr = std::shared_ptr<spi_core_3000>;
+    using sptr        = std::shared_ptr<spi_core_3000>;
     using poke32_fn_t = std::function<void(uint32_t, uint32_t)>;
     using peek32_fn_t = std::function<uint32_t(uint32_t)>;
 
diff --git a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp
index 4001d7d4d..27ef775f8 100644
--- a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp
@@ -10,18 +10,20 @@
 
 #include <uhd/config.hpp>
 #include <uhd/types/time_spec.hpp>
-#include <uhd/utils/noncopyable.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/utility.hpp>
 #include <memory>
 #include <string>
 #include <vector>
 
-class time64_core_200 : uhd::noncopyable{
+class time64_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<time64_core_200> sptr;
 
-    struct readback_bases_type{
+    struct readback_bases_type
+    {
         size_t rb_hi_now, rb_lo_now;
         size_t rb_hi_pps, rb_lo_pps;
     };
@@ -29,9 +31,9 @@ public:
     virtual ~time64_core_200(void) = 0;
 
     //! makes a new time64 core from iface and slave base
-    static sptr make(
-        uhd::wb_iface::sptr iface, const size_t base,
-        const readback_bases_type &readback_bases,
+    static sptr make(uhd::wb_iface::sptr iface,
+        const size_t base,
+        const readback_bases_type& readback_bases,
         const size_t mimo_delay_cycles = 0 // 0 means no-mimo
     );
 
@@ -43,14 +45,13 @@ public:
 
     virtual uhd::time_spec_t get_time_last_pps(void) = 0;
 
-    virtual void set_time_now(const uhd::time_spec_t &time) = 0;
+    virtual void set_time_now(const uhd::time_spec_t& time) = 0;
 
-    virtual void set_time_next_pps(const uhd::time_spec_t &time) = 0;
+    virtual void set_time_next_pps(const uhd::time_spec_t& time) = 0;
 
-    virtual void set_time_source(const std::string &source) = 0;
+    virtual void set_time_source(const std::string& source) = 0;
 
     virtual std::vector<std::string> get_time_sources(void) = 0;
-
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp
index 8031ed130..93575bfaa 100644
--- a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp
@@ -10,9 +10,9 @@
 
 #include <uhd/config.hpp>
 #include <uhd/types/time_spec.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/noncopyable.hpp>
 #include <memory>
-#include <uhd/types/wb_iface.hpp>
 
 class time_core_3000 : uhd::noncopyable
 {
@@ -28,10 +28,9 @@ public:
     virtual ~time_core_3000(void) = 0;
 
     //! makes a new time core from iface and slave base
-    static sptr make(
-        uhd::wb_iface::sptr iface, const size_t base,
-        const readback_bases_type &readback_bases
-    );
+    static sptr make(uhd::wb_iface::sptr iface,
+        const size_t base,
+        const readback_bases_type& readback_bases);
 
     virtual void self_test(void) = 0;
 
@@ -41,12 +40,11 @@ public:
 
     virtual uhd::time_spec_t get_time_last_pps(void) = 0;
 
-    virtual void set_time_now(const uhd::time_spec_t &time) = 0;
-
-    virtual void set_time_sync(const uhd::time_spec_t &time) = 0;
+    virtual void set_time_now(const uhd::time_spec_t& time) = 0;
 
-    virtual void set_time_next_pps(const uhd::time_spec_t &time) = 0;
+    virtual void set_time_sync(const uhd::time_spec_t& time) = 0;
 
+    virtual void set_time_next_pps(const uhd::time_spec_t& time) = 0;
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp
index 86a704c66..55423bceb 100644
--- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp
@@ -11,21 +11,21 @@
 #include <uhd/config.hpp>
 #include <uhd/stream.hpp>
 #include <uhd/types/ranges.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/noncopyable.hpp>
 #include <memory>
-#include <uhd/types/wb_iface.hpp>
 
-class tx_dsp_core_200 : uhd::noncopyable{
+class tx_dsp_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<tx_dsp_core_200> sptr;
 
     virtual ~tx_dsp_core_200(void) = 0;
 
-    static sptr make(
-        uhd::wb_iface::sptr iface,
-        const size_t dsp_base, const size_t ctrl_base,
-        const uint32_t sid
-    );
+    static sptr make(uhd::wb_iface::sptr iface,
+        const size_t dsp_base,
+        const size_t ctrl_base,
+        const uint32_t sid);
 
     virtual void clear(void) = 0;
 
@@ -45,7 +45,7 @@ public:
 
     virtual void set_updates(const size_t cycles_per_up, const size_t packets_per_up) = 0;
 
-    virtual void setup(const uhd::stream_args_t &stream_args) = 0;
+    virtual void setup(const uhd::stream_args_t& stream_args) = 0;
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp
index 8a7178bb4..23a097085 100644
--- a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp
@@ -9,14 +9,15 @@
 #define INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/types/wb_iface.hpp>
 #include <uhd/property_tree.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <complex>
+#include <memory>
 #include <string>
 
-class tx_frontend_core_200 : uhd::noncopyable{
+class tx_frontend_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<tx_frontend_core_200> sptr;
 
@@ -25,16 +26,16 @@ public:
 
     virtual ~tx_frontend_core_200(void) = 0;
 
-    static sptr make(uhd::wb_iface::sptr iface, const size_t base, const size_t offset=4);
+    static sptr make(
+        uhd::wb_iface::sptr iface, const size_t base, const size_t offset = 4);
 
-    virtual void set_mux(const std::string &mode) = 0;
+    virtual void set_mux(const std::string& mode) = 0;
 
-    virtual std::complex<double> set_dc_offset(const std::complex<double> &off) = 0;
+    virtual std::complex<double> set_dc_offset(const std::complex<double>& off) = 0;
 
-    virtual void set_iq_balance(const std::complex<double> &cor) = 0;
+    virtual void set_iq_balance(const std::complex<double>& cor) = 0;
 
     virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0;
-
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp
index 9d03549de..22b6865c1 100644
--- a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp
@@ -11,10 +11,10 @@
 #include <uhd/config.hpp>
 #include <uhd/stream.hpp>
 #include <uhd/types/ranges.hpp>
-#include <uhd/utils/noncopyable.hpp>
-#include <memory>
 #include <uhd/types/stream_cmd.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
+#include <memory>
 #include <string>
 
 class tx_vita_core_3000 : uhd::noncopyable
@@ -22,30 +22,22 @@ class tx_vita_core_3000 : uhd::noncopyable
 public:
     typedef std::shared_ptr<tx_vita_core_3000> sptr;
 
-    enum fc_monitor_loc {
-        FC_DEFAULT,
-        FC_PRE_RADIO,
-        FC_PRE_FIFO
-    };
+    enum fc_monitor_loc { FC_DEFAULT, FC_PRE_RADIO, FC_PRE_FIFO };
 
     virtual ~tx_vita_core_3000(void) = 0;
 
-    static sptr make(
-        uhd::wb_iface::sptr iface,
+    static sptr make(uhd::wb_iface::sptr iface,
         const size_t base,
-        fc_monitor_loc fc_location = FC_PRE_RADIO
-    );
+        fc_monitor_loc fc_location = FC_PRE_RADIO);
 
-    static sptr make_no_radio_buff(
-        uhd::wb_iface::sptr iface,
-        const size_t base
-    );
+    static sptr make_no_radio_buff(uhd::wb_iface::sptr iface, const size_t base);
 
     virtual void clear(void) = 0;
 
-    virtual void setup(const uhd::stream_args_t &stream_args) = 0;
+    virtual void setup(const uhd::stream_args_t& stream_args) = 0;
 
-    virtual void configure_flow_control(const size_t cycs_per_up, const size_t pkts_per_up) = 0;
+    virtual void configure_flow_control(
+        const size_t cycs_per_up, const size_t pkts_per_up) = 0;
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp
index 810c8fd7e..717b4a8b1 100644
--- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp
@@ -9,12 +9,13 @@
 #define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/utils/noncopyable.hpp>
 #include <uhd/types/wb_iface.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/utility.hpp>
 #include <memory>
 
-class user_settings_core_200 : uhd::noncopyable{
+class user_settings_core_200 : uhd::noncopyable
+{
 public:
     typedef std::shared_ptr<user_settings_core_200> sptr;
     typedef std::pair<uint8_t, uint32_t> user_reg_t;
@@ -23,7 +24,7 @@ public:
 
     static sptr make(uhd::wb_iface::sptr iface, const size_t base);
 
-    virtual void set_reg(const user_reg_t &reg) = 0;
+    virtual void set_reg(const user_reg_t& reg) = 0;
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP */
diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
index 4b6d0bd6c..002b04a3f 100644
--- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
@@ -9,17 +9,18 @@
 #define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP
 
 #include <uhd/config.hpp>
+#include <uhd/types/wb_iface.hpp>
 #include <boost/utility.hpp>
 #include <memory>
-#include <uhd/types/wb_iface.hpp>
 
-class user_settings_core_3000 : public uhd::wb_iface {
+class user_settings_core_3000 : public uhd::wb_iface
+{
 public:
     virtual ~user_settings_core_3000() {}
 
-    static sptr make(
-        wb_iface::sptr iface,
-        const wb_addr_type sr_base_addr, const wb_addr_type rb_reg_addr);
+    static sptr make(wb_iface::sptr iface,
+        const wb_addr_type sr_base_addr,
+        const wb_addr_type rb_reg_addr);
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP */