usrp1: compiling with the latest next

3 files changed, 19 insertions, 13 deletions

diff --git a/host/lib/usrp/usrp1/dboard_impl.cpp b/host/lib/usrp/usrp1/dboard_impl.cpp
index ba826d2f5..c8d9c55dd 100644
--- a/host/lib/usrp/usrp1/dboard_impl.cpp
+++ b/host/lib/usrp/usrp1/dboard_impl.cpp
@@ -17,8 +17,8 @@
 
 #include "usrp1_impl.hpp"
 #include "usrp_i2c_addr.h"
-#include "../dsp_utils.hpp"
-#include "../misc_utils.hpp"
+#include <uhd/usrp/dsp_utils.hpp>
+#include <uhd/usrp/misc_utils.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/usrp/dboard_props.hpp>
 #include <uhd/usrp/subdev_props.hpp>
@@ -122,8 +122,11 @@ void usrp1_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_
         return;
 
     case DBOARD_PROP_GAIN_GROUP:
-        val = make_gain_group(_dboard_managers[dboard_slot]->get_rx_subdev(key.name),
-                              _rx_codec_proxies[dboard_slot]->get_link());
+        val = make_gain_group(
+            _dboard_managers[dboard_slot]->get_rx_subdev(key.name),
+            _rx_codec_proxies[dboard_slot]->get_link(),
+            GAIN_GROUP_POLICY_RX
+        );
         return;
 
     default: UHD_THROW_PROP_GET_ERROR();
@@ -183,8 +186,11 @@ void usrp1_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_
         return;
 
     case DBOARD_PROP_GAIN_GROUP:
-        val = make_gain_group(_dboard_managers[dboard_slot]->get_tx_subdev(key.name),
-                              _tx_codec_proxies[dboard_slot]->get_link());
+        val = make_gain_group(
+            _dboard_managers[dboard_slot]->get_tx_subdev(key.name),
+            _tx_codec_proxies[dboard_slot]->get_link(),
+            GAIN_GROUP_POLICY_TX
+        );
         return;
 
     default: UHD_THROW_PROP_GET_ERROR();
diff --git a/host/lib/usrp/usrp1/dsp_impl.cpp b/host/lib/usrp/usrp1/dsp_impl.cpp
index 1a8993a01..260c01ea8 100644
--- a/host/lib/usrp/usrp1/dsp_impl.cpp
+++ b/host/lib/usrp/usrp1/dsp_impl.cpp
@@ -17,11 +17,12 @@
 
 #include "usrp1_impl.hpp"
 #include "fpga_regs_standard.h"
-#include "../dsp_utils.hpp"
+#include <uhd/usrp/dsp_utils.hpp>
 #include <uhd/usrp/dsp_props.hpp>
 #include <boost/bind.hpp>
+#include <boost/format.hpp>
 #include <iostream>
-#include <cstdio>
+#include <cmath>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -82,10 +83,9 @@ unsigned int compute_freq_word(double master, double target)
  
     double actual_freq = v * master / pow(2.0, 32.0);
  
-    if (0)
-      fprintf (stderr,
-               "compute_freq_control_word_fpga: target = %g  actual = %g  delta = %g\n",
-               target, actual_freq, actual_freq - target);
+    if (0) std::cerr << boost::format(
+        "compute_freq_control_word_fpga: target = %g  actual = %g  delta = %g\n"
+    ) % target % actual_freq % (actual_freq - target);
  
     return (unsigned int) v;
 }
diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp
index 5e0285dfd..ede9b2681 100644
--- a/host/lib/usrp/usrp1/mboard_impl.cpp
+++ b/host/lib/usrp/usrp1/mboard_impl.cpp
@@ -17,7 +17,7 @@
 
 #include "usrp1_impl.hpp"
 #include "usrp_commands.h"
-#include "../misc_utils.hpp"
+#include <uhd/usrp/misc_utils.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/usrp/mboard_props.hpp>
 #include <boost/assign/list_of.hpp>