usrp2: work on setting up controllers

9 files changed, 9 insertions, 9 deletions

diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index 0c964825c..32ba79fbb 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -37,6 +37,6 @@ INCLUDE_SUBDIRECTORY(cores)
 INCLUDE_SUBDIRECTORY(dboard)
 INCLUDE_SUBDIRECTORY(fx2)
 INCLUDE_SUBDIRECTORY(usrp1)
-INCLUDE_SUBDIRECTORY(usrp2)
+#INCLUDE_SUBDIRECTORY(usrp2)
 INCLUDE_SUBDIRECTORY(b100)
 INCLUDE_SUBDIRECTORY(e100)
diff --git a/host/lib/usrp/cores/i2c_core_100.hpp b/host/lib/usrp/cores/i2c_core_100.hpp
index 4eb1b8086..f7a5ae4f7 100644
--- a/host/lib/usrp/cores/i2c_core_100.hpp
+++ b/host/lib/usrp/cores/i2c_core_100.hpp
@@ -29,7 +29,7 @@ public:
     typedef boost::shared_ptr<i2c_core_100> sptr;
 
     //! makes a new i2c core from iface and slave base
-    sptr make(wb_iface::sptr iface, const size_t base);
+    static sptr make(wb_iface::sptr iface, const size_t base);
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_I2C_CORE_100_HPP */
diff --git a/host/lib/usrp/cores/rx_dsp_core_200.hpp b/host/lib/usrp/cores/rx_dsp_core_200.hpp
index 75935bd1e..a88c39a2f 100644
--- a/host/lib/usrp/cores/rx_dsp_core_200.hpp
+++ b/host/lib/usrp/cores/rx_dsp_core_200.hpp
@@ -29,7 +29,7 @@ class rx_dsp_core_200 : boost::noncopyable{
 public:
     typedef boost::shared_ptr<rx_dsp_core_200> sptr;
 
-    sptr make(
+    static sptr make(
         wb_iface::sptr iface,
         const size_t dsp_base, const size_t ctrl_base,
         const boost::uint32_t sid, const size_t nsamps
diff --git a/host/lib/usrp/cores/rx_frontend_core_200.hpp b/host/lib/usrp/cores/rx_frontend_core_200.hpp
index 19fcce884..a950e2bb7 100644
--- a/host/lib/usrp/cores/rx_frontend_core_200.hpp
+++ b/host/lib/usrp/cores/rx_frontend_core_200.hpp
@@ -29,7 +29,7 @@ class rx_frontend_core_200 : boost::noncopyable{
 public:
     typedef boost::shared_ptr<rx_frontend_core_200> sptr;
 
-    sptr make(wb_iface::sptr iface, const size_t base);
+    static sptr make(wb_iface::sptr iface, const size_t base);
 
     virtual void set_mux(const bool swap) = 0;
 
diff --git a/host/lib/usrp/cores/spi_core_100.hpp b/host/lib/usrp/cores/spi_core_100.hpp
index 2fd6b5206..87d328aaa 100644
--- a/host/lib/usrp/cores/spi_core_100.hpp
+++ b/host/lib/usrp/cores/spi_core_100.hpp
@@ -29,7 +29,7 @@ public:
     typedef boost::shared_ptr<spi_core_100> sptr;
 
     //! makes a new spi core from iface and slave base
-    sptr make(wb_iface::sptr iface, const size_t base);
+    static sptr make(wb_iface::sptr iface, const size_t base);
 };
 
 #endif /* INCLUDED_LIBUHD_USRP_SPI_CORE_100_HPP */
diff --git a/host/lib/usrp/cores/time64_core_200.hpp b/host/lib/usrp/cores/time64_core_200.hpp
index c6a4cf7e5..4145d1f93 100644
--- a/host/lib/usrp/cores/time64_core_200.hpp
+++ b/host/lib/usrp/cores/time64_core_200.hpp
@@ -36,7 +36,7 @@ public:
     };
 
     //! makes a new time64 core from iface and slave base
-    sptr make(
+    static sptr make(
         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
diff --git a/host/lib/usrp/cores/tx_dsp_core_200.hpp b/host/lib/usrp/cores/tx_dsp_core_200.hpp
index 3176d495f..479023caa 100644
--- a/host/lib/usrp/cores/tx_dsp_core_200.hpp
+++ b/host/lib/usrp/cores/tx_dsp_core_200.hpp
@@ -27,7 +27,7 @@ class tx_dsp_core_200 : boost::noncopyable{
 public:
     typedef boost::shared_ptr<tx_dsp_core_200> sptr;
 
-    sptr make(
+    static sptr make(
         wb_iface::sptr iface,
         const size_t dsp_base, const size_t ctrl_base,
         const boost::uint32_t sid
diff --git a/host/lib/usrp/cores/tx_frontend_core_200.hpp b/host/lib/usrp/cores/tx_frontend_core_200.hpp
index c4a06a14a..9e4a7bc79 100644
--- a/host/lib/usrp/cores/tx_frontend_core_200.hpp
+++ b/host/lib/usrp/cores/tx_frontend_core_200.hpp
@@ -29,7 +29,7 @@ class tx_frontend_core_200 : boost::noncopyable{
 public:
     typedef boost::shared_ptr<tx_frontend_core_200> sptr;
 
-    sptr make(wb_iface::sptr iface, const size_t base);
+    static sptr make(wb_iface::sptr iface, const size_t base);
 
     virtual void set_mux(const std::string &mode) = 0;
 
diff --git a/host/lib/usrp/mboard_eeprom.cpp b/host/lib/usrp/mboard_eeprom.cpp
index 2ee4a9284..79cc2f5b2 100644
--- a/host/lib/usrp/mboard_eeprom.cpp
+++ b/host/lib/usrp/mboard_eeprom.cpp
@@ -335,7 +335,7 @@ mboard_eeprom_t::mboard_eeprom_t(i2c_iface &iface, map_type map){
     }
 }
 
-void mboard_eeprom_t::commit(i2c_iface &iface, map_type map){
+void mboard_eeprom_t::commit(i2c_iface &iface, map_type map) const{
     switch(map){
     case MAP_N100: store_n100(*this, iface); break;
     case MAP_B000: store_b000(*this, iface); break;