5 files changed, 22 insertions, 10 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_clk_regs.hpp b/host/lib/usrp/usrp2/usrp2_clk_regs.hpp
index 8b185eac0..d5e506d8d 100644
--- a/host/lib/usrp/usrp2/usrp2_clk_regs.hpp
+++ b/host/lib/usrp/usrp2/usrp2_clk_regs.hpp
@@ -22,8 +22,18 @@
 
 class usrp2_clk_regs_t {
 public:
-  usrp2_clk_regs_t(void) { ; }
+  usrp2_clk_regs_t(void):
+    test(0),
+    fpga(0),
+    adc(0),
+    dac(0),
+    serdes(0),
+    exp(0),
+    tx_db(0),
+    rx_db(0) {}
+
   usrp2_clk_regs_t(usrp2_iface::rev_type rev) {
+    fpga = adc = serdes = exp = tx_db = 0;
     test = 0;
     fpga = 1;
     dac = 3;
@@ -54,7 +64,7 @@ public:
         //dont throw, it may be unitialized
         break;
     }
-    
+
     rx_db = 7;
   }
 
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
index b48d05aa2..13dfb5b46 100644
--- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
@@ -23,14 +23,15 @@
 #include <uhd/transport/zero_copy.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
-#include "wb_iface.hpp"
+#include <uhd/types/wb_iface.hpp>
 #include <string>
 
 /*!
  * The usrp2 FIFO control class:
  * Provide high-speed peek/poke interface.
  */
-class usrp2_fifo_ctrl : public wb_iface, public uhd::spi_iface{
+class usrp2_fifo_ctrl : public uhd::wb_iface, public uhd::spi_iface
+{
 public:
     typedef boost::shared_ptr<usrp2_fifo_ctrl> sptr;
 
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 3b230ca69..5f97045e1 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -271,7 +271,7 @@ public:
         //send and recv
         usrp2_ctrl_data_t in_data = this->ctrl_send_and_recv(out_data, MIN_PROTO_COMPAT_I2C);
         UHD_ASSERT_THROW(ntohl(in_data.id) == USRP2_CTRL_ID_HERES_THE_I2C_DATA_DUDE);
-        UHD_ASSERT_THROW(in_data.data.i2c_args.addr = num_bytes);
+        UHD_ASSERT_THROW(in_data.data.i2c_args.bytes == num_bytes);
 
         //copy out the data
         byte_vector_t result(num_bytes);
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp
index ed4de02d5..a01f2ccfa 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.hpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2013 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
@@ -25,7 +25,7 @@
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include "usrp2_regs.hpp"
-#include "wb_iface.hpp"
+#include <uhd/types/wb_iface.hpp>
 #include <string>
 
 /*!
@@ -33,7 +33,8 @@
  * Provides a set of functions to implementation layer.
  * Including spi, peek, poke, control...
  */
-class usrp2_iface : public wb_iface, public uhd::spi_iface, public uhd::i2c_iface{
+class usrp2_iface : public uhd::wb_iface, public uhd::spi_iface, public uhd::i2c_iface
+{
 public:
     typedef boost::shared_ptr<usrp2_iface> sptr;
     /*!
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index a6c0d87cf..f9988287f 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -57,7 +57,7 @@ static const std::string USRP2_EEPROM_MAP_KEY = "N100";
 
 //! Make a usrp2 dboard interface.
 uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface(
-    wb_iface::sptr wb_iface,
+    uhd::wb_iface::sptr wb_iface,
     uhd::i2c_iface::sptr i2c_iface,
     uhd::spi_iface::sptr spi_iface,
     usrp2_clock_ctrl::sptr clk_ctrl
@@ -84,7 +84,7 @@ private:
         usrp2_iface::sptr iface;
         usrp2_fifo_ctrl::sptr fifo_ctrl;
         uhd::spi_iface::sptr spiface;
-        wb_iface::sptr wbiface;
+        uhd::wb_iface::sptr wbiface;
         usrp2_clock_ctrl::sptr clock;
         usrp2_codec_ctrl::sptr codec;
         uhd::gps_ctrl::sptr gps;