compiling with master merge, renamed usrp1e to usrp_e

10 files changed, 110 insertions, 109 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 323b69b14..db5e9d273 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -51,6 +51,8 @@ LIST(APPEND libuhd_sources
 ########################################################################
 # Conditionally add the usrp1e sources
 ########################################################################
+MESSAGE(STATUS "Configuring usrp-e support...")
+
 INCLUDE(CheckIncludeFiles)
 SET(usrp1e_required_headers
     linux/ioctl.h
@@ -63,19 +65,19 @@ CHECK_INCLUDE_FILES(
 )
 
 IF(HAS_USRP1E_REQUIRED_HEADERS)
-    MESSAGE(STATUS "Building usrp1e support...")
+    MESSAGE(STATUS "  Building usrp1e support.")
     LIST(APPEND libuhd_sources
-        usrp/usrp1e/dboard_impl.cpp
-        usrp/usrp1e/dboard_interface.cpp
-        usrp/usrp1e/dsp_impl.cpp
-        usrp/usrp1e/fpga-downloader.cc
-        usrp/usrp1e/mboard_impl.cpp
-        usrp/usrp1e/usrp1e_impl.cpp
+        usrp/usrp_e/dboard_impl.cpp
+        usrp/usrp_e/dboard_interface.cpp
+        usrp/usrp_e/dsp_impl.cpp
+        usrp/usrp_e/fpga-downloader.cc
+        usrp/usrp_e/mboard_impl.cpp
+        usrp/usrp_e/usrp_e_impl.cpp
     )
 ELSE(HAS_USRP1E_REQUIRED_HEADERS)
-    MESSAGE(STATUS "Skipping usrp1e support...")
+    MESSAGE(STATUS "  Skipping usrp1e support.")
     LIST(APPEND libuhd_sources
-        usrp/usrp1e/usrp1e_none.cpp
+        usrp/usrp_e/usrp_e_none.cpp
     )
 ENDIF(HAS_USRP1E_REQUIRED_HEADERS)
 
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 67fbdf8d2..b0ee395fb 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -29,7 +29,7 @@ using namespace uhd::usrp;
 using namespace uhd::transport;
 namespace asio = boost::asio;
 
-STATIC_BLOCK(register_usrp2_device){
+UHD_STATIC_BLOCK(register_usrp2_device){
     device::register_device(&usrp2::find, &usrp2::make);
 }
 
diff --git a/host/lib/usrp/usrp1e/dboard_impl.cpp b/host/lib/usrp/usrp_e/dboard_impl.cpp
index a2798dce3..88d04ce7a 100644
--- a/host/lib/usrp/usrp1e/dboard_impl.cpp
+++ b/host/lib/usrp/usrp_e/dboard_impl.cpp
@@ -17,20 +17,20 @@
 
 #include <boost/bind.hpp>
 #include <uhd/utils.hpp>
-#include "usrp1e_impl.hpp"
+#include "usrp_e_impl.hpp"
 
 using namespace uhd::usrp;
 
 /***********************************************************************
  * Dboard Initialization
  **********************************************************************/
-void usrp1e_impl::dboard_init(void){
+void usrp_e_impl::dboard_init(void){
     dboard_id_t rx_dboard_id = dboard_id::NONE; //TODO get these from the eeprom
     dboard_id_t tx_dboard_id = dboard_id::NONE;
 
     //create a new dboard interface and manager
     dboard_interface::sptr dboard_interface(
-        make_usrp1e_dboard_interface(this)
+        make_usrp_e_dboard_interface(this)
     );
     _dboard_manager = dboard_manager::make(
         rx_dboard_id, tx_dboard_id, dboard_interface
@@ -38,39 +38,39 @@ void usrp1e_impl::dboard_init(void){
 
     //setup the dboard proxies
     _rx_dboard_proxy = wax_obj_proxy::make(
-        boost::bind(&usrp1e_impl::rx_dboard_get, this, _1, _2),
-        boost::bind(&usrp1e_impl::rx_dboard_set, this, _1, _2)
+        boost::bind(&usrp_e_impl::rx_dboard_get, this, _1, _2),
+        boost::bind(&usrp_e_impl::rx_dboard_set, this, _1, _2)
     );
     _tx_dboard_proxy = wax_obj_proxy::make(
-        boost::bind(&usrp1e_impl::tx_dboard_get, this, _1, _2),
-        boost::bind(&usrp1e_impl::tx_dboard_set, this, _1, _2)
+        boost::bind(&usrp_e_impl::tx_dboard_get, this, _1, _2),
+        boost::bind(&usrp_e_impl::tx_dboard_set, this, _1, _2)
     );
 }
 
 /***********************************************************************
  * RX Dboard Get
  **********************************************************************/
-void usrp1e_impl::rx_dboard_get(const wax::obj &, wax::obj &){
+void usrp_e_impl::rx_dboard_get(const wax::obj &, wax::obj &){
     
 }
 
 /***********************************************************************
  * RX Dboard Set
  **********************************************************************/
-void usrp1e_impl::rx_dboard_set(const wax::obj &, const wax::obj &){
+void usrp_e_impl::rx_dboard_set(const wax::obj &, const wax::obj &){
     
 }
 
 /***********************************************************************
  * TX Dboard Get
  **********************************************************************/
-void usrp1e_impl::tx_dboard_get(const wax::obj &, wax::obj &){
+void usrp_e_impl::tx_dboard_get(const wax::obj &, wax::obj &){
     
 }
 
 /***********************************************************************
  * TX Dboard Set
  **********************************************************************/
-void usrp1e_impl::tx_dboard_set(const wax::obj &, const wax::obj &){
+void usrp_e_impl::tx_dboard_set(const wax::obj &, const wax::obj &){
     
 }
diff --git a/host/lib/usrp/usrp1e/dboard_interface.cpp b/host/lib/usrp/usrp_e/dboard_interface.cpp
index ef91014ac..c7c7d8c1f 100644
--- a/host/lib/usrp/usrp1e/dboard_interface.cpp
+++ b/host/lib/usrp/usrp_e/dboard_interface.cpp
@@ -15,17 +15,17 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include <algorithm> //std::copy
-#include "usrp1e_impl.hpp"
+#include "usrp_e_impl.hpp"
 #include <linux/usrp1_e.h>
 
 using namespace uhd::usrp;
 
-class usrp1e_dboard_interface : public dboard_interface{
+class usrp_e_dboard_interface : public dboard_interface{
 public:
-    usrp1e_dboard_interface(usrp1e_impl *impl);
-    ~usrp1e_dboard_interface(void);
+    usrp_e_dboard_interface(usrp_e_impl *impl);
+    ~usrp_e_dboard_interface(void);
 
     void write_aux_dac(unit_type_t, int, int);
     int read_aux_adc(unit_type_t, int);
@@ -50,61 +50,61 @@ private:
         bool readback
     );
 
-    usrp1e_impl *_impl;
+    usrp_e_impl *_impl;
 };
 
 /***********************************************************************
  * Make Function
  **********************************************************************/
-dboard_interface::sptr make_usrp1e_dboard_interface(usrp1e_impl *impl){
-    return dboard_interface::sptr(new usrp1e_dboard_interface(impl));
+dboard_interface::sptr make_usrp_e_dboard_interface(usrp_e_impl *impl){
+    return dboard_interface::sptr(new usrp_e_dboard_interface(impl));
 }
 
 /***********************************************************************
  * Structors
  **********************************************************************/
-usrp1e_dboard_interface::usrp1e_dboard_interface(usrp1e_impl *impl){
+usrp_e_dboard_interface::usrp_e_dboard_interface(usrp_e_impl *impl){
     _impl = impl;
 }
 
-usrp1e_dboard_interface::~usrp1e_dboard_interface(void){
+usrp_e_dboard_interface::~usrp_e_dboard_interface(void){
     /* NOP */
 }
 
 /***********************************************************************
  * Clock Rates
  **********************************************************************/
-double usrp1e_dboard_interface::get_rx_clock_rate(void){
+double usrp_e_dboard_interface::get_rx_clock_rate(void){
     throw std::runtime_error("not implemented");
 }
 
-double usrp1e_dboard_interface::get_tx_clock_rate(void){
+double usrp_e_dboard_interface::get_tx_clock_rate(void){
     throw std::runtime_error("not implemented");
 }
 
 /***********************************************************************
  * GPIO
  **********************************************************************/
-void usrp1e_dboard_interface::set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){
+void usrp_e_dboard_interface::set_gpio_ddr(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){
     throw std::runtime_error("not implemented");
 }
 
-void usrp1e_dboard_interface::write_gpio(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){
+void usrp_e_dboard_interface::write_gpio(gpio_bank_t bank, boost::uint16_t value, boost::uint16_t mask){
     throw std::runtime_error("not implemented");
 }
 
-boost::uint16_t usrp1e_dboard_interface::read_gpio(gpio_bank_t bank){
+boost::uint16_t usrp_e_dboard_interface::read_gpio(gpio_bank_t bank){
     throw std::runtime_error("not implemented");
 }
 
-void usrp1e_dboard_interface::set_atr_reg(gpio_bank_t bank, boost::uint16_t tx_value, boost::uint16_t rx_value, boost::uint16_t mask){
+void usrp_e_dboard_interface::set_atr_reg(gpio_bank_t bank, boost::uint16_t tx_value, boost::uint16_t rx_value, boost::uint16_t mask){
     throw std::runtime_error("not implemented");
 }
 
 /***********************************************************************
  * SPI
  **********************************************************************/
-dboard_interface::byte_vector_t usrp1e_dboard_interface::transact_spi(
+dboard_interface::byte_vector_t usrp_e_dboard_interface::transact_spi(
     spi_dev_t dev,
     spi_latch_t latch,
     spi_push_t push,
@@ -142,7 +142,7 @@ dboard_interface::byte_vector_t usrp1e_dboard_interface::transact_spi(
  **********************************************************************/
 static const size_t max_i2c_data_bytes = 10;
 
-void usrp1e_dboard_interface::write_i2c(int i2c_addr, const byte_vector_t &buf){
+void usrp_e_dboard_interface::write_i2c(int i2c_addr, const byte_vector_t &buf){
     //allocate some memory for this transaction
     ASSERT_THROW(buf.size() <= max_i2c_data_bytes);
     boost::uint8_t mem[sizeof(usrp_e_i2c) + max_i2c_data_bytes];
@@ -157,7 +157,7 @@ void usrp1e_dboard_interface::write_i2c(int i2c_addr, const byte_vector_t &buf){
     _impl->ioctl(USRP_E_I2C_WRITE, &data);
 }
 
-dboard_interface::byte_vector_t usrp1e_dboard_interface::read_i2c(int i2c_addr, size_t num_bytes){
+dboard_interface::byte_vector_t usrp_e_dboard_interface::read_i2c(int i2c_addr, size_t num_bytes){
     //allocate some memory for this transaction
     ASSERT_THROW(num_bytes <= max_i2c_data_bytes);
     boost::uint8_t mem[sizeof(usrp_e_i2c) + max_i2c_data_bytes];
@@ -180,10 +180,10 @@ dboard_interface::byte_vector_t usrp1e_dboard_interface::read_i2c(int i2c_addr,
 /***********************************************************************
  * Aux DAX/ADC
  **********************************************************************/
-void usrp1e_dboard_interface::write_aux_dac(dboard_interface::unit_type_t unit, int which, int value){
+void usrp_e_dboard_interface::write_aux_dac(dboard_interface::unit_type_t unit, int which, int value){
     throw std::runtime_error("not implemented");
 }
 
-int usrp1e_dboard_interface::read_aux_adc(dboard_interface::unit_type_t unit, int which){
+int usrp_e_dboard_interface::read_aux_adc(dboard_interface::unit_type_t unit, int which){
     throw std::runtime_error("not implemented");
 }
diff --git a/host/lib/usrp/usrp1e/dsp_impl.cpp b/host/lib/usrp/usrp_e/dsp_impl.cpp
index 862b89184..e32c76a3d 100644
--- a/host/lib/usrp/usrp1e/dsp_impl.cpp
+++ b/host/lib/usrp/usrp_e/dsp_impl.cpp
@@ -16,55 +16,54 @@
 //
 
 #include <boost/bind.hpp>
-#include <uhd/utils.hpp>
-#include "usrp1e_impl.hpp"
+#include "usrp_e_impl.hpp"
 
 using namespace uhd::usrp;
 
 /***********************************************************************
  * RX DDC Initialization
  **********************************************************************/
-void usrp1e_impl::rx_ddc_init(void){
+void usrp_e_impl::rx_ddc_init(void){
     _rx_ddc_proxy = wax_obj_proxy::make(
-        boost::bind(&usrp1e_impl::rx_ddc_get, this, _1, _2),
-        boost::bind(&usrp1e_impl::rx_ddc_set, this, _1, _2)
+        boost::bind(&usrp_e_impl::rx_ddc_get, this, _1, _2),
+        boost::bind(&usrp_e_impl::rx_ddc_set, this, _1, _2)
     );
 }
 
 /***********************************************************************
  * RX DDC Get
  **********************************************************************/
-void usrp1e_impl::rx_ddc_get(const wax::obj &, wax::obj &){
+void usrp_e_impl::rx_ddc_get(const wax::obj &, wax::obj &){
     
 }
 
 /***********************************************************************
  * RX DDC Set
  **********************************************************************/
-void usrp1e_impl::rx_ddc_set(const wax::obj &, const wax::obj &){
+void usrp_e_impl::rx_ddc_set(const wax::obj &, const wax::obj &){
     
 }
 
 /***********************************************************************
  * TX DUC Initialization
  **********************************************************************/
-void usrp1e_impl::tx_duc_init(void){
+void usrp_e_impl::tx_duc_init(void){
     _tx_duc_proxy = wax_obj_proxy::make(
-        boost::bind(&usrp1e_impl::tx_duc_get, this, _1, _2),
-        boost::bind(&usrp1e_impl::tx_duc_set, this, _1, _2)
+        boost::bind(&usrp_e_impl::tx_duc_get, this, _1, _2),
+        boost::bind(&usrp_e_impl::tx_duc_set, this, _1, _2)
     );
 }
 
 /***********************************************************************
  * TX DUC Get
  **********************************************************************/
-void usrp1e_impl::tx_duc_get(const wax::obj &, wax::obj &){
+void usrp_e_impl::tx_duc_get(const wax::obj &, wax::obj &){
     
 }
 
 /***********************************************************************
  * TX DUC Set
  **********************************************************************/
-void usrp1e_impl::tx_duc_set(const wax::obj &, const wax::obj &){
+void usrp_e_impl::tx_duc_set(const wax::obj &, const wax::obj &){
     
 }
diff --git a/host/lib/usrp/usrp1e/fpga-downloader.cc b/host/lib/usrp/usrp_e/fpga-downloader.cc
index f7c78b875..4429786a9 100644
--- a/host/lib/usrp/usrp1e/fpga-downloader.cc
+++ b/host/lib/usrp/usrp_e/fpga-downloader.cc
@@ -246,8 +246,8 @@ int main(int argc, char *argv[])
 }
 */
 
-#include <uhd/usrp/usrp1e.hpp>
-void uhd::usrp::usrp1e::load_fpga(const std::string &bin_file){
+#include <uhd/usrp/usrp_e.hpp>
+void uhd::usrp::usrp_e::load_fpga(const std::string &bin_file){
 	gpio gpio_prog_b(PROG_B, OUT);
 	gpio gpio_init_b(INIT_B, IN);
 	gpio gpio_done  (DONE,   IN);
diff --git a/host/lib/usrp/usrp1e/mboard_impl.cpp b/host/lib/usrp/usrp_e/mboard_impl.cpp
index b480f7616..333fb2e51 100644
--- a/host/lib/usrp/usrp1e/mboard_impl.cpp
+++ b/host/lib/usrp/usrp_e/mboard_impl.cpp
@@ -16,31 +16,30 @@
 //
 
 #include <boost/bind.hpp>
-#include <uhd/utils.hpp>
-#include "usrp1e_impl.hpp"
+#include "usrp_e_impl.hpp"
 
 using namespace uhd::usrp;
 
 /***********************************************************************
  * Mboard Initialization
  **********************************************************************/
-void usrp1e_impl::mboard_init(void){
+void usrp_e_impl::mboard_init(void){
     _mboard_proxy = wax_obj_proxy::make(
-        boost::bind(&usrp1e_impl::mboard_get, this, _1, _2),
-        boost::bind(&usrp1e_impl::mboard_set, this, _1, _2)
+        boost::bind(&usrp_e_impl::mboard_get, this, _1, _2),
+        boost::bind(&usrp_e_impl::mboard_set, this, _1, _2)
     );
 }
 
 /***********************************************************************
  * Mboard Get
  **********************************************************************/
-void usrp1e_impl::mboard_get(const wax::obj &, wax::obj &){
+void usrp_e_impl::mboard_get(const wax::obj &, wax::obj &){
     
 }
 
 /***********************************************************************
  * Mboard Set
  **********************************************************************/
-void usrp1e_impl::mboard_set(const wax::obj &, const wax::obj &){
+void usrp_e_impl::mboard_set(const wax::obj &, const wax::obj &){
     
 }
diff --git a/host/lib/usrp/usrp1e/usrp1e_impl.cpp b/host/lib/usrp/usrp_e/usrp_e_impl.cpp
index 8230cc8e4..e821add8c 100644
--- a/host/lib/usrp/usrp1e/usrp1e_impl.cpp
+++ b/host/lib/usrp/usrp_e/usrp_e_impl.cpp
@@ -15,10 +15,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include "usrp_e_impl.hpp"
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/static.hpp>
 #include <boost/format.hpp>
 #include <boost/filesystem.hpp>
-#include "usrp1e_impl.hpp"
 #include <fcntl.h> //open
 #include <sys/ioctl.h> //ioctl
 
@@ -26,8 +27,8 @@ using namespace uhd;
 using namespace uhd::usrp;
 namespace fs = boost::filesystem;
 
-STATIC_BLOCK(register_usrp1e_device){
-    device::register_device(&usrp1e::discover, &usrp1e::make);
+UHD_STATIC_BLOCK(register_usrp_e_device){
+    device::register_device(&usrp_e::find, &usrp_e::make);
 }
 
 /***********************************************************************
@@ -40,16 +41,16 @@ static std::string abs_path(const std::string &file_path){
 /***********************************************************************
  * Discovery
  **********************************************************************/
-device_addrs_t usrp1e::discover(const device_addr_t &device_addr){
-    device_addrs_t usrp1e_addrs;
+device_addrs_t usrp_e::find(const device_addr_t &device_addr){
+    device_addrs_t usrp_e_addrs;
 
     //if a node was provided, use it and only it
     if (device_addr.has_key("node")){
-        if (not fs::exists(device_addr["node"])) return usrp1e_addrs;
+        if (not fs::exists(device_addr["node"])) return usrp_e_addrs;
         device_addr_t new_addr;
-        new_addr["name"] = "USRP1E";
+        new_addr["name"] = "USRP-E";
         new_addr["node"] = abs_path(device_addr["node"]);
-        usrp1e_addrs.push_back(new_addr);
+        usrp_e_addrs.push_back(new_addr);
     }
 
     //otherwise look for a few nodes at small indexes
@@ -58,26 +59,26 @@ device_addrs_t usrp1e::discover(const device_addr_t &device_addr){
             std::string node = str(boost::format("/dev/usrp1_e%d") % i);
             if (not fs::exists(node)) continue;
             device_addr_t new_addr;
-            new_addr["name"] = "USRP1E";
+            new_addr["name"] = "USRP-E";
             new_addr["node"] = abs_path(node);
-            usrp1e_addrs.push_back(new_addr);
+            usrp_e_addrs.push_back(new_addr);
         }
     }
 
-    return usrp1e_addrs;
+    return usrp_e_addrs;
 }
 
 /***********************************************************************
  * Make
  **********************************************************************/
-device::sptr usrp1e::make(const device_addr_t &device_addr){
-    return sptr(new usrp1e_impl(device_addr["node"]));
+device::sptr usrp_e::make(const device_addr_t &device_addr){
+    return sptr(new usrp_e_impl(device_addr["node"]));
 }
 
 /***********************************************************************
  * Structors
  **********************************************************************/
-usrp1e_impl::usrp1e_impl(const std::string &node){
+usrp_e_impl::usrp_e_impl(const std::string &node){
     //open the device node and check file descriptor
     if ((_node_fd = ::open(node.c_str(), O_RDWR)) < 0){
         throw std::runtime_error(str(
@@ -96,7 +97,7 @@ usrp1e_impl::usrp1e_impl(const std::string &node){
     tx_duc_init();
 }
 
-usrp1e_impl::~usrp1e_impl(void){
+usrp_e_impl::~usrp_e_impl(void){
     //close the device node file descriptor
     ::close(_node_fd);
 }
@@ -104,7 +105,7 @@ usrp1e_impl::~usrp1e_impl(void){
 /***********************************************************************
  * Misc Methods
  **********************************************************************/
-void usrp1e_impl::ioctl(int request, void *mem){
+void usrp_e_impl::ioctl(int request, void *mem){
     if (::ioctl(_node_fd, request, mem) < 0){
         throw std::runtime_error(str(
             boost::format("ioctl failed with request %d") % request
@@ -115,14 +116,14 @@ void usrp1e_impl::ioctl(int request, void *mem){
 /***********************************************************************
  * Device Get
  **********************************************************************/
-void usrp1e_impl::get(const wax::obj &key_, wax::obj &val){
+void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){
     wax::obj key; std::string name;
     boost::tie(key, name) = extract_named_prop(key_);
 
     //handle the get request conditioned on the key
     switch(key.as<device_prop_t>()){
     case DEVICE_PROP_NAME:
-        val = std::string("usrp1e device");
+        val = std::string("usrp-e device");
         return;
 
     case DEVICE_PROP_MBOARD:
@@ -148,31 +149,31 @@ void usrp1e_impl::get(const wax::obj &key_, wax::obj &val){
 /***********************************************************************
  * Device Set
  **********************************************************************/
-void usrp1e_impl::set(const wax::obj &, const wax::obj &){
-    throw std::runtime_error("Cannot set in usrp1e device");
+void usrp_e_impl::set(const wax::obj &, const wax::obj &){
+    throw std::runtime_error("Cannot set in usrp-e device");
 }
 
 /***********************************************************************
  * Device IO (TODO)
  **********************************************************************/
-size_t usrp1e_impl::send(
+size_t usrp_e_impl::send(
     const boost::asio::const_buffer &,
     const uhd::tx_metadata_t &,
-    const std::string &type
+    const io_type_t &
 ){
-    if (type != "16sc"){
-        throw std::runtime_error(str(boost::format("usrp1e send: cannot handle type \"%s\"") % type));
+    if (true){
+        throw std::runtime_error(str(boost::format("usrp-e send: cannot handle type \"%s\"") % ""));
     }
     return 0;
 }
 
-size_t usrp1e_impl::recv(
+size_t usrp_e_impl::recv(
     const boost::asio::mutable_buffer &,
     uhd::rx_metadata_t &,
-    const std::string &type
+    const io_type_t &
 ){
-    if (type != "16sc"){
-        throw std::runtime_error(str(boost::format("usrp1e recv: cannot handle type \"%s\"") % type));
+    if (true){
+        throw std::runtime_error(str(boost::format("usrp-e recv: cannot handle type \"%s\"") % ""));
     }
     return 0;
 }
diff --git a/host/lib/usrp/usrp1e/usrp1e_impl.hpp b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
index c199a0465..e593b13ad 100644
--- a/host/lib/usrp/usrp1e/usrp1e_impl.hpp
+++ b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
@@ -15,20 +15,20 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/usrp/usrp1e.hpp>
+#include <uhd/usrp/usrp_e.hpp>
 #include <uhd/usrp/dboard_manager.hpp>
 
-#ifndef INCLUDED_USRP1E_IMPL_HPP
-#define INCLUDED_USRP1E_IMPL_HPP
+#ifndef INCLUDED_USRP_E_IMPL_HPP
+#define INCLUDED_USRP_E_IMPL_HPP
 
-class usrp1e_impl; // dummy class declaration
+class usrp_e_impl; // dummy class declaration
 
 /*!
- * Make a usrp1e dboard interface.
- * \param impl a pointer to the usrp1e impl object
+ * Make a usrp_e dboard interface.
+ * \param impl a pointer to the usrp_e impl object
  * \return a sptr to a new dboard interface
  */
-uhd::usrp::dboard_interface::sptr make_usrp1e_dboard_interface(usrp1e_impl *impl);
+uhd::usrp::dboard_interface::sptr make_usrp_e_dboard_interface(usrp_e_impl *impl);
 
 /*!
  * Simple wax obj proxy class:
@@ -73,15 +73,15 @@ private:
  * The implementation details are encapsulated here.
  * Handles properties on the mboard, dboard, dsps...
  */
-class usrp1e_impl : public uhd::device{
+class usrp_e_impl : public uhd::device{
 public:
     //structors
-    usrp1e_impl(const std::string &node);
-    ~usrp1e_impl(void);
+    usrp_e_impl(const std::string &node);
+    ~usrp_e_impl(void);
 
     //the io interface
-    size_t send(const boost::asio::const_buffer &, const uhd::tx_metadata_t &, const std::string &);
-    size_t recv(const boost::asio::mutable_buffer &, uhd::rx_metadata_t &, const std::string &);
+    size_t send(const boost::asio::const_buffer &, const uhd::tx_metadata_t &, const uhd::io_type_t &);
+    size_t recv(const boost::asio::mutable_buffer &, uhd::rx_metadata_t &, const uhd::io_type_t &);
 
     /*!
      * Perform an ioctl call on the device node file descriptor.
@@ -132,4 +132,4 @@ private:
     wax_obj_proxy::sptr _tx_duc_proxy;
 };
 
-#endif /* INCLUDED_USRP1E_IMPL_HPP */
+#endif /* INCLUDED_USRP_E_IMPL_HPP */
diff --git a/host/lib/usrp/usrp1e/usrp1e_none.cpp b/host/lib/usrp/usrp_e/usrp_e_none.cpp
index 94243523d..09a3c6946 100644
--- a/host/lib/usrp/usrp1e/usrp1e_none.cpp
+++ b/host/lib/usrp/usrp_e/usrp_e_none.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/usrp/usrp1e.hpp>
+#include <uhd/usrp/usrp_e.hpp>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -25,14 +25,14 @@ using namespace uhd::usrp;
  * when the required kernel module headers are not present.
  */
 
-device_addrs_t usrp1e::find(const device_addr_t &){
+device_addrs_t usrp_e::find(const device_addr_t &){
     return device_addrs_t(); //return empty list
 }
 
-device::sptr usrp1e::make(const device_addr_t &){
+device::sptr usrp_e::make(const device_addr_t &){
     throw std::runtime_error("this build has no usrp1e support");
 }
 
-void usrp1e::load_fpga(const std::string &){
+void usrp_e::load_fpga(const std::string &){
     throw std::runtime_error("this build has no usrp1e support");
 }