7 files changed, 17 insertions, 11 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index baf2b6ae3..26b0a5aea 100644
--- a/host/lib/usrp/b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2012-2013 Ettus Research LLC
+// Copyright 2012-2014 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
@@ -137,7 +137,7 @@ static device::sptr b100_make(const device_addr_t &device_addr){
 }
 
 UHD_STATIC_BLOCK(register_b100_device){
-    device::register_device(&b100_find, &b100_make);
+    device::register_device(&b100_find, &b100_make, device::USRP);
 }
 
 /***********************************************************************
@@ -148,6 +148,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){
     b100_impl_constructor_begin:
     initialization_count++;
 
+    _type = device::USRP;
     _tree = property_tree::make();
 
     //extract the FPGA path for the B100
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp
index bf5fdd251..245fbf4a9 100644
--- a/host/lib/usrp/b200/b200_impl.cpp
+++ b/host/lib/usrp/b200/b200_impl.cpp
@@ -146,7 +146,7 @@ static device::sptr b200_make(const device_addr_t &device_addr)
 
 UHD_STATIC_BLOCK(register_b200_device)
 {
-    device::register_device(&b200_find, &b200_make);
+    device::register_device(&b200_find, &b200_make, device::USRP);
 }
 
 /***********************************************************************
@@ -155,6 +155,7 @@ UHD_STATIC_BLOCK(register_b200_device)
 b200_impl::b200_impl(const device_addr_t &device_addr)
 {
     _tree = property_tree::make();
+    _type = device::USRP;
     const fs_path mb_path = "/mboards/0";
 
     //try to match the given device address with something on the USB bus
diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp
index b49ba64a2..e59df7708 100644
--- a/host/lib/usrp/e100/e100_impl.cpp
+++ b/host/lib/usrp/e100/e100_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 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
@@ -96,7 +96,7 @@ static device::sptr e100_make(const device_addr_t &device_addr){
 }
 
 UHD_STATIC_BLOCK(register_e100_device){
-    device::register_device(&e100_find, &e100_make);
+    device::register_device(&e100_find, &e100_make, device::USRP);
 }
 
 static const uhd::dict<std::string, std::string> model_to_fpga_file_name = boost::assign::map_list_of
@@ -109,6 +109,7 @@ static const uhd::dict<std::string, std::string> model_to_fpga_file_name = boost
  **********************************************************************/
 e100_impl::e100_impl(const uhd::device_addr_t &device_addr){
     _tree = property_tree::make();
+    _type = device::USRP;
 
     //read the eeprom so we can determine the hardware
     _dev_i2c_iface = e100_ctrl::make_dev_i2c_iface(E100_I2C_DEV_NODE);
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 71b1f8995..7d19fcb8b 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -246,7 +246,7 @@ static double derive_freq_from_xx_subdev_and_dsp(
 class multi_usrp_impl : public multi_usrp{
 public:
     multi_usrp_impl(const device_addr_t &addr){
-        _dev = device::make(addr);
+        _dev = device::make(addr, device::USRP);
         _tree = _dev->get_tree();
     }
 
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index 0ba2e1e4a..709092e42 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 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
@@ -139,7 +139,7 @@ static device::sptr usrp1_make(const device_addr_t &device_addr){
 }
 
 UHD_STATIC_BLOCK(register_usrp1_device){
-    device::register_device(&usrp1_find, &usrp1_make);
+    device::register_device(&usrp1_find, &usrp1_make, device::USRP);
 }
 
 /***********************************************************************
@@ -147,6 +147,7 @@ UHD_STATIC_BLOCK(register_usrp1_device){
  **********************************************************************/
 usrp1_impl::usrp1_impl(const device_addr_t &device_addr){
     UHD_MSG(status) << "Opening a USRP1 device..." << std::endl;
+    _type = device::USRP;
 
     //extract the FPGA path for the USRP1
     std::string usrp1_fpga_image = find_image_path(
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 918f3e892..ae2a6f81d 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 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
@@ -199,7 +199,7 @@ static device::sptr usrp2_make(const device_addr_t &device_addr){
 }
 
 UHD_STATIC_BLOCK(register_usrp2_device){
-    device::register_device(&usrp2_find, &usrp2_make);
+    device::register_device(&usrp2_find, &usrp2_make, device::USRP);
 }
 
 /***********************************************************************
@@ -367,6 +367,7 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
     // create controller objects and initialize the properties tree
     ////////////////////////////////////////////////////////////////////
     _tree = property_tree::make();
+    _type = device::USRP;
     _tree->create<std::string>("/name").set("USRP2 / N-Series Device");
 
     for (size_t mbi = 0; mbi < device_args.size(); mbi++){
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index 0de81e11f..bb59763ee 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -326,7 +326,7 @@ static device::sptr x300_make(const device_addr_t &device_addr)
 
 UHD_STATIC_BLOCK(register_x300_device)
 {
-    device::register_device(&x300_find, &x300_make);
+    device::register_device(&x300_find, &x300_make, device::USRP);
 }
 
 static void x300_load_fw(wb_iface::sptr fw_reg_ctrl, const std::string &file_name)
@@ -355,6 +355,7 @@ static void x300_load_fw(wb_iface::sptr fw_reg_ctrl, const std::string &file_nam
 x300_impl::x300_impl(const uhd::device_addr_t &dev_addr)
 {
     UHD_MSG(status) << "X300 initialization sequence..." << std::endl;
+    _type = device::USRP;
     _async_md.reset(new async_md_type(1000/*messages deep*/));
     _tree = uhd::property_tree::make();
     _tree->create<std::string>("/name").set("X-Series Device");